diff --git a/.gitea/workflows/build-image.yml b/.gitea/workflows/build-image.yml
index 3d8dc98e..a1b037da 100644
--- a/.gitea/workflows/build-image.yml
+++ b/.gitea/workflows/build-image.yml
@@ -467,7 +467,7 @@ jobs:
   # Job 2: Build & Push Docker Image
   build:
     name: Build Docker Image
-    needs: [changes, test, runtime-base]
+    needs: [changes, runtime-base]
     if: needs.changes.outputs.needs_build == 'true'
     runs-on: docker-build
     outputs:
@@ -764,9 +764,9 @@ jobs:
   # Job 3: Auto-deploy to Staging (only for staging branch)
   deploy-staging:
     name: Auto-deploy to Staging
-    needs: build
+    needs: [changes, build, runtime-base]
+    if: (github.ref_name == 'staging' || github.head_ref == 'staging' || (github.ref_name == '' && contains(github.ref, 'staging'))) && needs.changes.outputs.needs_build == 'true'
     runs-on: ubuntu-latest
-    if: github.ref_name == 'staging' || github.head_ref == 'staging' || (github.ref_name == '' && contains(github.ref, 'staging'))
     environment:
       name: staging
       url: https://staging.michaelschiemer.de