diff --git a/.archive/i2p/docker-compose.yml b/.archive/i2p/docker-compose.yml
index 00e5c58..033b1a5 100644
--- a/.archive/i2p/docker-compose.yml
+++ b/.archive/i2p/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   caddy:
     hostname: caddy
diff --git a/.archive/nocodb/docker-compose.labels.yml b/.archive/nocodb/docker-compose.labels.yml
index 5bd5f68..9b15944 100644
--- a/.archive/nocodb/docker-compose.labels.yml
+++ b/.archive/nocodb/docker-compose.labels.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   nocodb:
     labels:
diff --git a/.archive/nocodb/docker-compose.logging.yml b/.archive/nocodb/docker-compose.logging.yml
index e13d242..e7d78cd 100644
--- a/.archive/nocodb/docker-compose.logging.yml
+++ b/.archive/nocodb/docker-compose.logging.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   redis:
     logging:
diff --git a/.archive/nocodb/docker-compose.yml b/.archive/nocodb/docker-compose.yml
index 499f33f..5bcac5d 100644
--- a/.archive/nocodb/docker-compose.yml
+++ b/.archive/nocodb/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 networks:
   proxy:
     external: true
diff --git a/.archive/snowflake/docker-compose.yml b/.archive/snowflake/docker-compose.yml
index 11fdb56..173b02a 100644
--- a/.archive/snowflake/docker-compose.yml
+++ b/.archive/snowflake/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   snowflake:
     hostname: snowflake
diff --git a/.archive/tor/docker-compose.yml b/.archive/tor/docker-compose.yml
index 38a2d0e..03bf8e6 100644
--- a/.archive/tor/docker-compose.yml
+++ b/.archive/tor/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 networks:
   default:
 
diff --git a/_scripts/test_comp.sh b/_scripts/test_comp.sh
index 7fb3570..fa04011 100755
--- a/_scripts/test_comp.sh
+++ b/_scripts/test_comp.sh
@@ -100,7 +100,7 @@ CHECK $'[ $COMP_EXIT_CODE -eq $EXIT_CODE_SIMPLE_VERB_FAILURE ]' \
       "Expected EXIT_CODE_SIMPLE_VERB_FAILURE"
 
 # Wait for tang to start and record health status
-sleep 15s
+sleep 30s
 
 SETUP "that 'tang' is still running" \
       "status -P tang" \
diff --git a/airdcpp/docker-compose.labels.yml b/airdcpp/docker-compose.labels.yml
index c7bfe0f..483f1e0 100644
--- a/airdcpp/docker-compose.labels.yml
+++ b/airdcpp/docker-compose.labels.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   airdcpp:
     labels:
diff --git a/airdcpp/docker-compose.logging.yml b/airdcpp/docker-compose.logging.yml
index ddb9875..1f379c6 100644
--- a/airdcpp/docker-compose.logging.yml
+++ b/airdcpp/docker-compose.logging.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   openvpn:
     logging:
diff --git a/airdcpp/docker-compose.ports.yml b/airdcpp/docker-compose.ports.yml
index 7b6ab6e..fa66da4 100644
--- a/airdcpp/docker-compose.ports.yml
+++ b/airdcpp/docker-compose.ports.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   openvpn:
     ports:
diff --git a/airdcpp/docker-compose.yml b/airdcpp/docker-compose.yml
index e71467d..c8413b8 100644
--- a/airdcpp/docker-compose.yml
+++ b/airdcpp/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 networks:
   proxy:
     external: true
diff --git a/certbot/docker-compose.logging.yml b/certbot/docker-compose.logging.yml
index f0bddaa..d6c0732 100644
--- a/certbot/docker-compose.logging.yml
+++ b/certbot/docker-compose.logging.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   certbot:
     logging:
diff --git a/certbot/docker-compose.ports.yml b/certbot/docker-compose.ports.yml
index a31536c..8be7296 100644
--- a/certbot/docker-compose.ports.yml
+++ b/certbot/docker-compose.ports.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   certbot:
     ports:
diff --git a/certbot/docker-compose.yml b/certbot/docker-compose.yml
index 60b1fa4..2a34aaf 100644
--- a/certbot/docker-compose.yml
+++ b/certbot/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   certbot:
     hostname: certbot
diff --git a/comp b/comp
index 4b7080d..0c1ca46 100755
--- a/comp
+++ b/comp
@@ -469,9 +469,8 @@ if ! $DOCKER_COMPOSE_CMD version &> /dev/null ; then
         __error 'Failed to locate: `'"$DOCKER_COMPOSE_CMD"'` or `'"$DOCKER_CMD"'-compose`!'
         exit $EXIT_CODE_DEP_INSTALL_FAILURE
       fi
-    else
-      DOCKER_COMPOSE_CMD="$LIB_DIR/compose"
     fi
+    DOCKER_COMPOSE_CMD="$LIB_DIR/compose"
   else
     DOCKER_COMPOSE_CMD="$DOCKER_CMD-compose"
   fi
@@ -483,9 +482,8 @@ if ! command -v $YQ_CMD &> /dev/null ; then
       __error 'Failed to locate: `yq`!'
       exit $EXIT_CODE_DEP_INSTALL_FAILURE
     fi
-  else
-    YQ_CMD="$LIB_DIR/yq"
   fi
+  YQ_CMD="$LIB_DIR/yq"
 fi
 
 # # # # # # # # # # # # # # # # # # #      MAIN FUNCTION      # # # # # # # # # # # # # # # # # # #
diff --git a/docker_sock/docker-compose.labels.yml b/docker_sock/docker-compose.labels.yml
index 4ca57e7..56591b5 100644
--- a/docker_sock/docker-compose.labels.yml
+++ b/docker_sock/docker-compose.labels.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   docker.sock-proxy:
     labels:
diff --git a/docker_sock/docker-compose.logging.yml b/docker_sock/docker-compose.logging.yml
index 604b830..9a18364 100644
--- a/docker_sock/docker-compose.logging.yml
+++ b/docker_sock/docker-compose.logging.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   docker.sock-proxy:
     logging:
diff --git a/docker_sock/docker-compose.yml b/docker_sock/docker-compose.yml
index 4760728..9f6869a 100644
--- a/docker_sock/docker-compose.yml
+++ b/docker_sock/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 networks:
   shared:
     external: true
diff --git a/gitea/docker-compose.labels.yml b/gitea/docker-compose.labels.yml
index 64ac48e..59cafbb 100644
--- a/gitea/docker-compose.labels.yml
+++ b/gitea/docker-compose.labels.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   gitea:
     labels:
diff --git a/gitea/docker-compose.logging.yml b/gitea/docker-compose.logging.yml
index 5994e33..06331b7 100644
--- a/gitea/docker-compose.logging.yml
+++ b/gitea/docker-compose.logging.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   gitea:
     logging:
diff --git a/gitea/docker-compose.yml b/gitea/docker-compose.yml
index 609222b..904e744 100644
--- a/gitea/docker-compose.yml
+++ b/gitea/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 networks:
   proxy:
     external: true
diff --git a/hass/docker-compose.devices.yml b/hass/docker-compose.devices.yml
index 7eec97a..92cd05e 100644
--- a/hass/docker-compose.devices.yml
+++ b/hass/docker-compose.devices.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   hass:
     devices:
diff --git a/hass/docker-compose.labels.yml b/hass/docker-compose.labels.yml
index 57dab7a..2d44773 100644
--- a/hass/docker-compose.labels.yml
+++ b/hass/docker-compose.labels.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   hass:
     labels:
diff --git a/hass/docker-compose.logging.yml b/hass/docker-compose.logging.yml
index ea20b97..daa1764 100644
--- a/hass/docker-compose.logging.yml
+++ b/hass/docker-compose.logging.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   hass:
     logging:
diff --git a/hass/docker-compose.yml b/hass/docker-compose.yml
index 31c8ac7..b1195fb 100644
--- a/hass/docker-compose.yml
+++ b/hass/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 networks:
   proxy:
     external: true
diff --git a/indexarr/docker-compose.labels.yml b/indexarr/docker-compose.labels.yml
index 4eb2145..07817eb 100644
--- a/indexarr/docker-compose.labels.yml
+++ b/indexarr/docker-compose.labels.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   jackett:
     labels:
diff --git a/indexarr/docker-compose.logging.yml b/indexarr/docker-compose.logging.yml
index f24e751..fa7c7a2 100644
--- a/indexarr/docker-compose.logging.yml
+++ b/indexarr/docker-compose.logging.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   openvpn:
     logging:
diff --git a/indexarr/docker-compose.ports.yml b/indexarr/docker-compose.ports.yml
index 4851fae..b8e402d 100644
--- a/indexarr/docker-compose.ports.yml
+++ b/indexarr/docker-compose.ports.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   openvpn:
     ports:
diff --git a/indexarr/docker-compose.yml b/indexarr/docker-compose.yml
index 3dd700e..f87634a 100644
--- a/indexarr/docker-compose.yml
+++ b/indexarr/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 networks:
   proxy:
     external: true
diff --git a/influxdb/docker-compose.logging.yml b/influxdb/docker-compose.logging.yml
index 46fc02b..fb1063b 100644
--- a/influxdb/docker-compose.logging.yml
+++ b/influxdb/docker-compose.logging.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   influxdb:
     logging:
