diff --git a/nametag/docker-compose.yml b/nametag/docker-compose.yml
index b476251..e9c434a 100644
--- a/nametag/docker-compose.yml
+++ b/nametag/docker-compose.yml
@@ -3,7 +3,7 @@
 
 services:
   db:
-    image: postgres:16-alpine
+    image: ${NAMETAG_POSTGRES_IMAGE:?set in versions.env}
     container_name: nametag-db
     restart: always
     environment:
@@ -23,7 +23,7 @@ services:
       - nametag-network
 
   redis: # Optional. Comment out to disable Redis. See README.md for more details.
-    image: redis:7-alpine
+    image: ${NAMETAG_REDIS_IMAGE:?set in versions.env}
     container_name: nametag-redis
     restart: always
     command: redis-server --requirepass ${REDIS_PASSWORD:?Redis password required}
@@ -40,7 +40,7 @@ services:
       - nametag-network
 
   app:
-    image: ghcr.io/mattogodoy/nametag:latest
+    image: ${NAMETAG_IMAGE:?set in versions.env}
     container_name: nametag-app
     restart: unless-stopped
     labels:
@@ -77,7 +77,7 @@ services:
 
   # Database backup service
   backup:
-    image: prodrigestivill/postgres-backup-local
+    image: ${NAMETAG_BACKUP_IMAGE:?set in versions.env}
     container_name: nametag-backup
     restart: always
     environment:
@@ -99,7 +99,7 @@ services:
 
   # Cron service for scheduled jobs
   cron:
-    image: alpine:3.19
+    image: ${NAMETAG_CRON_IMAGE:?set in versions.env}
     container_name: nametag-cron
     restart: always
     environment: