diff --git a/.github/workflows/deploy_pipeline.yml b/.github/workflows/deploy_pipeline.yml
index aee5933b46..dcb9bda20d 100644
--- a/.github/workflows/deploy_pipeline.yml
+++ b/.github/workflows/deploy_pipeline.yml
@@ -13,13 +13,7 @@ jobs:
     uses: ./.github/workflows/run_tests.yml
     secrets: inherit
 
-  build_application_images:
-    uses: ./.github/workflows/build_application_images.yml
-    needs: run_tests
-    secrets: inherit
-
   build_frontend_assets:
-    needs: [run_tests]
     strategy:
       matrix:
         env: [dev, test, impl, prod]
@@ -28,6 +22,11 @@ jobs:
       env: ${{ matrix.env }}
     secrets: inherit
 
+  build_application_images:
+    uses: ./.github/workflows/build_application_images.yml
+    needs: run_tests
+    secrets: inherit
+
   deploy_dev:
     needs: [build_application_images, build_frontend_assets]
     uses: ./.github/workflows/deploy_to_environment.yml
diff --git a/.github/workflows/manual_deploy.yml b/.github/workflows/manual_deploy.yml
index f9185a36f7..c77b0a30bc 100644
--- a/.github/workflows/manual_deploy.yml
+++ b/.github/workflows/manual_deploy.yml
@@ -28,19 +28,16 @@ jobs:
     uses: ./.github/workflows/run_tests.yml
     secrets: inherit
 
-  build_application_images:
-    uses: ./.github/workflows/build_application_images.yml
-    needs: [run_tests]
-    secrets: inherit
-
   build_frontend_assets:
     uses: ./.github/workflows/build_frontend_assets.yml
-    needs: [run_tests]
     secrets: inherit
     with:
       env: ${{ inputs.env }}
 
-
+  build_application_images:
+    uses: ./.github/workflows/build_application_images.yml
+    needs: [run_tests]
+    secrets: inherit
 
   deploy:
     # Only deploy if one of the two cases is true: