diff --git a/services/admin/start.sh b/services/admin/start.sh
index 0aeb62b..d156ac8 100755
--- a/services/admin/start.sh
+++ b/services/admin/start.sh
@@ -6,4 +6,4 @@ source ../env.sh
 echo "Looks good! GHC_ADMIN_USER_NAME user is: ${GHC_ADMIN_USER_NAME}"
 
 ./stop.sh
-docker-compose up -d
+docker compose up -d
diff --git a/services/admin/stop.sh b/services/admin/stop.sh
index f8403ec..c2245e4 100755
--- a/services/admin/stop.sh
+++ b/services/admin/stop.sh
@@ -2,5 +2,5 @@
 
 source ../env.sh
 
-docker-compose stop
-docker-compose rm --force
+docker compose stop
+docker compose rm --force
diff --git a/services/geoserver/start.sh b/services/geoserver/start.sh
index 947ada0..ff52d50 100755
--- a/services/geoserver/start.sh
+++ b/services/geoserver/start.sh
@@ -5,4 +5,4 @@ source ./env.sh
 ./stop.sh
 # do not start GeoServer
 exit 0
-docker-compose up -d
+docker compose up -d
diff --git a/services/geoserver/stop.sh b/services/geoserver/stop.sh
index 11090a3..18b0d61 100755
--- a/services/geoserver/stop.sh
+++ b/services/geoserver/stop.sh
@@ -2,5 +2,5 @@
 
 source ./env.sh
 
-docker-compose stop
-docker-compose rm --force
+docker compose stop
+docker compose rm --force
diff --git a/services/goaf/start.sh b/services/goaf/start.sh
index 3601cde..7a05d49 100755
--- a/services/goaf/start.sh
+++ b/services/goaf/start.sh
@@ -3,4 +3,4 @@
 source ./env.sh
 
 ./stop.sh
-docker-compose up -d
+docker compose up -d
diff --git a/services/goaf/stop.sh b/services/goaf/stop.sh
index 11090a3..18b0d61 100755
--- a/services/goaf/stop.sh
+++ b/services/goaf/stop.sh
@@ -2,5 +2,5 @@
 
 source ./env.sh
 
-docker-compose stop
-docker-compose rm --force
+docker compose stop
+docker compose rm --force
diff --git a/services/home/deploy.sh b/services/home/deploy.sh
index 5d977f8..619e8f6 100755
--- a/services/home/deploy.sh
+++ b/services/home/deploy.sh
@@ -3,5 +3,5 @@
 source ../env.sh
 
 ./stop.sh
-docker-compose build
+docker compose build
 ./start.sh
diff --git a/services/home/start.sh b/services/home/start.sh
index a416760..91c3d30 100755
--- a/services/home/start.sh
+++ b/services/home/start.sh
@@ -3,4 +3,4 @@
 source ../env.sh
 
 ./stop.sh
-docker-compose up -d
+docker compose up -d
diff --git a/services/home/stop.sh b/services/home/stop.sh
index f8403ec..c2245e4 100755
--- a/services/home/stop.sh
+++ b/services/home/stop.sh
@@ -2,5 +2,5 @@
 
 source ../env.sh
 
-docker-compose stop
-docker-compose rm --force
+docker compose stop
+docker compose rm --force
diff --git a/services/ldproxy/start.sh b/services/ldproxy/start.sh
index 012e584..96561fc 100755
--- a/services/ldproxy/start.sh
+++ b/services/ldproxy/start.sh
@@ -8,4 +8,4 @@ source ./env.sh
 # sudo rm -rf ${RMFILES} > /dev/null 2>&1
 
 ./stop.sh
-docker-compose up -d
+docker compose up -d
diff --git a/services/ldproxy/stop.sh b/services/ldproxy/stop.sh
index 11090a3..18b0d61 100755
--- a/services/ldproxy/stop.sh
+++ b/services/ldproxy/stop.sh
@@ -2,5 +2,5 @@
 
 source ./env.sh
 
-docker-compose stop
-docker-compose rm --force
+docker compose stop
+docker compose rm --force
diff --git a/services/postgis/start.sh b/services/postgis/start.sh
index 8bf97a8..4d5fa7f 100755
--- a/services/postgis/start.sh
+++ b/services/postgis/start.sh
@@ -6,4 +6,4 @@ source ./env.sh
 echo "Looks good! POSTGRES user is: ${PG_USER}"
 
 ./stop.sh
-docker-compose up -d
+docker compose up -d
diff --git a/services/postgis/stop.sh b/services/postgis/stop.sh
index 11090a3..18b0d61 100755
--- a/services/postgis/stop.sh
+++ b/services/postgis/stop.sh
@@ -2,5 +2,5 @@
 
 source ./env.sh
 
