diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml
index 59c19363bb..91f772a246 100644
--- a/.github/workflows/build_and_deploy.yml
+++ b/.github/workflows/build_and_deploy.yml
@@ -26,6 +26,7 @@ jobs:
         docker compose --file docker-compose.yml logs tm-backend
       compose_service: tm-backend
       build_target: prod
+      # TODO: Compose command to be updated once dev have test setup running. For now just a simple curl command.
       compose_command: curl -i http://localhost:5000/api/v2/
       tag_override: ci-${{ github.ref_name }}
       # coverage: true
@@ -34,6 +35,8 @@ jobs:
     secrets: inherit
 
   backend-build:
+    needs:
+      - backend-test
     uses: hotosm/gh-workflows/.github/workflows/image_build.yml@2.0.5
     with:
       context: .
@@ -51,6 +54,7 @@ jobs:
       context: ./frontend
       cache-key-file: ./frontend/yarn.lock
       package-manager: yarn
+      # TODO: Verify this with frontend team
       test_frontend_command: |
         CI=true yarn test -w 1
       # test_frontend_build: false
@@ -60,6 +64,8 @@ jobs:
   frontend-build:
     uses: naxa-developers/tasking-manager/.github/workflows/frontend-build.yml@ci-gh-workflows
     secrets: inherit
+    needs:
+      - frontend-test
     with:
       node-version: 16.x
       context: ./frontend
@@ -88,8 +94,8 @@ jobs:
   backend_deploy_to_vm:
     name: Deploy Backend to VM
     needs:
-      - backend-test
       - backend-build
+      - frontend-build
     uses: naxa-developers/tasking-manager/.github/workflows/remote_deploy_compose.yml@ci-gh-workflows
     with:
       docker_compose_file: docker-compose.yml
diff --git a/.github/workflows/frontend-build.yml b/.github/workflows/frontend-build.yml
index 8b4241d4be..5e8fca7d3f 100644
--- a/.github/workflows/frontend-build.yml
+++ b/.github/workflows/frontend-build.yml
@@ -60,7 +60,7 @@ on:
         value: ${{ jobs.node-build.outputs.artifact-name }}
 
 jobs:
-  node-build:
+  frontend-build:
     runs-on: ${{ inputs.runner-class }}
 
     environment:
diff --git a/.github/workflows/frontend-test.yml b/.github/workflows/frontend-test.yml
index 449279a0d5..c681302e2e 100644
--- a/.github/workflows/frontend-test.yml
+++ b/.github/workflows/frontend-test.yml
@@ -54,7 +54,7 @@ on:
       
 
 jobs:
-  node-build:
+  frontend-test:
     runs-on: ${{ inputs.runner-class }}
 
     environment: