diff --git a/.github/workflows/auto-upgrade-certified-connectors-cdk.yml b/.github/workflows/auto-upgrade-certified-connectors-cdk.yml
index 2ea9a755083f..132a6aa9d241 100644
--- a/.github/workflows/auto-upgrade-certified-connectors-cdk.yml
+++ b/.github/workflows/auto-upgrade-certified-connectors-cdk.yml
@@ -31,7 +31,7 @@ jobs:
       - name: List certified connectors
         id: list-connectors
         run: |
-          json_array=$(tools/bin/bulk-cdk-auto-upgrade/list-connectors-to-upgrade.sh)
+          json_array=$(tools/bin/bulk-cdk/get-certified-connectors.sh)
           echo "connectors=$json_array" >> $GITHUB_OUTPUT
           echo "Found bulk CDK connectors to upgrade: $json_array"
 
@@ -107,7 +107,7 @@ jobs:
         if: steps.check-changes.outputs.has_changes == 'true'
         run: |
           set -euo pipefail
-          new_version=$(tools/bin/bulk-cdk-auto-upgrade/bump-connector-metadata.sh "${{ matrix.connector }}")
+          new_version=$(tools/bin/bulk-cdk/auto-upgrade/bump-connector-metadata.sh "${{ matrix.connector }}")
           echo "Updated dockerImageTag to $new_version"
           echo "new_version=$new_version" >> $GITHUB_OUTPUT
 
@@ -141,7 +141,7 @@ jobs:
         if: steps.check-changes.outputs.has_changes == 'true' && inputs.repositories != 'airbyte-enterprise'
         run: |
           set -euo pipefail
-          tools/bin/bulk-cdk-auto-upgrade/populate-connector-changelog.sh \
+          tools/bin/bulk-cdk/auto-upgrade/populate-connector-changelog.sh \
             "${{ matrix.connector }}" \
             "${{ steps.bump-version.outputs.new_version }}" \
             "${{ steps.create-pr.outputs.pull-request-number }}" \
diff --git a/.github/workflows/cdk-connector-compatibility-test.yml b/.github/workflows/cdk-connector-compatibility-test.yml
index b6c786b12c55..4a266e374a0d 100644
--- a/.github/workflows/cdk-connector-compatibility-test.yml
+++ b/.github/workflows/cdk-connector-compatibility-test.yml
@@ -14,28 +14,16 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout Airbyte
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
-        with:
-          submodules: true # Needed for airbyte-enterprise connectors (no-op otherwise)
-          fetch-depth: 0
-
-      - name: Setup Java
-        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
         with:
-          distribution: "zulu"
-          java-version: "21"
+          submodules: true  # Needed for when airbyte-enterprise calls this workflow
 
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@748248ddd2a24f49513d8f472f81c3a07d4d50e1 # v4.4.4
-        with:
-          gradle-version: "8.14"
-
-      - name: Trigger changes on all connectors using bulk cdk # this is just an easy way to get a list of all bulk cdk connectors
-        run: ./gradlew upgradeCdk --cdkVersion=local
+      - name: Install yq
+        run: sudo snap install yq
 
-      - name: Generate Connector Matrix from Changes
+      - name: Generate Connector Matrix
         id: generate-matrix
-        run: echo "connectors_matrix=$(./poe-tasks/get-modified-connectors.sh --json --local-cdk)" | tee -a $GITHUB_OUTPUT
+        run: echo "connectors_matrix=$(tools/bin/bulk-cdk/get-certified-connectors.sh)" | tee -a $GITHUB_OUTPUT
 
     outputs:
       connectors-matrix: ${{ steps.generate-matrix.outputs.connectors_matrix }}
@@ -50,7 +38,8 @@ jobs:
       DD_TAGS: "connector.name:${{ matrix.connector }}"
 
     strategy:
-      matrix: ${{ fromJson(needs.generate-matrix.outputs.connectors-matrix) }}
+      matrix:
+        connector: ${{ fromJson(needs.generate-matrix.outputs.connectors-matrix) }}
       max-parallel: 5 # Limit number of parallel jobs
       fail-fast: false # Don't stop on first failure
     steps:
diff --git a/tools/bin/bulk-cdk-auto-upgrade/bump-connector-metadata.sh b/tools/bin/bulk-cdk/auto-upgrade/bump-connector-metadata.sh
similarity index 94%
rename from tools/bin/bulk-cdk-auto-upgrade/bump-connector-metadata.sh
rename to tools/bin/bulk-cdk/auto-upgrade/bump-connector-metadata.sh
index 5207e3146601..109a09923b6f 100755
--- a/tools/bin/bulk-cdk-auto-upgrade/bump-connector-metadata.sh
+++ b/tools/bin/bulk-cdk/auto-upgrade/bump-connector-metadata.sh
@@ -4,7 +4,7 @@ set -euo pipefail
 
 # Performs a patch version bump in the metadata.yaml of the given connector.
 # Prints the new version number.
-# Usage: tools/bin/bulk-cdk-auto-upgrade/bump-connector-metadata.sh destination-dev-null
+# Usage: tools/bin/bulk-cdk/auto-upgrade/bump-connector-metadata.sh destination-dev-null
 
 connector_name=$1
 
diff --git a/tools/bin/bulk-cdk-auto-upgrade/populate-connector-changelog.sh b/tools/bin/bulk-cdk/auto-upgrade/populate-connector-changelog.sh
similarity index 94%
rename from tools/bin/bulk-cdk-auto-upgrade/populate-connector-changelog.sh
rename to tools/bin/bulk-cdk/auto-upgrade/populate-connector-changelog.sh
index 95fbc0ce2d85..5d3aa6b59f09 100755
--- a/tools/bin/bulk-cdk-auto-upgrade/populate-connector-changelog.sh
+++ b/tools/bin/bulk-cdk/auto-upgrade/populate-connector-changelog.sh
@@ -3,8 +3,8 @@
 set -euo pipefail
 
 # Adds a new changelog entry for the given connector.
-# Usage: tools/bin/bulk-cdk-auto-upgrade/populate-connector-changelog.sh <connector> <new_connector_version> <pr_number> <changelog_text>
-# E.g.: tools/bin/bulk-cdk-auto-upgrade/populate-connector-changelog.sh destination-dev-null 1.2.3 1234 'upgrade foo'
+# Usage: tools/bin/bulk-cdk/auto-upgrade/populate-connector-changelog.sh <connector> <new_connector_version> <pr_number> <changelog_text>
+# E.g.: tools/bin/bulk-cdk/auto-upgrade/populate-connector-changelog.sh destination-dev-null 1.2.3 1234 'upgrade foo'
 
 connector_id="$1"
 new_version="$2"
diff --git a/tools/bin/bulk-cdk-auto-upgrade/list-connectors-to-upgrade.sh b/tools/bin/bulk-cdk/get-certified-connectors.sh
similarity index 100%
rename from tools/bin/bulk-cdk-auto-upgrade/list-connectors-to-upgrade.sh
rename to tools/bin/bulk-cdk/get-certified-connectors.sh