diff --git a/influxdb/docker-compose.ports.yml b/influxdb/docker-compose.ports.yml
index c34044f..2eedb99 100644
--- a/influxdb/docker-compose.ports.yml
+++ b/influxdb/docker-compose.ports.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   influxdb:
     ports:
diff --git a/influxdb/docker-compose.yml b/influxdb/docker-compose.yml
index ff1853c..bb8c9c3 100644
--- a/influxdb/docker-compose.yml
+++ b/influxdb/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   influxdb:
     hostname: influxdb
diff --git a/kodi_db/docker-compose.logging.yml b/kodi_db/docker-compose.logging.yml
index b939f9e..8353ea2 100644
--- a/kodi_db/docker-compose.logging.yml
+++ b/kodi_db/docker-compose.logging.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   mariadb:
     logging:
diff --git a/kodi_db/docker-compose.ports.yml b/kodi_db/docker-compose.ports.yml
index 16b75c7..aa49e4e 100644
--- a/kodi_db/docker-compose.ports.yml
+++ b/kodi_db/docker-compose.ports.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   mariadb:
     ports:
diff --git a/kodi_db/docker-compose.yml b/kodi_db/docker-compose.yml
index 3e37edd..b143a58 100644
--- a/kodi_db/docker-compose.yml
+++ b/kodi_db/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   mariadb:
     hostname: mariadb
diff --git a/monitarr/docker-compose.labels.yml b/monitarr/docker-compose.labels.yml
index bd1a178..0f65519 100644
--- a/monitarr/docker-compose.labels.yml
+++ b/monitarr/docker-compose.labels.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   lidarr:
     labels:
diff --git a/monitarr/docker-compose.logging.yml b/monitarr/docker-compose.logging.yml
index 75d1670..9e78113 100644
--- a/monitarr/docker-compose.logging.yml
+++ b/monitarr/docker-compose.logging.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   lidarr:
     logging:
diff --git a/monitarr/docker-compose.yml b/monitarr/docker-compose.yml
index a0759de..103020c 100644
--- a/monitarr/docker-compose.yml
+++ b/monitarr/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 networks:
   proxy:
     external: true
diff --git a/navidrome/docker-compose.labels.yml b/navidrome/docker-compose.labels.yml
index dedc8bd..14c7270 100644
--- a/navidrome/docker-compose.labels.yml
+++ b/navidrome/docker-compose.labels.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   navidrome:
     labels:
diff --git a/navidrome/docker-compose.logging.yml b/navidrome/docker-compose.logging.yml
index 83087f9..3a94ce0 100644
--- a/navidrome/docker-compose.logging.yml
+++ b/navidrome/docker-compose.logging.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   navidrome:
     logging:
diff --git a/navidrome/docker-compose.yml b/navidrome/docker-compose.yml
index 2f0336d..66cfd03 100644
--- a/navidrome/docker-compose.yml
+++ b/navidrome/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 networks:
   proxy:
     external: true
diff --git a/nextcloud/docker-compose.labels.yml b/nextcloud/docker-compose.labels.yml
index 0a53fb2..5a375c1 100644
--- a/nextcloud/docker-compose.labels.yml
+++ b/nextcloud/docker-compose.labels.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   nextcloud:
     labels:
diff --git a/nextcloud/docker-compose.logging.yml b/nextcloud/docker-compose.logging.yml
index 3d7c3fd..ef303cd 100644
--- a/nextcloud/docker-compose.logging.yml
+++ b/nextcloud/docker-compose.logging.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   mariadb:
     logging:
diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml
index 11cfb30..c919722 100644
--- a/nextcloud/docker-compose.yml
+++ b/nextcloud/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 networks:
   proxy:
     external: true
diff --git a/pihole/docker-compose.labels.yml b/pihole/docker-compose.labels.yml
index e12733e..c30e703 100644
--- a/pihole/docker-compose.labels.yml
+++ b/pihole/docker-compose.labels.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   pihole:
     labels:
diff --git a/pihole/docker-compose.logging.yml b/pihole/docker-compose.logging.yml
index c13cdd6..cdf0357 100644
--- a/pihole/docker-compose.logging.yml
+++ b/pihole/docker-compose.logging.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   dnscrypt-proxy:
     logging:
diff --git a/pihole/docker-compose.ports.yml b/pihole/docker-compose.ports.yml
index 70bc286..6800054 100644
--- a/pihole/docker-compose.ports.yml
+++ b/pihole/docker-compose.ports.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   pihole:
     ports:
diff --git a/qbittorrent/docker-compose.labels.yml b/qbittorrent/docker-compose.labels.yml
index 0ce33f6..eaddb87 100644
--- a/qbittorrent/docker-compose.labels.yml
+++ b/qbittorrent/docker-compose.labels.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   qbittorrent:
     labels:
