diff --git a/filemanager/filemanager.py b/filemanager/filemanager.py
index 9f6e9a32a..15fe31caa 100755
--- a/filemanager/filemanager.py
+++ b/filemanager/filemanager.py
@@ -497,7 +497,7 @@ class FileManager:
         website = Websites.objects.get(domain=domainName)
         externalApp = website.externalApp
 
-        if ProcessUtilities.decideDistro() == ProcessUtilities.centos:
+        if ProcessUtilities.decideDistro() == ProcessUtilities.centos or ProcessUtilities.decideDistro() == ProcessUtilities.cent8:
             groupName = 'nobody'
         else:
             groupName = 'nogroup'
diff --git a/install.sh b/install.sh
index 635300c83..4cac11a15 100644
--- a/install.sh
+++ b/install.sh
@@ -1,42 +1,36 @@
 #!/bin/sh
 
-if [ -f "/etc/os-release" ]; then
-  . /etc/os-release
+OUTPUT=$(cat /etc/*release)
+if  echo $OUTPUT | grep -q "CentOS Linux 7" ; then
+        echo "Checking and installing curl and wget"
+yum install curl wget -y 1> /dev/null
+yum update curl wget ca-certificates -y 1> /dev/null
+                SERVER_OS="CentOS"
+elif echo $OUTPUT | grep -q "CentOS Linux 8" ; then
+        echo -e "\nDetecting Centos 8...\n"
+        SERVER_OS="CentOS8"
+yum install curl wget -y 1> /dev/null
+yum update curl wget ca-certificates -y 1> /dev/null
+elif echo $OUTPUT | grep -q "CloudLinux 7" ; then
+        echo "Checking and installing curl and wget"
+yum install curl wget -y 1> /dev/null
+yum update curl wget ca-certificates -y 1> /dev/null
+                SERVER_OS="CloudLinux"
+elif echo $OUTPUT | grep -q "Ubuntu 18.04" ; then
+apt install -y -qq wget curl
+                SERVER_OS="Ubuntu"
+elif echo $OUTPUT | grep -q "Ubuntu 20.04" ; then
+apt install -y -qq wget curl
+                SERVER_OS="Ubuntu"
 else
-  ID="unsupported"
-  PRETTY_NAME="Your OS does not have a /etc/os-release file"
+
+                echo -e "\nUnable to detect your OS...\n"
+                echo -e "\nCyberPanel is supported on Ubuntu 18.04, CentOS 7.x and CloudLinux 7.x...\n"
+                exit 1
 fi
 
-if [ "$ID" = "ubuntu" ] && [ "$UBUNTU_CODENAME" = "bionic" ]; then
-  export DEBIAN_FRONTEND=noninteractive
-  apt -q -y -o Dpkg::Options::=--force-confnew update
-  apt -q -y -o Dpkg::Options::=--force-confnew install wget curl
-  SERVER_OS="Ubuntu"
-elif [ "$ID" = "centos" ] || [ "$ID" = "cloudlinux" ]; then
-  case "$VERSION_ID" in
-    7|7.*)
-      yum install curl wget -y 1> /dev/null
-      yum update curl wget ca-certificates -y 1> /dev/null
-      if [ "$ID" = "centos" ]; then
-        SERVER_OS="CentOS"
-      else
-        SERVER_OS="CloudLinux"
-      fi
-      ;;
-    8|8.*)
-      printf >&2 '\nCentOS 8/CloudLinux 8 support is currently experimental!\n'
-      yum install curl wget -y 1> /dev/null
-      yum update curl wget ca-certificates -y 1> /dev/null
-      SERVER_OS="CentOS8"
-      ;;
-  esac
-else
-  printf >&2 '\nYour OS -- %s -- is not currently supported!\n' "$PRETTY_NAME"
-  printf >&2 '\nCyberPanel is currently supported on Ubuntu 18.04, CentOS 7 and CloudLinux 7.\n'
-  exit 1
-fi
-
-rm -f cyberpanel.sh install.tar.gz
-curl --silent -o cyberpanel.sh "https://cyberpanel.sh/?dl&${SERVER_OS}" 2>/dev/null
+rm -f cyberpanel.sh
+rm -f install.tar.gz
+curl --silent -o cyberpanel.sh "https://cyberpanel.sh/?dl&$SERVER_OS" 2>/dev/null
 chmod +x cyberpanel.sh
-./cyberpanel.sh "$@"
+./cyberpanel.sh $@
\ No newline at end of file