diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 99114ecb4..1aac32731 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -31,13 +31,13 @@ jobs:
       pgupgrade_image_name: "ghcr.io/citusdata/pgupgradetester"
       style_checker_image_name: "ghcr.io/citusdata/stylechecker"
       style_checker_tools_version: "0.8.18"
-      sql_snapshot_pg_version: "17.5"
+      sql_snapshot_pg_version: "17.6"
       image_suffix: "-dev-4df94a0"
-      pg15_version: '{ "major": "15", "full": "15.13" }'
-      pg16_version: '{ "major": "16", "full": "16.9" }'
-      pg17_version: '{ "major": "17", "full": "17.5" }'
+      pg15_version: '{ "major": "15", "full": "15.14" }'
+      pg16_version: '{ "major": "16", "full": "16.10" }'
+      pg17_version: '{ "major": "17", "full": "17.6" }'
       pg18_version: '{ "major": "18", "full": "18rc1" }'
-      upgrade_pg_versions: "15.13-16.9-17.5-18rc1"
+      upgrade_pg_versions: "15.14-16.10-17.6-18rc1"
     steps:
       # Since GHA jobs need at least one step we use a noop step here.
       - name: Set up parameters
diff --git a/citus-tools b/citus-tools
new file mode 160000
index 000000000..3376bd684
--- /dev/null
+++ b/citus-tools
@@ -0,0 +1 @@
+Subproject commit 3376bd6845f0614908ed304f5033bd644c82d3bf