diff --git a/docker-compose.yml b/docker-compose.yml
index 164c090..1bb3692 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,18 +14,19 @@ services:
       - HOLD_DAYS=10
       - POSTGRESQL_USER=${POSTGRES_USER}
       - POSTGRESQL_PASSWORD=${POSTGRES_PASS}
-    image: postgres:15.0-alpine
+    image: ${IMAGE_REPO}:zammad-postgresql${VERSION}
     restart: ${RESTART}
     volumes:
       - zammad-backup:/var/tmp/zammad
-      - zammad-data:/opt/zammad:ro
-      - ./scripts/backup.sh:/usr/local/bin/backup.sh:ro
+      - zammad-data:/opt/zammad
 
   zammad-elasticsearch:
-    image: bitnami/elasticsearch:8.5.0
+    environment:
+      - discovery.type=single-node
+    image: ${IMAGE_REPO}:zammad-elasticsearch${VERSION}
     restart: ${RESTART}
     volumes:
-      - elasticsearch-data:/bitnami/elasticsearch/data
+      - elasticsearch-data:/usr/share/elasticsearch/data
 
   zammad-init:
     command: ["zammad-init"]
@@ -36,14 +37,14 @@ services:
       - POSTGRESQL_USER=${POSTGRES_USER}
       - POSTGRESQL_PASS=${POSTGRES_PASS}
       - REDIS_URL=${REDIS_URL}
-    image: ${IMAGE_REPO}:${VERSION}
+    image: ${IMAGE_REPO}:zammad${VERSION}
     restart: on-failure
     volumes:
       - zammad-data:/opt/zammad
 
   zammad-memcached:
     command: memcached -m 256M
-    image: memcached:1.6.17-alpine
+    image: memcached:1.6.10-alpine
     restart: ${RESTART}
 
   zammad-nginx:
@@ -52,7 +53,7 @@ services:
       - "8080"
     depends_on:
       - zammad-railsserver
-    image: ${IMAGE_REPO}:${VERSION}
+    image: ${IMAGE_REPO}:zammad${VERSION}
     restart: ${RESTART}
     volumes:
       - zammad-data:/opt/zammad
@@ -61,7 +62,7 @@ services:
     environment:
       - POSTGRES_USER=${POSTGRES_USER}
       - POSTGRES_PASSWORD=${POSTGRES_PASS}
-    image: postgres:15.0-alpine
+    image: ${IMAGE_REPO}:zammad-postgresql${VERSION}
     restart: ${RESTART}
     volumes:
       - postgresql-data:/var/lib/postgresql/data
@@ -75,7 +76,7 @@ services:
     environment:
       - MEMCACHE_SERVERS=${MEMCACHE_SERVERS}
       - REDIS_URL=${REDIS_URL}
-    image: ${IMAGE_REPO}:${VERSION}
+    image: ${IMAGE_REPO}:zammad${VERSION}
     restart: ${RESTART}
     volumes:
       - zammad-data:/opt/zammad
@@ -93,7 +94,7 @@ services:
     environment:
       - MEMCACHE_SERVERS=${MEMCACHE_SERVERS}
       - REDIS_URL=${REDIS_URL}
-    image: ${IMAGE_REPO}:${VERSION}
+    image: ${IMAGE_REPO}:zammad${VERSION}
     restart: ${RESTART}
     volumes:
       - zammad-data:/opt/zammad
@@ -107,7 +108,7 @@ services:
     environment:
       - MEMCACHE_SERVERS=${MEMCACHE_SERVERS}
       - REDIS_URL=${REDIS_URL}
-    image: ${IMAGE_REPO}:${VERSION}
+    image: ${IMAGE_REPO}:zammad${VERSION}
     restart: ${RESTART}
     volumes:
       - zammad-data:/opt/zammad