diff --git a/fstack/lib/checks.sh b/fstack/lib/checks.sh
index db52a4b..f27e3ab 100644
--- a/fstack/lib/checks.sh
+++ b/fstack/lib/checks.sh
@@ -64,44 +64,34 @@ check_ports() {
       # If port 53 (dns) in use by system-resolvd (Ubuntu) then auto fix
       if [ "$SS" == 53 ]; then
         if [ $OSRELEASE == "Ubuntu" ]; then
-          grep "127\.0" /etc/resolv.conf &> /dev/null
-            if [ $? -eq 0 ]; then
-              echo -ne "\n* Port 53 in use by systemd-resolved, fixing.."
-              spin &
-              SPINPID=$!
+          if [ `pgrep -x systemd-resolve` ]; then
+             echo -ne "\n* Port 53 in use by systemd-resolved, fixing.."
+             spin &
+             SPINPID=$!
 
-              # Install resolvconf to fix
-              sudo apt install resolvconf -y &> /dev/null
-              [ $? -eq 0 ] && echo -ne "." || failcheck "Failed running sudo apt install resolvconf" 
+             # Install resolvconf to fix
+             sudo apt install resolvconf -y &> /dev/null
+             [ $? -eq 0 ] && echo -ne "." || failcheck "Failed running sudo apt install resolvconf" 
 
-	      # Shut down systemd-resolved
-	      systemctl stop systemd-resolved
-	      [ $? -ne 0 ] && failcheck "Failed running systemctl stop systemd-resolved"
-	      systemctl disable systemd-resolved
-	      [ $? -ne 0 ] && failcheck "Failed running systemctl stop systemd-resolved"
+	     # Shut down systemd-resolved
+	     systemctl stop systemd-resolved &> /dev/null
+	     [ $? -ne 0 ] && failcheck "Failed running systemctl stop systemd-resolved"
+	     systemctl disable systemd-resolved &> /dev/null
+	     [ $? -ne 0 ] && failcheck "Failed running systemctl stop systemd-resolved"
 
-              # Put nameserver entries so will exist on reboot
-              echo "nameserver 8.8.8.8" > /etc/resolvconf/resolv.conf.d/tail
-              echo "nameserver 8.8.8.8" > /run/resolvconf/resolv.conf
+             # Put nameserver entries so will exist on reboot
+             echo "nameserver 8.8.8.8" > /etc/resolvconf/resolv.conf.d/tail
+             echo "nameserver 8.8.8.8" > /run/resolvconf/resolv.conf
 
-	      kill -9 $SPINPID &> /dev/null
-              echo -ne "done."
-            else
+	     kill -9 $SPINPID &> /dev/null
+             echo -ne "done."
+           else
 	      echo -ne "\nFAILED - Port 53 (dns) is already in use\n\n" && exit 2
-            fi
+           fi
         fi
       elif [ "$SS" == "$i" ]; then
 	failcheck "FAILED - Port $i is already in use" 
       fi
     done
   fi
-
-  # Check Port 53 (dns) with nc
-#  elif command -v nc &> /dev/null; then
-#    nc -z $EXTERNALIP 53 &> /dev/null
-#    [ $? -eq 0 ] && failcheck "Port 53 (dns) is already in use."
-#
-#    nc -z 127.0.0.1 53 &> /dev/null
-#    [ $? -eq 0 ] && failcheck "Port 53 (dns) is already in use."
-#  fi
 }
diff --git a/fstack/lib/collabora.sh b/fstack/lib/collabora.sh
index c93cb93..1b3a547 100644
--- a/fstack/lib/collabora.sh
+++ b/fstack/lib/collabora.sh
@@ -20,7 +20,7 @@ config_collabora() {
   DOMAIN_LAST=${DOMAIN_ARRAY[1]}
 
 cat > fstack/collabora/docker-compose.yml <<EOF
-version: '3.8'
+version: '3.7'
 
 services:
   collabora:
diff --git a/fstack/lib/dns.sh b/fstack/lib/dns.sh
index 8d65244..179ba1a 100644
--- a/fstack/lib/dns.sh
+++ b/fstack/lib/dns.sh
@@ -16,7 +16,7 @@ config_dns() {
   mkdir -p fstack/dns/data/var/log/letsencrypt
 
 cat > fstack/dns/docker-compose.yml <<'EOF'
-version: '3.8'
+version: '3.7'
 
 services:
   dns:
diff --git a/fstack/lib/ldap.sh b/fstack/lib/ldap.sh
index 296f17e..744552a 100644
--- a/fstack/lib/ldap.sh
+++ b/fstack/lib/ldap.sh
@@ -24,7 +24,8 @@ config_ldap() {
   LDAPADMINPASS=`echo -n $ADMINPASS | openssl dgst -sha1 -binary | openssl enc -base64 | awk '{print "{SHA}"$0}'`
 
 cat > fstack/ldap/docker-compose.yml <<EOF
-version: '3.8'
+version: '3.7'
+
 services:
   ldap:
     image: osixia/openldap:latest
diff --git a/fstack/lib/mail.sh b/fstack/lib/mail.sh
index ff92c53..4a032be 100644
--- a/fstack/lib/mail.sh
+++ b/fstack/lib/mail.sh
@@ -23,7 +23,7 @@ config_mail() {
   DOMAIN_LAST=${DOMAIN_ARRAY[1]}
 
 cat > fstack/mail/docker-compose.yml <<EOF
-version: '3.8'
+version: '3.7'
 
 services:
   mail:
diff --git a/fstack/lib/nextcloud.sh b/fstack/lib/nextcloud.sh
index eda14fe..73e84d7 100644
--- a/fstack/lib/nextcloud.sh
+++ b/fstack/lib/nextcloud.sh
@@ -21,7 +21,7 @@ config_nextcloud() {
   DOMAIN_LAST=${DOMAIN_ARRAY[1]}
 
 cat > fstack/nextcloud/docker-compose.yml <<EOF
-version: '3.8'
+version: '3.7'
 
 services:
   nextcloud_db:
diff --git a/fstack/lib/panel.sh b/fstack/lib/panel.sh
index a28e7fe..a6872f7 100644
--- a/fstack/lib/panel.sh
+++ b/fstack/lib/panel.sh
@@ -44,7 +44,8 @@ COPY new_user.php /opt/ldap_user_manager/account_manager/
 EOF
 
 cat > fstack/panel/docker-compose.yml <<EOF
-version: '3.8'
+version: '3.7'
+
 services:
   panel:
     image: wheelybird/ldap-user-manager:latest
diff --git a/fstack/lib/proxy.sh b/fstack/lib/proxy.sh
index aa0a243..8ac3d6b 100644
--- a/fstack/lib/proxy.sh
+++ b/fstack/lib/proxy.sh
@@ -20,7 +20,8 @@ config_proxy() {
   DOMAIN_LAST=${DOMAIN_ARRAY[1]}
 
 cat > fstack/proxy/docker-compose.yml <<EOF
-version: '3.8'
+version: '3.7'
+
 services:
   proxy:
     image: jwilder/nginx-proxy