diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index ee6b3c583eb2f..8a45e5e54e9a9 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   ## Gradle Build (Connectors Base)
   # In case of self-hosted EC2 errors, remove this block.
-  start-connectors-build-runner:
+  start-connectors-base-build-runner:
     name: "Connectors Base: Start Build EC2 Runner"
     runs-on: ubuntu-latest
     outputs:
@@ -31,10 +31,10 @@ jobs:
           ec2-instance-type: c5.2xlarge
           subnet-id: subnet-0469a9e68a379c1d3
           security-group-id: sg-0793f3c9413f21970
-  build-connector:
+  build-connectors-base:
     # In case of self-hosted EC2 errors, removed the `needs` line and switch back to running on ubuntu-latest.
-    needs: start-connectors-build-runner # required to start the main job when the runner is ready
-    runs-on: ${{ needs.start-connectors-build-runner.outputs.label }} # run the job on the newly created runner
+    needs: start-connectors-base-build-runner # required to start the main job when the runner is ready
+    runs-on: ${{ needs.start-connectors-base-build-runner.outputs.label }} # run the job on the newly created runner
     name: "Connectors Base: Build"
     steps:
       - name: Checkout Airbyte
@@ -122,11 +122,11 @@ jobs:
           SLACK_TITLE: "Build Success"
           SLACK_FOOTER: ""
   # In case of self-hosted EC2 errors, remove this block.
-  stop-connectors-build-runner:
+  stop-connectors-base-build-runner:
     name: "Connectors Base: Stop Build EC2 Runner"
     needs:
-      - start-connectors-build-runner # required to get output from the start-runner job
-      - build # required to wait when the main job is done
+      - start-connectors-base-build-runner # required to get output from the start-runner job
+      - build-connectors-base # required to wait when the main job is done
     runs-on: ubuntu-latest
     if: ${{ always() }} # required to stop the runner even if the error happened in the previous jobs
     steps:
@@ -141,8 +141,8 @@ jobs:
         with:
           mode: stop
           github-token: ${{ secrets.SELF_RUNNER_GITHUB_ACCESS_TOKEN }}
-          label: ${{ needs.start-connectors-build-runner.outputs.label }}
-          ec2-instance-id: ${{ needs.start-connectors-build-runner.outputs.ec2-instance-id }}
+          label: ${{ needs.start-connectors-base-build-runner.outputs.label }}
+          ec2-instance-id: ${{ needs.start-connectors-base-build-runner.outputs.ec2-instance-id }}
 
   ## Gradle Build (Platform)
   # In case of self-hosted EC2 errors, remove this block.
@@ -295,7 +295,7 @@ jobs:
     name: "Platform: Stop Build EC2 Runner"
     needs:
       - start-platform-build-runner # required to get output from the start-runner job
-      - build # required to wait when the main job is done
+      - platform-build # required to wait when the main job is done
     runs-on: ubuntu-latest
     if: ${{ always() }} # required to stop the runner even if the error happened in the previous jobs
     steps: