diff --git a/.gitea/workflows/main.yml b/.gitea/workflows/main.yml
index 42a8f9a..23235ce 100644
--- a/.gitea/workflows/main.yml
+++ b/.gitea/workflows/main.yml
@@ -35,6 +35,22 @@ jobs:
           NOMAD_ADDR: https://nomad.i80.dk
         run: nomad job validate .gitea/workflows/nomad-job.hcl
 
+      - name: Apply Nomad Job
+        env:
+          NOMAD_ADDR: https://nomad.i80.dk
+        run: nomad job run .gitea/workflows/nomad-job.hcl
+
+      - name: Wait for New Job to Become Healthy
+        env:
+          NOMAD_ADDR: https://nomad.i80.dk
+        run: |
+          echo "Waiting for the new job to become healthy..."
+          until nomad job status lifefaq | grep -q "healthy"; do
+            echo "Job not healthy yet, retrying..."
+            sleep 5
+          done
+          echo "Job is healthy!"
+
       - name: Stop old deployment
         env:
           NOMAD_ADDR: https://nomad.i80.dk
@@ -42,10 +58,7 @@ jobs:
         continue-on-error: true
 
 
-      - name: Apply Nomad Job
-        env:
-          NOMAD_ADDR: https://nomad.i80.dk
-        run: nomad job run .gitea/workflows/nomad-job.hcl
+
 
       - name: Update Nginx Configuration
         run:  ssh runner@nomad sudo /opt/nginx_updater/venv/bin/python3 /opt/nginx_updater/nginx_updater.py lifefaq