diff --git a/.github/workflows/ami-release-nix.yml b/.github/workflows/ami-release-nix.yml
index 728194af84..f9b51335b0 100644
--- a/.github/workflows/ami-release-nix.yml
+++ b/.github/workflows/ami-release-nix.yml
@@ -240,6 +240,17 @@ jobs:
           git tag "${CLI_TAG}" "${{ github.sha }}"
           git push origin "${CLI_TAG}"
 
+      - name: Trigger CLI release workflow for PG 17
+        if: matrix.postgres_version == '17' && github.event_name != 'workflow_dispatch'
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          VERSION="${{ steps.process_release_version.outputs.version }}"
+          CLI_TAG="v${VERSION}-cli"
+          gh workflow run cli-release.yml \
+            --ref "${CLI_TAG}" \
+            -f version="${CLI_TAG}"
+
       - name: Trigger pg_upgrade_scripts workflow
         env:
           GH_TOKEN: ${{ github.token }}
diff --git a/.github/workflows/cli-release.yml b/.github/workflows/cli-release.yml
index 2ef75b19bf..e18e6b45f7 100644
--- a/.github/workflows/cli-release.yml
+++ b/.github/workflows/cli-release.yml
@@ -389,7 +389,7 @@ jobs:
     name: Create GitHub Release
     needs: [build-native, test-portability]
     runs-on: ubuntu-latest
-    if: startsWith(github.ref, 'refs/tags/')
+    if: startsWith(github.ref, 'refs/tags/') || github.event_name == 'workflow_dispatch'
     permissions:
       contents: write
     steps:
@@ -439,8 +439,18 @@ jobs:
 
           ls -lh release/
 
+      - name: Determine release tag
+        id: release_tag
+        run: |
+          if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
+            echo "tag=${{ github.event.inputs.version }}" >> "$GITHUB_OUTPUT"
+          else
+            echo "tag=${{ github.ref_name }}" >> "$GITHUB_OUTPUT"
+          fi
+
       - name: Create Release
         uses: softprops/action-gh-release@v2
         with:
+          tag_name: ${{ steps.release_tag.outputs.tag }}
           files: release/*
           generate_release_notes: true
diff --git a/ansible/vars.yml b/ansible/vars.yml
index 1b2f62a4e7..9f1b505892 100644
--- a/ansible/vars.yml
+++ b/ansible/vars.yml
@@ -10,9 +10,9 @@ postgres_major:
 
 # Full version strings for each major version
 postgres_release:
-  postgresorioledb-17: "17.6.0.064-orioledb"
-  postgres17: "17.6.1.107"
-  postgres15: "15.14.1.107"
+  postgresorioledb-17: "17.6.0.066-orioledb"
+  postgres17: "17.6.1.109"
+  postgres15: "15.14.1.109"
 
 # Non Postgres Extensions
 pgbouncer_release: 1.25.1