diff --git a/docker-compose.yml b/docker-compose.yml
index b65b43d..ebfa233 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
+    image: docker.io/mailserver/docker-mailserver:12.1.0
     hostname: mail
     domainname: depaoli.id.au
     container_name: mail
@@ -508,6 +508,8 @@ services:
   esphome:
     container_name: esphome
     image: esphome/esphome
+    environment:
+      - ESPHOME_DASHBOARD_USE_PING=true
     volumes:
       - /srv/docker/container/esphome/config:/config
       - /dev:/dev
@@ -709,7 +711,7 @@ services:
 
   bookdb:
     container_name: bookdb
-    image: postgres
+    image: postgres:16
     restart: always
     environment:
       POSTGRES_PASSWORD: blahdeblah
@@ -876,7 +878,7 @@ services:
       - "/etc/localtime:/etc/localtime:ro"
 
   wikidb:
-    image: postgres
+    image: postgres:16
     container_name: wikidb
     environment:
       POSTGRES_DB: wiki