-docker-compose stop
-docker-compose rm --force
+docker compose stop
+docker compose rm --force
diff --git a/services/pycsw/start.sh b/services/pycsw/start.sh
index 3601cde..7a05d49 100755
--- a/services/pycsw/start.sh
+++ b/services/pycsw/start.sh
@@ -3,4 +3,4 @@
 source ./env.sh
 
 ./stop.sh
-docker-compose up -d
+docker compose up -d
diff --git a/services/pycsw/stop.sh b/services/pycsw/stop.sh
index 11090a3..18b0d61 100755
--- a/services/pycsw/stop.sh
+++ b/services/pycsw/stop.sh
@@ -2,5 +2,5 @@
 
 source ./env.sh
 
-docker-compose stop
-docker-compose rm --force
+docker compose stop
+docker compose rm --force
diff --git a/services/pygeoapi/start.sh b/services/pygeoapi/start.sh
index 3601cde..7a05d49 100755
--- a/services/pygeoapi/start.sh
+++ b/services/pygeoapi/start.sh
@@ -3,4 +3,4 @@
 source ./env.sh
 
 ./stop.sh
-docker-compose up -d
+docker compose up -d
diff --git a/services/pygeoapi/stop.sh b/services/pygeoapi/stop.sh
index 11090a3..18b0d61 100755
--- a/services/pygeoapi/stop.sh
+++ b/services/pygeoapi/stop.sh
@@ -2,5 +2,5 @@
 
 source ./env.sh
 
-docker-compose stop
-docker-compose rm --force
+docker compose stop
+docker compose rm --force
diff --git a/services/qgis/start.sh b/services/qgis/start.sh
index 61c7499..c1ea96b 100755
--- a/services/qgis/start.sh
+++ b/services/qgis/start.sh
@@ -7,4 +7,4 @@ sudo chmod 777 data
 sudo chmod 777 data/*
 
 ./stop.sh
-docker-compose up -d
+docker compose up -d
diff --git a/services/qgis/stop.sh b/services/qgis/stop.sh
index 11090a3..18b0d61 100755
--- a/services/qgis/stop.sh
+++ b/services/qgis/stop.sh
@@ -2,5 +2,5 @@
 
 source ./env.sh
 
-docker-compose stop
-docker-compose rm --force
+docker compose stop
+docker compose rm --force
diff --git a/services/teamengine/start.sh b/services/teamengine/start.sh
index 3601cde..7a05d49 100755
--- a/services/teamengine/start.sh
+++ b/services/teamengine/start.sh
@@ -3,4 +3,4 @@
 source ./env.sh
 
 ./stop.sh
-docker-compose up -d
+docker compose up -d
diff --git a/services/teamengine/stop.sh b/services/teamengine/stop.sh
index 11090a3..18b0d61 100755
--- a/services/teamengine/stop.sh
+++ b/services/teamengine/stop.sh
@@ -2,5 +2,5 @@
 
 source ./env.sh
 
-docker-compose stop
-docker-compose rm --force
+docker compose stop
+docker compose rm --force
diff --git a/services/traefik/docker-compose.yml b/services/traefik/docker-compose.yml
index 529b7fd..3b71ffd 100644
--- a/services/traefik/docker-compose.yml
+++ b/services/traefik/docker-compose.yml
@@ -22,7 +22,7 @@ services:
       - --providers.file
       - --providers.file.directory=/etc/traefikdyn
       # Create the certificate resolver "le" for Let's Encrypt, uses the environment variable CERT_EMAIL
-      - --certificatesresolvers.le.acme.email=${CERT_EMAIL?Variable not set}
+      - --certificatesresolvers.le.acme.email=${CERT_EMAIL}
       # Store the Let's Encrypt certificates in the mounted volume
       - --certificatesresolvers.le.acme.storage=/certificates/acme.json
       # Use the TLS Challenge for Let's Encrypt
diff --git a/services/traefik/start.sh b/services/traefik/start.sh
index e00e4df..4d00bf0 100755
--- a/services/traefik/start.sh
+++ b/services/traefik/start.sh
@@ -6,4 +6,4 @@
 
 source ./env.sh
 
-docker-compose up -d
+docker compose up -d
diff --git a/services/traefik/stop.sh b/services/traefik/stop.sh
index 11090a3..18b0d61 100755
--- a/services/traefik/stop.sh
+++ b/services/traefik/stop.sh
@@ -2,5 +2,5 @@
 
 source ./env.sh
 
-docker-compose stop
-docker-compose rm --force
+docker compose stop
+docker compose rm --force