diff --git a/baseTemplate/views.py b/baseTemplate/views.py
index 60494ba00..2fee1a4d1 100755
--- a/baseTemplate/views.py
+++ b/baseTemplate/views.py
@@ -59,7 +59,7 @@ def getAdminStatus(request):
             pdns = PDNSStatus.objects.get(pk=1)
             currentACL['dnsAsWhole'] = pdns.serverStatus
         except:
-            if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu:
+            if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20:
                 pdnsPath = '/etc/powerdns'
             else:
                 pdnsPath = '/etc/pdns'
diff --git a/plogical/applicationInstaller.py b/plogical/applicationInstaller.py
index a2e71dcb9..c4e26a75b 100755
--- a/plogical/applicationInstaller.py
+++ b/plogical/applicationInstaller.py
@@ -67,7 +67,7 @@ class ApplicationInstaller(multi.Thread):
 
             f = open(ServerStatusUtil.lswsInstallStatusPath, 'a')
 
-            if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu:
+            if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20:
 
                 if package == 'all':
                     command = 'DEBIAN_FRONTEND=noninteractive apt-get update -y'
diff --git a/plogical/cronUtil.py b/plogical/cronUtil.py
index a08803833..120f6c06a 100755
--- a/plogical/cronUtil.py
+++ b/plogical/cronUtil.py
@@ -100,7 +100,7 @@ class CronUtil:
             commandT = 'chmod 755 %s' % (cronParent)
             ProcessUtilities.executioner(commandT, 'root')
 
-            if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu:
+            if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20:
                 command = 'chmod 755 /var/spool/cron/crontabs'
                 ProcessUtilities.outputExecutioner(command)
 
@@ -109,7 +109,7 @@ class CronUtil:
             commandT = 'chmod 700 %s' % (cronParent)
             ProcessUtilities.executioner(commandT, 'root')
 
-            if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu:
+            if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20:
                 command = 'chmod 1730 /var/spool/cron/crontabs'
                 ProcessUtilities.outputExecutioner(command)
 
diff --git a/plogical/csf.py b/plogical/csf.py
index ef1999224..7b2bee78e 100755
--- a/plogical/csf.py
+++ b/plogical/csf.py
@@ -73,7 +73,7 @@ class CSF(multi.Thread):
             if ProcessUtilities.decideDistro() == ProcessUtilities.centos:
                 command = 'yum install bind-utils net-tools perl-libwww-perl.noarch perl-LWP-Protocol-https.noarch perl-GDGraph ipset -y'
                 ProcessUtilities.normalExecutioner(command)
-            elif ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu:
+            elif ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20:
                 command = 'apt-get install dnsutils libwww-perl liblwp-protocol-https-perl libgd-graph-perl net-tools ipset -y'
                 ProcessUtilities.normalExecutioner(command)
                 command = 'ln -s /bin/systemctl /usr/bin/systemctl'
@@ -309,7 +309,7 @@ class CSF(multi.Thread):
             ##
 
             # Some Ubuntu initial configurations
-            if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu:
+            if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20:
                 data = open('/etc/csf/csf.conf', 'r').readlines()
                 writeToConf = open('/etc/csf/csf.conf', 'w')
 
diff --git a/plogical/dnsUtilities.py b/plogical/dnsUtilities.py
index cc2d3b2b2..c553e304d 100755
--- a/plogical/dnsUtilities.py
+++ b/plogical/dnsUtilities.py
@@ -446,7 +446,7 @@ class DNS:
 
                 DNS.createDNSRecord(zone, cNameValue, "CNAME", actualSubDomain, 0, 3600)
 
-            if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu:
+            if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20:
                 command = 'sudo systemctl restart pdns'
                 ProcessUtilities.executioner(command)
 
@@ -487,11 +487,11 @@ class DNS:
                                  auth=1)
                 record.save()
 
-                if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu:
+                if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20:
                     command = ' systemctl restart pdns'
                     ProcessUtilities.executioner(command)
 
