diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index b4cc24318..81f67efb5 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -342,8 +342,7 @@ jobs:
       url: https://github.com/airbytehq/airbyte-platform-internal/pulls?q=is%3Apr+automatic-cdk-release+
     needs:
       - build
-      - publish_cdk
-      - publish_sdm
+      - publish_manifest_server
     if: >
       (github.event_name == 'push' &&
        needs.build.outputs.IS_PRERELEASE == 'false' &&
@@ -355,9 +354,6 @@ jobs:
       IS_PRERELEASE: ${{ needs.build.outputs.IS_PRERELEASE }}
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/setup-python@v5
-        with:
-          python-version: "3.10"
       - name: Authenticate as GitHub App
         uses: actions/create-github-app-token@v2
         id: get-app-token
@@ -372,24 +368,20 @@ jobs:
           repository: airbytehq/airbyte-platform-internal
           token: ${{ steps.get-app-token.outputs.token }}
       - name: Update Builder's CDK version to ${{ env.VERSION }}
-        # PyPI servers aren't immediately updated so we may need to retry a few times.
-        uses: nick-fields/retry@v3
-        with:
-          shell: bash
-          max_attempts: 5
-          retry_wait_seconds: 30
-          timeout_minutes: 7
-          command: |
-            set -euo pipefail
-            PREVIOUS_VERSION=$(cat oss/airbyte-connector-builder-resources/CDK_VERSION)
-            sed -i "s/${PREVIOUS_VERSION}/${VERSION}/g" "oss/airbyte-connector-builder-server/Dockerfile"
-            sed -i "s/airbyte-cdk==${PREVIOUS_VERSION}/airbyte-cdk==${VERSION}/g" oss/airbyte-connector-builder-server/requirements.in
-            sed -i "s/tag: ${PREVIOUS_VERSION}/tag: ${VERSION}/g" "oss/charts/v2/airbyte/values.yaml"
-            sed -i "s/refs\/tags\/v${PREVIOUS_VERSION}/refs\/tags\/v${VERSION}/g" "oss/airbyte-api/manifest-server-api/build.gradle.kts"
-            echo ${VERSION} > oss/airbyte-connector-builder-resources/CDK_VERSION
-            cd oss/airbyte-connector-builder-server
-            python -m pip install --no-cache-dir pip-tools
-            pip-compile --upgrade
+        # The manifest-server Docker image already includes the CDK version.
+        # We just need to update the image tag in the Helm values file.
+        run: |
+          set -euo pipefail
+          VALUES_FILE="oss/charts/v2/airbyte/values.yaml"
+          # Get the current manifest-server tag from the values.yaml file
+          PREVIOUS_VERSION=$(grep -A15 "^manifestServer:" "$VALUES_FILE" | grep -A4 "image:" | grep "tag:" | awk '{print $2}')
+          echo "Previous version: ${PREVIOUS_VERSION}"
+          echo "New version: ${VERSION}"
+          # Update the manifest-server tag in the Helm values file (preserves formatting)
+          sed -i "/^manifestServer:/,/^[a-zA-Z]/ s/tag: ${PREVIOUS_VERSION}/tag: ${VERSION}/" "$VALUES_FILE"
+          # Also update the CDK version in the manifest-server-api build file
+          sed -i "s/refs\/tags\/v${PREVIOUS_VERSION}/refs\/tags\/v${VERSION}/g" "oss/airbyte-api/manifest-server-api/build.gradle.kts"
+          echo ${VERSION} > oss/airbyte-connector-builder-resources/CDK_VERSION
       - name: Create Pull Request
         id: create-pull-request
         uses: peter-evans/create-pull-request@v7