diff --git a/qbittorrent/docker-compose.logging.yml b/qbittorrent/docker-compose.logging.yml
index 03a0d69..f80494c 100644
--- a/qbittorrent/docker-compose.logging.yml
+++ b/qbittorrent/docker-compose.logging.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   openvpn:
     logging:
diff --git a/qbittorrent/docker-compose.ports.yml b/qbittorrent/docker-compose.ports.yml
index ffa2d9c..fa00455 100644
--- a/qbittorrent/docker-compose.ports.yml
+++ b/qbittorrent/docker-compose.ports.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   openvpn:
     ports:
diff --git a/qbittorrent/docker-compose.yml b/qbittorrent/docker-compose.yml
index eb8bebb..6f9c657 100644
--- a/qbittorrent/docker-compose.yml
+++ b/qbittorrent/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 networks:
   proxy:
     external: true
diff --git a/tang/docker-compose.labels.yml b/tang/docker-compose.labels.yml
index 8907f7c..b91d218 100644
--- a/tang/docker-compose.labels.yml
+++ b/tang/docker-compose.labels.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   tang:
     labels:
diff --git a/tang/docker-compose.logging.yml b/tang/docker-compose.logging.yml
index fab9017..13dd985 100644
--- a/tang/docker-compose.logging.yml
+++ b/tang/docker-compose.logging.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   tang:
     logging:
diff --git a/tang/docker-compose.yml b/tang/docker-compose.yml
index 7c9f498..fcc178f 100644
--- a/tang/docker-compose.yml
+++ b/tang/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 networks:
   proxy:
     external: true
diff --git a/telegraf/docker-compose.logging.yml b/telegraf/docker-compose.logging.yml
index 396d1f5..80acb39 100644
--- a/telegraf/docker-compose.logging.yml
+++ b/telegraf/docker-compose.logging.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   telegraf:
     logging:
diff --git a/telegraf/docker-compose.yml b/telegraf/docker-compose.yml
index 677c175..fd8d129 100644
--- a/telegraf/docker-compose.yml
+++ b/telegraf/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 networks:
   shared:
     external: true
diff --git a/teslamate/docker-compose.labels.yml b/teslamate/docker-compose.labels.yml
index bb9396f..a6cb8c4 100644
--- a/teslamate/docker-compose.labels.yml
+++ b/teslamate/docker-compose.labels.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   teslamate:
     labels:
diff --git a/teslamate/docker-compose.ports.yml b/teslamate/docker-compose.ports.yml
index 2bf6e39..c9f684a 100644
--- a/teslamate/docker-compose.ports.yml
+++ b/teslamate/docker-compose.ports.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   mqtt:
     ports:
diff --git a/teslamate/docker-compose.yml b/teslamate/docker-compose.yml
index baec671..245fb13 100644
--- a/teslamate/docker-compose.yml
+++ b/teslamate/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 networks:
   proxy:
     external: true
diff --git a/traefik/docker-compose.labels.yml b/traefik/docker-compose.labels.yml
index d57601d..7d49d97 100644
--- a/traefik/docker-compose.labels.yml
+++ b/traefik/docker-compose.labels.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   traefik:
     labels:
diff --git a/traefik/docker-compose.logging.yml b/traefik/docker-compose.logging.yml
index eafbac4..95cfda7 100644
--- a/traefik/docker-compose.logging.yml
+++ b/traefik/docker-compose.logging.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   traefik:
     logging:
diff --git a/traefik/docker-compose.ports.yml b/traefik/docker-compose.ports.yml
index 70b5023..0c28d80 100644
--- a/traefik/docker-compose.ports.yml
+++ b/traefik/docker-compose.ports.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   traefik:
     ports:
diff --git a/traefik/docker-compose.yml b/traefik/docker-compose.yml
index 54795c1..a5a1225 100644
--- a/traefik/docker-compose.yml
+++ b/traefik/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 networks:
   shared:
     external: true
diff --git a/unifi/docker-compose.logging.yml b/unifi/docker-compose.logging.yml
index 9721662..5a4440d 100644
--- a/unifi/docker-compose.logging.yml
+++ b/unifi/docker-compose.logging.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   mongo:
     logging:
diff --git a/unifi/docker-compose.ports.yml b/unifi/docker-compose.ports.yml
index 93dbaaa..67d58fe 100644
--- a/unifi/docker-compose.ports.yml
+++ b/unifi/docker-compose.ports.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   unifi:
     ports:
diff --git a/unifi/docker-compose.yml b/unifi/docker-compose.yml
index 2d5aa67..582d15c 100644
--- a/unifi/docker-compose.yml
+++ b/unifi/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   mongo:
     hostname: mongo