-            if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu:
+            if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20:
                 command = ' systemctl restart pdns'
                 ProcessUtilities.executioner(command)
 
@@ -572,7 +572,7 @@ class DNS:
                                      auth=1)
                     record.save()
 
-                    if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu:
+                    if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20:
                         command = 'sudo systemctl restart pdns'
                         ProcessUtilities.executioner(command)
 
@@ -591,7 +591,7 @@ class DNS:
                                      auth=1)
                     record.save()
 
-                    if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu:
+                    if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20:
                         command = 'sudo systemctl restart pdns'
                         ProcessUtilities.executioner(command)
                 return
@@ -608,7 +608,7 @@ class DNS:
                                  auth=1)
                 record.save()
 
-                if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu:
+                if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20:
                     command = 'sudo systemctl restart pdns'
                     ProcessUtilities.executioner(command)
                 return
@@ -624,7 +624,7 @@ class DNS:
                                  disabled=0,
                                  auth=1)
                 record.save()
-                if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu:
+                if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20:
                     command = 'sudo systemctl restart pdns'
                     ProcessUtilities.executioner(command)
 
diff --git a/plogical/firewallUtilities.py b/plogical/firewallUtilities.py
index d3f07fb63..f47b74205 100755
--- a/plogical/firewallUtilities.py
+++ b/plogical/firewallUtilities.py
@@ -15,7 +15,7 @@ class FirewallUtilities:
 
     @staticmethod
     def resFailed(res):
-        if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu and res != 0:
+        if (ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20) and res != 0:
             return True
         elif ProcessUtilities.decideDistro() == ProcessUtilities.centos and res == 1:
             return True
diff --git a/plogical/mailUtilities.py b/plogical/mailUtilities.py
index 485206df0..0b1bd2ae2 100755
--- a/plogical/mailUtilities.py
+++ b/plogical/mailUtilities.py
@@ -502,7 +502,7 @@ milter_default_action = accept
     def configureSpamAssassin():
         try:
 
-            if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu:
+            if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20:
                 confFile = "/etc/mail/spamassassin/local.cf"
                 confData = open(confFile).readlines()
 
diff --git a/serverStatus/views.py b/serverStatus/views.py
index 7d584c008..33efa23f6 100755
--- a/serverStatus/views.py
+++ b/serverStatus/views.py
@@ -730,7 +730,7 @@ def fetchPackages(request):
         recordsToShow = int(data['recordsToShow'])
         type = data['type']
 
-        if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu:
+        if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20:
 
             command = 'apt-mark showhold'
             locked = ProcessUtilities.outputExecutioner(command).split('\n')
@@ -850,7 +850,7 @@ def fetchPackages(request):
 
         import re
         for items in finalPackages:
-            if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu:
+            if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20:
                 try:
                     if type == 'CyberPanel':
 
@@ -977,7 +977,7 @@ def fetchPackageDetails(request):
         data = json.loads(request.body)
         package = data['package']
 
-        if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu:
+        if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20:
             command = 'apt-cache show %s' % (package)
             packageDetails = ProcessUtilities.outputExecutioner(command)
         elif ProcessUtilities.decideDistro() == ProcessUtilities.centos:
@@ -1047,7 +1047,7 @@ def lockStatus(request):
         package = data['package']
         type = data['type']
 
-        if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu:
+        if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20:
 
             if type == 0:
                 command = 'apt-mark unhold %s' % (package)
diff --git a/websiteFunctions/website.py b/websiteFunctions/website.py
index 996b9f48d..71619e209 100755
--- a/websiteFunctions/website.py
+++ b/websiteFunctions/website.py
@@ -1605,7 +1605,7 @@ class WebsiteManager:
             output = ProcessUtilities.outputExecutioner(execPath, website.externalApp)
 
 
-            if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu:
+            if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20:
                 command = 'chmod 600 %s' % (cronPath)
                 ProcessUtilities.executioner(command)