diff --git a/energy-tests/compose-fpm-mariadb.yml b/energy-tests/compose-fpm-mariadb.yml
index b839a47e..2aceb446 100644
--- a/energy-tests/compose-fpm-mariadb.yml
+++ b/energy-tests/compose-fpm-mariadb.yml
@@ -18,9 +18,10 @@ services:
       - MYSQL_USER=nextcloud
 
   app:
-    build:
-      context: ../29/fpm
-      dockerfile: Dockerfile
+    image: nextcloud:29.0.4-apache
+    #build: # The build takes currently ~ 30 minutes which is far too long for daily testing
+    #  context: ../29/fpm
+    #  dockerfile: Dockerfile
     restart: always
     links:
       - db
@@ -31,6 +32,11 @@ services:
       - MYSQL_DATABASE=nextcloud
       - MYSQL_USER=nextcloud
       - MYSQL_HOST=db
+   healthcheck:
+     test: curl --fail --silent http://nc
+     interval: "1h" # effectively turns repeated healthchecks during runtime off
+     start-period: "60s"
+     start-interval: "1s"
 
   nc:
     image: nginx:1.25.1-alpine3.17
@@ -43,8 +49,3 @@ services:
       - ./nginx.conf:/etc/nginx/nginx.conf:ro
     depends_on:
       - app
-#    healthcheck:
-#      test: curl -f http://nc
-#      interval: "1h" # effectively turns repeated healthchecks during runtime off
-#      start-period: "1s" # Not yet supported. Will come with Docker CE 25.0
-#      start-interval: "1s" # Not yet supported. Will come with Docker CE 25.0
diff --git a/energy-tests/compose-mariadb.yml b/energy-tests/compose-mariadb.yml
index a4671347..cbdf0638 100644
--- a/energy-tests/compose-mariadb.yml
+++ b/energy-tests/compose-mariadb.yml
@@ -18,8 +18,10 @@ services:
       - MYSQL_USER=nextcloud
 
   nc:
-    build:
-      context: ../29/apache
+    image: nextcloud:29.0.4-apache
+    #build: # The build takes currently ~ 30 minutes which is far too long for daily testing
+    #  context: ../29/fpm
+    #  dockerfile: Dockerfile
     restart: always
     ports:
       - 8080:80
@@ -32,8 +34,8 @@ services:
       - MYSQL_DATABASE=nextcloud
       - MYSQL_USER=nextcloud
       - MYSQL_HOST=db
-#    healthcheck:
-#      test: curl -f http://nc
-#      interval: "1h" # effectively turns repeated healthchecks during runtime off
-#      start-period: "1s" # Not yet supported. Will come with Docker CE 25.0
-#      start-interval: "1s" # Not yet supported. Will come with Docker CE 25.0
+   healthcheck:
+      test: curl --fail --silent http://localhost
+      interval: "1h" # effectively turns repeated healthchecks during runtime off
+      start-period: "60s"
+      start-interval: "1s"
diff --git a/energy-tests/compose-postgres.yml b/energy-tests/compose-postgres.yml
index d6a4f2e2..01428cde 100644
--- a/energy-tests/compose-postgres.yml
+++ b/energy-tests/compose-postgres.yml
@@ -16,8 +16,10 @@ services:
       - POSTGRES_USER=nextcloud
 
   nc:
-    build:
-      context: ../29/apache
+    image: nextcloud:29.0.4-apache
+    #build: # The build takes currently ~ 30 minutes which is far too long for daily testing
+    #  context: ../29/fpm
+    #  dockerfile: Dockerfile
     restart: always
     ports:
       - 8080:80
@@ -30,8 +32,8 @@ services:
       - POSTGRES_DB=nextcloud
       - POSTGRES_USER=nextcloud
       - POSTGRES_HOST=db
-#    healthcheck:
-#      test: curl -f http://nc
-#      interval: "1h" # effectively turns repeated healthchecks during runtime off
-#      start-period: "1s" # Not yet supported. Will come with Docker CE 25.0
-#      start-interval: "1s" # Not yet supported. Will come with Docker CE 25.0
+    healthcheck:
+      test: curl --fail --silent http://localhost
+      interval: "1h" # effectively turns repeated healthchecks during runtime off
+      start-period: "60s"
+      start-interval: "1s"
diff --git a/energy-tests/compose-sqlite.yml b/energy-tests/compose-sqlite.yml
index 09f6a2c4..fbf3d26d 100644
--- a/energy-tests/compose-sqlite.yml
+++ b/energy-tests/compose-sqlite.yml
@@ -2,15 +2,17 @@ version: '2'
 
 services:
   nc:
-    build:
-      context: ../29/apache
+    image: nextcloud:29.0.4-apache
+    #build: # The build takes currently ~ 30 minutes which is far too long for daily testing
+    #  context: ../29/fpm
+    #  dockerfile: Dockerfile
     restart: always
     ports:
       - 8080:80
     #volumes:
     #  - nextcloud:/var/www/html # This is the usual way of using nextcloud in a container, but we do not need persistent data storage for benchmarking
-#    healthcheck:
-#      test: curl -f http://nc
-#      interval: "1h" # effectively turns repeated healthchecks during runtime off
-#      start-period: "1s" # Not yet supported. Will come with Docker CE 25.0
-#      start-interval: "1s" # Not yet supported. Will come with Docker CE 25.0
+    healthcheck:
+      test: curl --fail --silent http://localhost
+      interval: "1h" # effectively turns repeated healthchecks during runtime off
+      start-period: "60s"
+      start-interval: "1s"