diff --git a/docker/.env-dist b/.env-dist
similarity index 100%
rename from docker/.env-dist
rename to .env-dist
diff --git a/compose.override.yaml b/compose.override.yaml
index a42f06f..c7faa1d 100644
--- a/compose.override.yaml
+++ b/compose.override.yaml
@@ -1,9 +1,11 @@
 services:
   db:
     container_name: woocommerce-db
+    restart: unless-stopped
 
   wordpress:
     container_name: woocommerce
+    restart: unless-stopped
     volumes:
       - ../wp-bootstrap:/var/www/html/wp-content/themes/wp-bootstrap
       - .:/var/www/html/wp-content/themes/wc-bootstrap
diff --git a/compose.yaml b/compose.yaml
index 74e8c8f..e93b70c 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -1,6 +1,7 @@
 services:
   db:
-    image: mariadb:11
+    image: mariadb:latest
+    restart: always
     volumes:
       - db_data:/var/lib/mysql
     environment:
@@ -15,6 +16,8 @@ services:
       retries: 5
 
   wordpress:
+    image: hub.bundespruefstelle.ch/woocommerce:latest
+    restart: always
     build:
       context: .
       dockerfile: docker/Dockerfile
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 414cba0..d8b8280 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -48,7 +48,7 @@ RUN composer install --no-dev --optimize-autoloader --no-interaction
 ###############################################################################
 # Stage 4 — Final WordPress image
 ###############################################################################
-FROM wordpress:6.9.1-php8.4-apache AS wp_runtime
+FROM wordpress:php8.4 AS wp_runtime
 
 RUN curl -sSfL -o /usr/local/bin/wp \
       https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar \