diff --git a/podman-gitea/container-compose.yml b/podman-gitea/container-compose.yml
index 4cad7e8..cc40328 100644
--- a/podman-gitea/container-compose.yml
+++ b/podman-gitea/container-compose.yml
@@ -16,7 +16,7 @@ services:
       test: ["CMD", "curl", "-fSs", "http://localhost:3000/api/healthz"]
       interval: 60s
       timeout: 10s
-      retries: 5
+      retries: 3
       start_period: 5s
     depends_on:
       - db
@@ -28,9 +28,10 @@ services:
       - gitea-pgsql:/var/lib/postgresql/data:Z
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U gitea"]
-      interval: 5s
-      timeout: 5s
-      retries: 5
+      interval: 60s
+      timeout: 10s
+      retries: 3
+      start_period: 5s
 
 volumes:
   gitea-data:
diff --git a/podman-hedgedoc/container-compose.yml b/podman-hedgedoc/container-compose.yml
index 9e86c2e..90bdc52 100644
--- a/podman-hedgedoc/container-compose.yml
+++ b/podman-hedgedoc/container-compose.yml
@@ -22,9 +22,10 @@ services:
       - database:/var/lib/postgresql/data
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U hedgedoc"]
-      interval: 5s
-      timeout: 5s
-      retries: 5
+      interval: 60s
+      timeout: 10s
+      retries: 3
+      start_period: 5s
     networks:
       backend:
     #restart: always
diff --git a/podman-matrix/container-compose.yml b/podman-matrix/container-compose.yml
index 5fb97a9..fd4602f 100644
--- a/podman-matrix/container-compose.yml
+++ b/podman-matrix/container-compose.yml
@@ -7,9 +7,10 @@ services:
       - matrixdotorg_synapse-pgsql:/var/lib/postgresql/data/:Z
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U synapse"]
-      interval: 5s
-      timeout: 5s
-      retries: 5  
+      interval: 60s
+      timeout: 10s
+      retries: 3
+      start_period: 5s
 
   synapse:
     image: "${synapse_image}:${synapse_version}"
@@ -20,10 +21,10 @@ services:
       - matrixdotorg_synapse-data:/data:Z
     healthcheck:
       test: ["CMD", "curl", "-fSs", "http://localhost:8008/health"]
-      interval: 15s
-      timeout: 5s
+      interval: 60s
+      timeout: 10s
       retries: 3
-      start_period: 5s
+      start_period: 15s
     depends_on:
       synapse-db:
         condition: service_healthy
diff --git a/podman-vaultwarden/container-compose.yml b/podman-vaultwarden/container-compose.yml
index 7547378..1202692 100644
--- a/podman-vaultwarden/container-compose.yml
+++ b/podman-vaultwarden/container-compose.yml
@@ -7,9 +7,10 @@ services:
       - database:${database_path}:Z
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U vaultwarden"]
-      interval: 5s
-      timeout: 5s
-      retries: 5
+      interval: 60s
+      timeout: 10s
+      retries: 3
+      start_period: 5s
 
   app:
     container_name: ${container_name}
@@ -22,7 +23,8 @@ services:
       test: ["CMD", "/healthcheck.sh"]
       interval: 60s
       timeout: 10s
-      retries: 5
+      retries: 3
+      start_period: 5s
     depends_on:
       - ${db_container_name}