diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
index 44e21dc..2e1d8c2 100644
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -15,12 +15,14 @@ jobs:
                 image: mongo:4.2
                 ports:
                     - 27017:27017
+                options: --health-cmd='mongo --eval "db.adminCommand(\'ping\')"' --health-interval=10s --health-timeout=5s --health-retries=3
 
             maildev:
                 image: gitbase.de/robin/maildev:latest
                 ports:
                     - 80:80
                     - 25:25
+                options: --health-cmd='curl -f http://localhost:80' --health-interval=10s --health-timeout=5s --health-retries=3
             #
             tibi-server:
                 image: gitbase.de/cms/tibi-server
@@ -33,11 +35,13 @@ jobs:
                     SECURITY_ALLOWABSOLUTEPATHS: "true"
                     SECURITY_ALLOWUPPERPATHS: "true"
                     SECURITY_ALLOWRELATIVEPATHS: "true"
+                options: --health-cmd='curl -f http://localhost:8080' --health-interval=10s --health-timeout=5s --health-retries=3
 
             live-server:
                 image: gitbase.de/robin/live-server:latest
                 ports:
                     - 8081:8081
+                options: --health-cmd='curl -f http://localhost:8081' --health-interval=10s --health-timeout=5s --health-retries=3
 
         steps:
             - uses: actions/checkout@v3