diff --git a/docker-compose.yml b/docker-compose.yml
index d0f2519..b65b43d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -193,7 +193,7 @@ services:
   # sudo docker-compose restart mail
   #
   mail:
-    image: docker.io/mailserver/docker-mailserver:latest
+    image: docker.io/mailserver/docker-mailserver
     hostname: mail
     domainname: depaoli.id.au
     container_name: mail
@@ -258,7 +258,7 @@ services:
       - SYS_PTRACE
 
   openldapnew:
-    image: bitnami/openldap:latest
+    image: bitnami/openldap
     container_name: openldapnew
 #    command: "--loglevel debug"
     restart: always
@@ -309,7 +309,7 @@ services:
       - "1636:1636"
 
   openldap:
-    image: osixia/openldap:latest
+    image: osixia/openldap
     container_name: openldap
 #    command: "--loglevel debug"
     restart: always
@@ -356,7 +356,7 @@ services:
       - "636:636"
 
   phpldapadmin:
-    image: ghcr.io/colibris-xyz/phpldapadmin:latest
+    image: ghcr.io/colibris-xyz/phpldapadmin
     container_name: phpldapadmin
     restart: always
     environment:
@@ -380,7 +380,7 @@ services:
 
   # webmail
   roundcubemail:
-    image: roundcube/roundcubemail:latest
+    image: roundcube/roundcubemail
     container_name: roundcubemail
     restart: always
     labels:
@@ -410,7 +410,7 @@ services:
 
   portainer:
     container_name: portainer
-    image: portainer/portainer-ce:latest
+    image: portainer/portainer-ce
     restart: always
     depends_on:
       - pihole
@@ -472,7 +472,7 @@ services:
       - "com.centurylinklabs.watchtower.enable=false"
 
   mass:
-    image: ghcr.io/music-assistant/server:latest
+    image: ghcr.io/music-assistant/server
     container_name: mass
     restart: always
     network_mode: host
@@ -494,7 +494,7 @@ services:
 
   mosquitto:
     container_name: mosquitto
-    image: eclipse-mosquitto:latest
+    image: eclipse-mosquitto
     restart: always
     volumes:
       - /srv/docker/container/mosquitto:/mosquitto
@@ -548,7 +548,7 @@ services:
 
 # Monitoring
   speedtest-exporter:
-    image: miguelndecarvalho/speedtest-exporter:latest
+    image: miguelndecarvalho/speedtest-exporter
     container_name: speedtest-exporter
     labels:
       - "com.centurylinklabs.watchtower.enable=true"
@@ -559,7 +559,7 @@ services:
     restart: always
 
   prometheus:
-    image: prom/prometheus:latest
+    image: prom/prometheus
     container_name: prometheus
     depends_on:
       - pihole
@@ -587,7 +587,7 @@ services:
     restart: always
 
   node-exporter:
-    image: prom/node-exporter:latest
+    image: prom/node-exporter
     container_name: node-exporter
     volumes:
       - /proc:/host/proc:ro
@@ -627,7 +627,7 @@ services:
     restart: always
 
   blackbox_exporter:
-    image: prom/blackbox-exporter:latest
+    image: prom/blackbox-exporter
     container_name: blackbox-exporter
     command:
       - '--config.file=/etc/blackboxexporter/config.yml'
@@ -638,7 +638,7 @@ services:
     restart: always
 
   grafana:
-    image: grafana/grafana:latest
+    image: grafana/grafana
     container_name: grafana
     restart: always
     depends_on:
@@ -662,7 +662,7 @@ services:
 
   pihole:
     container_name: pihole
-    image: pihole/pihole:latest
+    image: pihole/pihole
     ports:
       - "192.168.0.2:53:53/tcp"
       - "192.168.0.2:53:53/udp"
@@ -689,7 +689,7 @@ services:
 
   bookdb_dev:
     container_name: bookdb_dev
