diff --git a/bin/convertdomain b/bin/convertdomain
index 6925726..d5e4a06 100755
--- a/bin/convertdomain
+++ b/bin/convertdomain
@@ -121,7 +121,7 @@ convert_traefik() {
   rm -rf /federated/apps/traefik/data/letsencrypt/acme.json
 
   # Start Traefik
-  docker-compose -f /federated/apps/traefik/docker-compose.yml -p traefik up -d &> /dev/null
+  docker compose -f /federated/apps/traefik/docker-compose.yml -p traefik up -d &> /dev/null
 
   # Keep trying to see that certificates are generated
   RETRY="20"
@@ -134,7 +134,7 @@ convert_traefik() {
       break
     else
       if [ "$RETRY" == 1 ]; then
-        docker-compose -f /federated/apps/traefik/docker-compose.yml -p traefik down &> /dev/null
+        docker compose -f /federated/apps/traefik/docker-compose.yml -p traefik down &> /dev/null
         failcheck "There was a problem starting service /federated/apps/traefik\nCheck the output of 'docker logs traefik'"
       fi
       ((RETRY--))
diff --git a/bin/stop b/bin/stop
index 1961faa..4c40f51 100755
--- a/bin/stop
+++ b/bin/stop
@@ -13,8 +13,8 @@ stopservice() {
   spin &
   SPINPID=$!
 
-  cd /federated/apps/$1 && docker-compose -f docker-compose.yml -p $1 down &> /dev/null
-  [ $? -ne 0 ] && echo -ne "\nThere was a problem stopping service /federated/apps/$1\nCheck the output of 'docker logs $1' while stopping or run\ndocker-compose -f /federated/apps/$1/docker-compose.yml -p $1 down\n\n"
+  cd /federated/apps/$1 && docker compose -f docker-compose.yml -p $1 down &> /dev/null
+  [ $? -ne 0 ] && echo -ne "\nThere was a problem stopping service /federated/apps/$1\nCheck the output of 'docker logs $1' while stopping or run\ndocker compose -f /federated/apps/$1/docker-compose.yml -p $1 down\n\n"
 
   disown $SPINPID &> /dev/null
   kill -9 $SPINPID &> /dev/null
@@ -26,13 +26,13 @@ stopservice_all_old() {
     [ ! -d "/federated/apps/$i" ] && continue
 
     echo "* Stopping $i.."
-    cd /federated/apps/$i && docker-compose -f docker-compose.yml -p $i down
+    cd /federated/apps/$i && docker compose -f docker-compose.yml -p $i down
   done
 }
 stopservice_all() {
   echo "* Stopping $i."
-  cd /federated/apps/$1 && docker-compose -f docker-compose.yml -p $1 down &> /dev/null
-  [ $? -ne 0 ] && echo -ne "\nThere was a problem stopping service /federated/apps/$1\nCheck the output of 'docker logs $1' while stopping or run\ndocker-compose -f /federated/apps/$1/docker-compose.yml -p $1 down\n\n"
+  cd /federated/apps/$1 && docker compose -f docker-compose.yml -p $1 down &> /dev/null
+  [ $? -ne 0 ] && echo -ne "\nThere was a problem stopping service /federated/apps/$1\nCheck the output of 'docker logs $1' while stopping or run\ndocker compose -f /federated/apps/$1/docker-compose.yml -p $1 down\n\n"
 }
 
 [[ $# -ne 1 ]] && usage
diff --git a/lib/authelia.sh b/lib/authelia.sh
index 7a1ef6b..3a7631f 100644
--- a/lib/authelia.sh
+++ b/lib/authelia.sh
@@ -219,7 +219,7 @@ uninstall_authelia() {
   SPINPID=$!
 
   # First stop the service
-  cd /federated/apps/authelia && docker-compose -f docker-compose.yml -p authelia down &> /dev/null
+  cd /federated/apps/authelia && docker compose -f docker-compose.yml -p authelia down &> /dev/null
 
   # Delete the entries in the settings table
   [[ -d "/federated/apps/pdnsmysql/data/var/lib/mysql/pdnsadmin" ]] && POWERDNS_DB="pdnsadmin" || POWERDNS_DB="pdns"
diff --git a/lib/baserow.sh b/lib/baserow.sh
index 960f0ff..8a5aec4 100644
--- a/lib/baserow.sh
+++ b/lib/baserow.sh
@@ -167,7 +167,7 @@ uninstall_baserow() {
   SPINPID=$!
 
   # First stop the service
-  cd /federated/apps/baserow && docker-compose -f docker-compose.yml -p baserow down &> /dev/null
+  cd /federated/apps/baserow && docker compose -f docker-compose.yml -p baserow down &> /dev/null
 
   # Delete database and user in postgresql
   docker exec postgresql psql -U postgres -c "DROP DATABASE baserow" &> /dev/null
diff --git a/lib/bookstack.sh b/lib/bookstack.sh
index bb708bf..a2669dc 100644
--- a/lib/bookstack.sh
+++ b/lib/bookstack.sh
@@ -180,7 +180,7 @@ uninstall_bookstack() {
   SPINPID=$!
 
   # First stop the service
-  cd /federated/apps/bookstack && docker-compose -f docker-compose.yml -p bookstack down &> /dev/null
+  cd /federated/apps/bookstack && docker compose -f docker-compose.yml -p bookstack down &> /dev/null
 
   # Delete database and user
   docker exec pdnsmysql bash -c "mysql -uroot -p$MYSQL_ROOTPASSWORD -e 'drop database bookstack;'" &> /dev/null
diff --git a/lib/caddy.sh b/lib/caddy.sh
index f55a5a1..3830dae 100644
--- a/lib/caddy.sh
+++ b/lib/caddy.sh
@@ -188,7 +188,7 @@ uninstall_caddy() {
   SPINPID=$!
 
   # First stop the service
-  cd /federated/apps/caddy && docker-compose -f docker-compose.yml -p caddy down &> /dev/null
+  cd /federated/apps/caddy && docker compose -f docker-compose.yml -p caddy down &> /dev/null
 
   # Delete the app directory
   rm -rf /federated/apps/caddy
diff --git a/lib/castopod.sh b/lib/castopod.sh
index 14d58d8..ef9c275 100644
--- a/lib/castopod.sh
+++ b/lib/castopod.sh
@@ -168,7 +168,7 @@ uninstall_castopod() {
   SPINPID=$!
 
   # First stop the service
-  cd /federated/apps/castopod && docker-compose -f docker-compose.yml -p castopod down &> /dev/null
+  cd /federated/apps/castopod && docker compose -f docker-compose.yml -p castopod down &> /dev/null
 
   # Delete database and user
   docker exec pdnsmysql bash -c "mysql -uroot -p$MYSQL_ROOTPASSWORD -e 'drop database castopod;'" &> /dev/null
diff --git a/lib/connector.sh b/lib/connector.sh
index 0fec1f9..9e61b6a 100644
--- a/lib/connector.sh
+++ b/lib/connector.sh
@@ -71,10 +71,10 @@ start_connector() {
 
   if [ $DEBUG ]; then
     # Start /federated/apps/connector with output to console for debug
-    docker-compose -f /federated/apps/connector/docker-compose.yml -p connector up
+    docker compose -f /federated/apps/connector/docker-compose.yml -p connector up
     [ $? -eq 0 ] && echo -ne "done.\n" || fail "There was a problem starting service /federated/apps/connector"
   else
-    docker-compose -f /federated/apps/connector/docker-compose.yml -p connector up -d &> /dev/null
+    docker compose -f /federated/apps/connector/docker-compose.yml -p connector up -d &> /dev/null
 
     # Keep trying connector port 80 to make sure it's up
     # before we proceed
@@ -85,7 +85,7 @@ start_connector() {
         break
       else
         if [ "$RETRY" == 1 ]; then
-          docker-compose -f /federated/apps/connector/docker-compose.yml -p connector down &> /dev/null
+          docker compose -f /federated/apps/connector/docker-compose.yml -p connector down &> /dev/null
           kill -9 $SPINPID &> /dev/null
           fail "There was a problem starting service /federated/apps/connector\nCheck the output of 'docker logs connector' or turn on\ndebug with -d"
         fi
diff --git a/lib/dashboard.sh b/lib/dashboard.sh
index e0fad75..7f9ce73 100644
--- a/lib/dashboard.sh
+++ b/lib/dashboard.sh
@@ -75,7 +75,7 @@ uninstall_dashboard() {
   SPINPID=$!
 
   # First stop the service
-  cd /federated/apps/dashboard && docker-compose -f docker-compose.yml -p dashboard down &> /dev/null
+  cd /federated/apps/dashboard && docker compose -f docker-compose.yml -p dashboard down &> /dev/null
 
   # Delete the app directory
   rm -rf /federated/apps/dashboard
diff --git a/lib/discourse.sh b/lib/discourse.sh
index 333e43c..3d6dbfe 100644
--- a/lib/discourse.sh
+++ b/lib/discourse.sh
@@ -193,7 +193,7 @@ uninstall_discourse() {
   SPINPID=$!
 
   # First stop the service
-  cd /federated/apps/discourse && docker-compose -f docker-compose.yml -p discourse down &> /dev/null
+  cd /federated/apps/discourse && docker compose -f docker-compose.yml -p discourse down &> /dev/null
 
   # Delete database and user in postgresql
   docker exec postgresql psql -U postgres -c "DROP DATABASE discourse" &> /dev/null
diff --git a/lib/dns.sh b/lib/dns.sh
index 727d2e7..f7620a0 100644
--- a/lib/dns.sh
+++ b/lib/dns.sh
@@ -207,11 +207,11 @@ start_dns() {
 
   if [ $DEBUG ]; then
     # Start /federated/apps/dns with output to console for debug
-    docker-compose -f /federated/apps/dns/docker-compose.yml -p dns up
+    docker compose -f /federated/apps/dns/docker-compose.yml -p dns up
     [ $? -eq 0 ] && echo -ne "done.\n" || fail "There was a problem starting service /federated/apps/dns"
   else
     # Start /federated/apps/dns with output to /dev/null
-    docker-compose -f /federated/apps/dns/docker-compose.yml -p dns up -d &> /dev/null
+    docker compose -f /federated/apps/dns/docker-compose.yml -p dns up -d &> /dev/null
 
     # Keep trying to see that certificates are generated
     RETRY="18"
@@ -231,7 +231,7 @@ start_dns() {
         break
       else
         if [ "$RETRY" == 1 ]; then
-          docker-compose -f /federated/apps/dns/docker-compose.yml -p dns down &> /dev/null
+          docker compose -f /federated/apps/dns/docker-compose.yml -p dns down &> /dev/null
           fail "There was a problem starting service /federated/apps/dns\nCheck the output of 'docker logs dns' or turn on\ndebug with -d"
         fi
         ((RETRY--))
diff --git a/lib/espocrm.sh b/lib/espocrm.sh
index 3abad61..87de562 100644
--- a/lib/espocrm.sh
+++ b/lib/espocrm.sh
@@ -183,7 +183,7 @@ uninstall_espocrm() {
   SPINPID=$!
 
   # First stop the service
-  cd /federated/apps/espocrm && docker-compose -f docker-compose.yml -p espocrm down &> /dev/null
+  cd /federated/apps/espocrm && docker compose -f docker-compose.yml -p espocrm down &> /dev/null
 
   # Delete database and user
   docker exec pdnsmysql bash -c "mysql -uroot -p$MYSQL_ROOTPASSWORD -e 'drop database espocrm;'" &> /dev/null
@@ -266,7 +266,7 @@ EOF
   sed -i "/oidcScopes/d" /federated/apps/espocrm/data/var/www/html/data/config.php
   sed -i "/authenticationMethod/a  \  'oidcScopes' => [\n\    0 => 'profile',\n\    1 => 'email',\n\    2 => 'groups',\n\    3 => 'openid'\n\  ]," /federated/apps/espocrm/data/var/www/html/data/config.php
 
-  # Add in extra_hosts to docker-compose
+  # Add in extra_hosts to docker compose
   add_authelia_config_to_dockercompose "$APP"
 
   # Set auth method to Oidc only
diff --git a/lib/freescout.sh b/lib/freescout.sh
index 24838fb..4ab0401 100644
--- a/lib/freescout.sh
+++ b/lib/freescout.sh
@@ -166,7 +166,7 @@ uninstall_freescout() {
   SPINPID=$!
 
   # First stop the service
-  cd /federated/apps/freescout && docker-compose -f docker-compose.yml -p freescout down &> /dev/null
+  cd /federated/apps/freescout && docker compose -f docker-compose.yml -p freescout down &> /dev/null
   
   # Delete database and user in postgresql
   docker exec postgresql psql -U postgres -c "DROP DATABASE freescout" &> /dev/null
diff --git a/lib/functions.sh b/lib/functions.sh
index 548b6ec..8641056 100644
--- a/lib/functions.sh
+++ b/lib/functions.sh
@@ -133,7 +133,7 @@ upgrade_federated() {
         echo -ne "upgrading to $VERSION..\n"
         if [[ ! "$APP_NOTRUNNING" ]]; then
           echo -ne "\n   Shutting Down $APP.."
-          cd /federated/apps/$APP && docker-compose -f docker-compose.yml -p $APP down
+          cd /federated/apps/$APP && docker compose -f docker-compose.yml -p $APP down
         fi
         if [ "$APP" = "jitsi" ]; then
           sed -i "s/#JITSI_IMAGE_VERSION=.*/JITSI_IMAGE_VERSION=$VERSION/g" /federated/apps/$APP/.env
@@ -189,7 +189,7 @@ start_service_convert() {
   # Start /federated/apps/SERVICE with output to /dev/null
   echo -ne "\n* Starting /federated/apps/$SERVICE service.."
 
-  docker-compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up -d &> /dev/null
+  docker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up -d &> /dev/null
 
   # Keep trying service port to make sure it's up before
   # we proceed
@@ -200,7 +200,7 @@ start_service_convert() {
       break
     else
       if [ "$RETRY" == 1 ]; then
-        docker-compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE down &> /dev/null
+        docker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE down &> /dev/null
         fail "There was a problem starting service /federated/apps/$SERVICE\nCheck the output of 'docker logs $SERVICE' or turn on\ndebug with -d"
       fi
       ((RETRY--))
@@ -217,10 +217,10 @@ start_service_upgrade() {
 
   if [ $DEBUG ]; then
     # Start /federated/apps/SERVICE with output to console for debug
-    docker-compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up
+    docker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up
     [ $? -eq 0 ] && echo -ne "done.\n" || fail "There was a problem starting service /federated/apps/$SERVICE"
   else
-    docker-compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up -d &> /dev/null
+    docker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up -d &> /dev/null
 
     # Keep trying service port to make sure it's up before
     # we proceed
@@ -231,7 +231,7 @@ start_service_upgrade() {
         break
       else
         if [ "$RETRY" == 1 ]; then
-          docker-compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE down &> /dev/null
+          docker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE down &> /dev/null
           fail "There was a problem starting service /federated/apps/$SERVICE\nCheck the output of 'docker logs $SERVICE' or turn on\ndebug with -d"
         fi
         ((RETRY--))
@@ -247,7 +247,7 @@ start_service_withalert2() {
   ALERT="$4"
 
   # First start the service
-  docker-compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up -d &> /dev/null
+  docker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up -d &> /dev/null
 
   # Keep trying service COMMAND to make sure it's up before we proceed
   while [ "$RETRY" -gt "0" ]; do
@@ -263,13 +263,13 @@ start_service_withalert2() {
 
         if [ "$ALERT" = "yes" ]; then
           EXTERNALIP=`dig @resolver4.opendns.com myip.opendns.com +short 2> /dev/null`
-          docker-compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE down &> /dev/null
+          docker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE down &> /dev/null
           echo "Generated by /federated/bin/start" > /federated/apps/mail/data/root/certs/mailfile
           docker exec mail bash -c "mail -r admin@$DOMAIN -a \"Content-type: text/html\" -s \"$SERVICE failed to start on $EXTERNALIP\" $ALERTS_EMAIL < /root/certs/mailfile"
-          echo -ne "\nThere was a problem starting service /federated/apps/$SERVICE\nCheck the output of 'docker logs $SERVICE' while starting or run\ndocker-compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up\n"
+          echo -ne "\nThere was a problem starting service /federated/apps/$SERVICE\nCheck the output of 'docker logs $SERVICE' while starting or run\ndocker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up\n"
         else
-          docker-compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE down &> /dev/null
-          echo -ne "\nThere was a problem starting service /federated/apps/$SERVICE\nCheck the output of 'docker logs $SERVICE' while starting or run\ndocker-compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up\n"
+          docker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE down &> /dev/null
+          echo -ne "\nThere was a problem starting service /federated/apps/$SERVICE\nCheck the output of 'docker logs $SERVICE' while starting or run\ndocker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up\n"
         fi
         echo -ne "\n"
       fi
@@ -286,7 +286,7 @@ start_service_withalert() {
 
   echo -ne "* Starting $SERVICE.."
 
-  docker-compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up -d &> /dev/null
+  docker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up -d &> /dev/null
 
   # Keep trying service port to make sure it's up before
   # we proceed
@@ -302,12 +302,12 @@ start_service_withalert() {
 
 	if [ "$ALERT" = "yes" ]; then
           EXTERNALIP=`dig @resolver4.opendns.com myip.opendns.com +short 2> /dev/null`
-          docker-compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE down &> /dev/null
+          docker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE down &> /dev/null
 	  echo "Generated by /federated/bin/start" > /federated/apps/mail/data/root/certs/mailfile
 	  docker exec mail bash -c "mail -r admin@$DOMAIN -a \"Content-type: text/html\" -s \"$SERVICE failed to start on $EXTERNALIP\" $ALERTS_EMAIL < /root/certs/mailfile"
           echo -ne "\n\nThere was a problem starting service /federated/apps/$SERVICE\nCheck the output of 'docker logs $SERVICE' or turn on\ndebug with set -x\n\n"
 	else
-          docker-compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE down &> /dev/null
+          docker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE down &> /dev/null
           echo -ne "\n\nThere was a problem starting service /federated/apps/$SERVICE\nCheck the output of 'docker logs $SERVICE' or turn on\ndebug with set -x\n\n"
 	fi
       fi
@@ -326,10 +326,10 @@ start_service() {
 
   if [ $DEBUG ]; then
     # Start /federated/apps/SERVICE with output to console for debug
-    docker-compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up
+    docker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up
     [ $? -eq 0 ] && echo -ne "done.\n" || fail "There was a problem starting service /federated/apps/$SERVICE"
   else
-    docker-compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up -d &> /dev/null
+    docker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up -d &> /dev/null
 
     # Keep trying service port to make sure it's up before
     # we proceed
@@ -339,7 +339,7 @@ start_service() {
         break
       else
         if [ "$RETRY" == 1 ]; then
-          docker-compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE down &> /dev/null
+          docker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE down &> /dev/null
           kill -9 $SPINPID &> /dev/null
           fail "There was a problem starting service /federated/apps/$SERVICE\nCheck the output of 'docker logs $SERVICE' or turn on\ndebug with set -x"
         fi
diff --git a/lib/gitea.sh b/lib/gitea.sh
index 8f9c36b..0d2d1d4 100644
--- a/lib/gitea.sh
+++ b/lib/gitea.sh
@@ -245,7 +245,7 @@ uninstall_gitea() {
   SPINPID=$!
 
   # First stop the service
-  cd /federated/apps/gitea && docker-compose -f docker-compose.yml -p gitea down &> /dev/null
+  cd /federated/apps/gitea && docker compose -f docker-compose.yml -p gitea down &> /dev/null
 
   # Delete database and user in postgresql
   docker exec postgresql psql -U postgres -c "DROP DATABASE gitea" &> /dev/null
diff --git a/lib/jitsi.sh b/lib/jitsi.sh
index 63a946e..897cc3f 100644
--- a/lib/jitsi.sh
+++ b/lib/jitsi.sh
@@ -782,7 +782,7 @@ uninstall_jitsi() {
   SPINPID=$!
 
   # First stop the service
-  cd /federated/apps/jitsi && docker-compose -f docker-compose.yml -p jitsi down &> /dev/null
+  cd /federated/apps/jitsi && docker compose -f docker-compose.yml -p jitsi down &> /dev/null
 
   # Delete the app directory
   rm -rf /federated/apps/jitsi
@@ -805,7 +805,7 @@ uninstall_jitsi() {
   fi
 
   if [[ -d "/federated/apps/jitsiopenid" ]]; then
-    cd /federated/apps/jitsiopenid && docker-compose -f docker-compose.yml -p jitsiopenid down &> /dev/null
+    cd /federated/apps/jitsiopenid && docker compose -f docker-compose.yml -p jitsiopenid down &> /dev/null
     rm -rf /federated/apps/jitsiopenid
     docker image rm mod242/jitsi-go-openid:latest &> /dev/null
   fi
diff --git a/lib/listmonk.sh b/lib/listmonk.sh
index b7af9c7..472af8a 100644
--- a/lib/listmonk.sh
+++ b/lib/listmonk.sh
@@ -77,7 +77,7 @@ echo -ne "done."
 }
 start_listmonk() {
   # Install the database scheme first
-  docker-compose -f /federated/apps/listmonk/docker-compose.yml run --rm listmonk ./listmonk --install --yes &> /dev/null
+  docker compose -f /federated/apps/listmonk/docker-compose.yml run --rm listmonk ./listmonk --install --yes &> /dev/null
 
   # Change app.root_url and other settings to our domain
   docker exec postgresql psql -U listmonk -c "update settings set value='\"http://listmonk.$DOMAIN\"' where key='app.root_url'" &> /dev/null
@@ -176,7 +176,7 @@ uninstall_listmonk() {
   SPINPID=$!
 
   # First stop the service
-  cd /federated/apps/listmonk && docker-compose -f docker-compose.yml -p listmonk down &> /dev/null
+  cd /federated/apps/listmonk && docker compose -f docker-compose.yml -p listmonk down &> /dev/null
 
   # Delete database and user in postgresql
   docker exec postgresql psql -U postgres -c "DROP DATABASE listmonk" &> /dev/null
diff --git a/lib/mail.sh b/lib/mail.sh
index 0f5000c..8c4c66d 100644
--- a/lib/mail.sh
+++ b/lib/mail.sh
@@ -305,7 +305,7 @@ uninstall_mail() {
   SPINPID=$!
 
   # First stop the service
-  cd /federated/apps/mail && docker-compose -f docker-compose.yml -p mail down &> /dev/null
+  cd /federated/apps/mail && docker compose -f docker-compose.yml -p mail down &> /dev/null
 
   # Delete the app directory
   rm -rf /federated/apps/mail
diff --git a/lib/matrix.sh b/lib/matrix.sh
index 81ba4cb..b7623bd 100644
--- a/lib/matrix.sh
+++ b/lib/matrix.sh
@@ -225,7 +225,7 @@ uninstall_matrix() {
   SPINPID=$!
 
   # First stop the service
-  cd /federated/apps/matrix && docker-compose -f docker-compose.yml -p matrix down &> /dev/null
+  cd /federated/apps/matrix && docker compose -f docker-compose.yml -p matrix down &> /dev/null
 
   # Delete database and user in postgresql
   docker exec postgresql psql -U postgres -c "DROP DATABASE matrix" &> /dev/null
diff --git a/lib/matrixsignal.sh b/lib/matrixsignal.sh
index 32c8ff8..2dfb7e6 100644
--- a/lib/matrixsignal.sh
+++ b/lib/matrixsignal.sh
@@ -87,7 +87,7 @@ uninstall_matrixsignal() {
   SPINPID=$!
 
   # First stop the service
-  cd /federated/apps/matrixsignal && docker-compose -f docker-compose.yml -p matrixsignal down &> /dev/null
+  cd /federated/apps/matrixsignal && docker compose -f docker-compose.yml -p matrixsignal down &> /dev/null
 
   # Delete database and user in postgresql
   docker exec postgresql psql -U postgres -c "DROP DATABASE matrixsignal" &> /dev/null
diff --git a/lib/matrixslack.sh b/lib/matrixslack.sh
index 168460c..9f5f5ab 100644
--- a/lib/matrixslack.sh
+++ b/lib/matrixslack.sh
@@ -87,7 +87,7 @@ uninstall_matrixslack() {
   SPINPID=$!
 
   # First stop the service
-  cd /federated/apps/matrixslack && docker-compose -f docker-compose.yml -p matrixslack down &> /dev/null
+  cd /federated/apps/matrixslack && docker compose -f docker-compose.yml -p matrixslack down &> /dev/null
 
   # Delete database and user in postgresql
   docker exec postgresql psql -U postgres -c "DROP DATABASE matrixslack" &> /dev/null
diff --git a/lib/matrixwhatsapp.sh b/lib/matrixwhatsapp.sh
index 5512438..838841e 100644
--- a/lib/matrixwhatsapp.sh
+++ b/lib/matrixwhatsapp.sh
@@ -87,7 +87,7 @@ uninstall_matrixwhatsapp() {
   SPINPID=$!
 
   # First stop the service
-  cd /federated/apps/matrixwhatsapp && docker-compose -f docker-compose.yml -p matrixwhatsapp down &> /dev/null
+  cd /federated/apps/matrixwhatsapp && docker compose -f docker-compose.yml -p matrixwhatsapp down &> /dev/null
 
   # Delete database and user in postgresql
   docker exec postgresql psql -U postgres -c "DROP DATABASE matrixwhatsapp" &> /dev/null
diff --git a/lib/msp.sh b/lib/msp.sh
index ae8f3bf..b8c404b 100644
--- a/lib/msp.sh
+++ b/lib/msp.sh
@@ -152,7 +152,7 @@ uninstall_msp() {
   SPINPID=$!
 
   # First stop the service
-  cd /federated/apps/msp && docker-compose -f docker-compose.yml -p msp down &> /dev/null
+  cd /federated/apps/msp && docker compose -f docker-compose.yml -p msp down &> /dev/null
 
   # Delete the app directory
   rm -rf /federated/apps/msp
diff --git a/lib/nextcloud.sh b/lib/nextcloud.sh
index c8826c0..9eeb4da 100644
--- a/lib/nextcloud.sh
+++ b/lib/nextcloud.sh
@@ -320,7 +320,7 @@ uninstall_nextcloud() {
   SPINPID=$!
 
   # First stop the service
-  cd /federated/apps/nextcloud && docker-compose -f docker-compose.yml -p nextcloud down &> /dev/null
+  cd /federated/apps/nextcloud && docker compose -f docker-compose.yml -p nextcloud down &> /dev/null
 
   # Delete database and user in postgresql
   docker exec postgresql psql -U postgres -c "DROP DATABASE nextcloud" &> /dev/null
diff --git a/lib/redis.sh b/lib/redis.sh
index bae8bd6..208c8b9 100644
--- a/lib/redis.sh
+++ b/lib/redis.sh
@@ -63,7 +63,7 @@ uninstall_redis() {
   SPINPID=$!
 
   # First stop the service
-  cd /federated/apps/redis && docker-compose -f docker-compose.yml -p redis down &> /dev/null
+  cd /federated/apps/redis && docker compose -f docker-compose.yml -p redis down &> /dev/null
 
   # Delete the app directory
   rm -rf /federated/apps/redis
diff --git a/lib/roundcube.sh b/lib/roundcube.sh
index 4db1247..0790a4a 100644
--- a/lib/roundcube.sh
+++ b/lib/roundcube.sh
@@ -117,7 +117,7 @@ uninstall_roundcube() {
   SPINPID=$!
 
   # First stop the service
-  cd /federated/apps/roundcube && docker-compose -f docker-compose.yml -p roundcube down &> /dev/null
+  cd /federated/apps/roundcube && docker compose -f docker-compose.yml -p roundcube down &> /dev/null
 
   # Delete database and user
   docker exec pdnsmysql bash -c "mysql -uroot -p$MYSQL_ROOTPASSWORD -e 'drop database roundcube;'" &> /dev/null
diff --git a/lib/traefik.sh b/lib/traefik.sh
index 544870a..c9fe338 100644
--- a/lib/traefik.sh
+++ b/lib/traefik.sh
@@ -101,11 +101,11 @@ start_traefik_old() {
 
   if [ $DEBUG ]; then
     # Start /federated/apps/traefik with output to console for debug
-    docker-compose -f /federated/apps/traefik/docker-compose.yml -p traefik up
+    docker compose -f /federated/apps/traefik/docker-compose.yml -p traefik up
     [ $? -eq 0 ] && echo -ne "done.\n" || fail "There was a problem starting service /federated/apps/traefik"
   else
     # Start /federated/apps/traefik with output to /dev/null
-    docker-compose -f /federated/apps/traefik/docker-compose.yml -p traefik up -d &> /dev/null
+    docker compose -f /federated/apps/traefik/docker-compose.yml -p traefik up -d &> /dev/null
 
     # Keep trying to see that certificates are generated
     RETRY="20"
@@ -120,7 +120,7 @@ start_traefik_old() {
         break
       else
         if [ "$RETRY" == 1 ]; then
-          docker-compose -f /federated/apps/traefik/docker-compose.yml -p traefik down &> /dev/null
+          docker compose -f /federated/apps/traefik/docker-compose.yml -p traefik down &> /dev/null
           fail "There was a problem starting service /federated/apps/traefik\nCheck the output of 'docker logs traefik' or turn on\ndebug with -d"
         fi
         ((RETRY--))
diff --git a/lib/vaultwarden.sh b/lib/vaultwarden.sh
index f3f326d..e6f818a 100644
--- a/lib/vaultwarden.sh
+++ b/lib/vaultwarden.sh
@@ -81,7 +81,7 @@ uninstall_vaultwarden() {
   SPINPID=$!
 
   # First stop the service
-  cd /federated/apps/vaultwarden && docker-compose -f docker-compose.yml -p vaultwarden down &> /dev/null
+  cd /federated/apps/vaultwarden && docker compose -f docker-compose.yml -p vaultwarden down &> /dev/null
 
   # Delete database and user in postgresql
   docker exec postgresql psql -U postgres -c "DROP DATABASE vaultwarden" &> /dev/null
diff --git a/lib/wireguard.sh b/lib/wireguard.sh
index aac77de..14ee421 100644
--- a/lib/wireguard.sh
+++ b/lib/wireguard.sh
@@ -138,7 +138,7 @@ uninstall_wireguard() {
   SPINPID=$!
 
   # First stop the service
-  cd /federated/apps/wireguard && docker-compose -f docker-compose.yml -p wireguard down &> /dev/null
+  cd /federated/apps/wireguard && docker compose -f docker-compose.yml -p wireguard down &> /dev/null
 
   # Delete the app directory
   rm -rf /federated/apps/wireguard
diff --git a/lib/wordpress.sh b/lib/wordpress.sh
index 0b510dd..d94931d 100644
--- a/lib/wordpress.sh
+++ b/lib/wordpress.sh
@@ -180,7 +180,7 @@ uninstall_wordpress() {
   SPINPID=$!
 
   # First stop the service
-  cd /federated/apps/wordpress && docker-compose -f docker-compose.yml -p wordpress down &> /dev/null
+  cd /federated/apps/wordpress && docker compose -f docker-compose.yml -p wordpress down &> /dev/null
 
   # Delete database and user
   docker exec pdnsmysql bash -c "mysql -uroot -p$MYSQL_ROOTPASSWORD -e 'drop database wordpress;'" &> /dev/null