-    image: postgres:latest
+    image: postgres
     restart: always
     environment:
       POSTGRES_PASSWORD: blahdeblah
@@ -709,7 +709,7 @@ services:
 
   bookdb:
     container_name: bookdb
-    image: postgres:latest
+    image: postgres
     restart: always
     environment:
       POSTGRES_PASSWORD: blahdeblah
@@ -844,7 +844,7 @@ services:
   vaultwarden:
     container_name: bitwarden
     restart: always
-    image: vaultwarden/server:latest
+    image: vaultwarden/server
     depends_on:
       - pihole
       - openldap
@@ -876,7 +876,7 @@ services:
       - "/etc/localtime:/etc/localtime:ro"
 
   wikidb:
-    image: postgres:latest
+    image: postgres
     container_name: wikidb
     environment:
       POSTGRES_DB: wiki
@@ -920,7 +920,7 @@ services:
       - "traefik.http.routers.wiki.entrypoints=secureweb"
 
   wetty:
-    image: wettyoss/wetty:latest
+    image: wettyoss/wetty
     container_name: wetty
     restart: always
     command:
@@ -940,7 +940,7 @@ services:
 
   # used for hass (eufy) to get notifications from camera
   eufy_security_ws:
-    image: bropat/eufy-security-ws:latest
+    image: bropat/eufy-security-ws
     container_name: eufy_security_ws
     restart: always
     environment:
@@ -1020,7 +1020,7 @@ services:
 #      - "traefik.http.routers.radarr.entrypoints=secureweb"
   ark-server:
     restart: always
-    image: hermsi/ark-server:latest
+    image: hermsi/ark-server
     container_name: ark-server
     volumes:
       - /srv/docker/container/ark-server:/app
@@ -1046,45 +1046,8 @@ services:
       # Steam's server-list port
       - "27015:27015/udp"
 
-# php wordpress (use traefik for https ssl offload)
-#  mimosa-clinic:
-#    restart: always
-#    container_name: mimosa-clinic
-#    image: wordpress:latest
-#    links:
-#      - mimosa-db:mysql
-#    environment:
-#      - WORDPRESS_DB_PASSWORD=badf)gaklsdjf77@(6234a
-#      - WORDPRESS_DB_USER=root
-#    ports:
-#      - "8787:80"
-#    volumes:
-#      - /srv/docker/container/mimosa-clinic/www-data:/var/www/html
-#    labels:
-#      - "com.centurylinklabs.watchtower.enable=true"
-#      - "traefik.enable=true"
-#      - "traefik.http.routers.mimosa.entrypoints=secureweb"
-#      - "traefik.http.routers.mimosa.rule=Host(`mimosa.depaoli.id.au`)"
-#      - "traefik.http.routers.mimosa.tls=true"
-#      - "traefik.http.routers.mimosa-http.entrypoints=web"
-#      - "traefik.http.routers.mimosa-http.rule=Host(`mimosa.depaoli.id.au`)"
-#      - "traefik.http.middlewares.mimosa-http-redirect.redirectscheme.scheme=https"
-#      - "traefik.http.middlewares.mimosa-http-redirect.redirectscheme.permanent=true"
-#      - "traefik.http.routers.mimosa-http.middlewares=mimosa-http-redirect@docker"
-#  mimosa-db:
-#    restart: always
-#    container_name: mimosa-db
-#    image: mariadb:latest
-#    environment:
-#      - MYSQL_ROOT_PASSWORD=badf)gaklsdjf77@(6234a
-#      - MYSQL_DATABASE=wordpress
-#    labels:
-#      - "com.centurylinklabs.watchtower.enable=true"
-#    volumes:
-#      - /srv/docker/container/mimosa-clinic/database:/var/lib/mysql
-
   kuma:
-    image: louislam/uptime-kuma:latest
+    image: louislam/uptime-kuma
     container_name: kuma
     volumes:
       - /srv/docker/container/kuma:/app/data