diff --git a/.github/composite-actions/setup-dump-restore-ca/action.yml b/.github/composite-actions/setup-dump-restore-ca/action.yml
index 770004d8e4..d8e3334def 100644
--- a/.github/composite-actions/setup-dump-restore-ca/action.yml
+++ b/.github/composite-actions/setup-dump-restore-ca/action.yml
@@ -40,7 +40,7 @@ runs:
           is_final_ver=false; [[ i -eq $LEN-1 ]] && is_final_ver=true
           pg_old_dir=$(echo psql$(awk -F. '{print $1}' <<< $previous_installed_version))
           pg_new_dir=$(echo psql$(awk -F. '{print $1}' <<< $dump_restore_version))
-          if [[ "$dump_restore_version" == 'target.latest' || "$dump_restore_version" -ge 16.6 ]]
+          if [[ "$dump_restore_version" == 'target.latest' || "$dump_restore_version" -ge 16.7 ]]
           then
             antlr_version=4.13.2
           else
diff --git a/.github/composite-actions/setup-upgrade-version-ca/action.yml b/.github/composite-actions/setup-upgrade-version-ca/action.yml
index 98598369f5..c59d47a56b 100644
--- a/.github/composite-actions/setup-upgrade-version-ca/action.yml
+++ b/.github/composite-actions/setup-upgrade-version-ca/action.yml
@@ -45,7 +45,7 @@ runs:
           is_final_ver=false; [[ i -eq $LEN-1 ]] && is_final_ver=true
           pg_old_dir=$(echo psql$(awk -F. '{print $1}' <<< $previous_installed_version))
           pg_new_dir=$(echo psql$(awk -F. '{print $1}' <<< $upgrade_version))
-          if [[ "$upgrade_version" == 'target.latest' || "$upgrade_version" -ge 16.6 ]]
+          if [[ "$upgrade_version" == 'target.latest' || "$upgrade_version" -ge 16.7 ]]
           then
             antlr_version=4.13.2
           else
diff --git a/.github/configuration/upgrade-test-configuration.yml b/.github/configuration/upgrade-test-configuration.yml
index 8e857ea843..d3984b4b45 100644
--- a/.github/configuration/upgrade-test-configuration.yml
+++ b/.github/configuration/upgrade-test-configuration.yml
@@ -101,7 +101,7 @@ upgrade-version: [{
 {
   upgrade-path: [
     {
-      version: '14.15',
+      version: '14.16',
       upgrade-type: null
     },
     { 
@@ -125,7 +125,7 @@ upgrade-version: [{
 {
   upgrade-path: [
     {
-      version: 15.9,
+      version: '15.10',
       upgrade-type: null
     },
     { 
@@ -161,7 +161,7 @@ upgrade-version: [{
 {
   upgrade-path: [
     {
-      version: 16.5,
+      version: 16.6,
       upgrade-type: null
     },
     { 
@@ -177,11 +177,11 @@ upgrade-version: [{
       upgrade-type: null
     },
     {
-      version: '14.15',
+      version: '14.16',
       upgrade-type: major
     },
     {
-      version: '15.10',
+      version: '15.11',
       upgrade-type: major
     },
     { 
@@ -207,7 +207,7 @@ upgrade-version: [{
 {
   upgrade-path: [
     {
-      version: '15.10',
+      version: '15.11',
       upgrade-type: null
     },
     { 
@@ -220,7 +220,7 @@ upgrade-version: [{
 {
   upgrade-path: [
     {
-      version: '15.10',
+      version: '15.11',
       upgrade-type: null
     },
     { 
@@ -237,7 +237,7 @@ upgrade-version: [{
       upgrade-type: null
     },
     {
-      version: '15.10',
+      version: '15.11',
       upgrade-type: minor
     },
     { 
diff --git a/.github/template/version-branch-template.yml b/.github/template/version-branch-template.yml
index 9b967e65c3..eba5f5dd4f 100644
--- a/.github/template/version-branch-template.yml
+++ b/.github/template/version-branch-template.yml
@@ -46,10 +46,10 @@
 '14.13':
   engine_branch: BABEL_2_10_STABLE__PG_14_13
   extension_branch: BABEL_2_10_STABLE
-'14.14':
-  engine_branch: BABEL_2_11_STABLE__PG_14_14
-  extension_branch: BABEL_2_11_STABLE
 '14.15':
+  engine_branch: BABEL_2_11_STABLE__PG_14_15
+  extension_branch: BABEL_2_11_STABLE
+'14.16':
   engine_branch: BABEL_2_X_DEV__PG_14_X
   extension_branch: BABEL_2_X_DEV
 '15.2':
@@ -73,10 +73,10 @@
 '15.8':
   engine_branch: BABEL_3_7_STABLE__PG_15_8
   extension_branch: BABEL_3_7_STABLE
-'15.9':
-  engine_branch: BABEL_3_8_STABLE__PG_15_9
-  extension_branch: BABEL_3_8_STABLE
 '15.10':
+  engine_branch: BABEL_3_8_STABLE__PG_15_10
+  extension_branch: BABEL_3_8_STABLE
+'15.11':
   engine_branch: BABEL_3_X_DEV__PG_15_X
   extension_branch: BABEL_3_X_DEV
 '16.1':
@@ -91,8 +91,8 @@
 '16.4':
   engine_branch: BABEL_4_3_STABLE__PG_16_4
   extension_branch: BABEL_4_3_STABLE
-'16.5':
-  engine_branch: BABEL_4_4_STABLE__PG_16_5
+'16.6':
+  engine_branch: BABEL_4_4_STABLE__PG_16_6
   extension_branch: BABEL_4_4_STABLE
 'source.latest':
   engine_branch: latest
diff --git a/.github/workflows/pg_dump-restore-test.yml b/.github/workflows/pg_dump-restore-test.yml
index 3c59a9eb1e..be998791b0 100644
--- a/.github/workflows/pg_dump-restore-test.yml
+++ b/.github/workflows/pg_dump-restore-test.yml
@@ -74,7 +74,7 @@ jobs:
           install_dir: ${{ steps.find-branch.outputs.base-dir }}
           migration_mode: 'multi-db'
           dump_restore: 'true'
-          antlr_version: ${{ (steps.read-base-and-final-version.outputs.base-version == 'source.latest' || fromJSON(steps.read-base-and-final-version.outputs.base-version) >= 16.6 ) && '4.13.2' || '4.9.3' }}
+          antlr_version: ${{ (steps.read-base-and-final-version.outputs.base-version == 'source.latest' || fromJSON(steps.read-base-and-final-version.outputs.base-version) >= 16.7 ) && '4.13.2' || '4.9.3' }}
 
       - name: Setup Dump Restore Composite Action
         id: setup-dump-restore-ca
diff --git a/.github/workflows/upgrade-test.yml b/.github/workflows/upgrade-test.yml
index 97732b3789..ceefda3d17 100644
--- a/.github/workflows/upgrade-test.yml
+++ b/.github/workflows/upgrade-test.yml
@@ -67,7 +67,7 @@ jobs:
           install_dir: ${{ steps.find-branch.outputs.base-dir }}
           migration_mode: 'multi-db'
           server_collation_name: ${{ matrix.upgrade-path.server_collation_name }}
-          antlr_version: ${{ (steps.read-base-and-final-version.outputs.base-version == 'source.latest' || fromJSON(steps.read-base-and-final-version.outputs.base-version) >= 16.6 ) && '4.13.2' || '4.9.3' }}
+          antlr_version: ${{ (steps.read-base-and-final-version.outputs.base-version == 'source.latest' || fromJSON(steps.read-base-and-final-version.outputs.base-version) >= 16.7 ) && '4.13.2' || '4.9.3' }}
 
       - name: Setup Upgrade Version Composite Action
         id: setup-upgrade-ver-ca
diff --git a/contrib/babelfishpg_tsql/src/babelfish_version.h b/contrib/babelfishpg_tsql/src/babelfish_version.h
index 995ea41dd3..e74baf0e04 100644
--- a/contrib/babelfishpg_tsql/src/babelfish_version.h
+++ b/contrib/babelfishpg_tsql/src/babelfish_version.h
@@ -9,6 +9,6 @@
  */
 
 #define BABELFISH_VERSION_STR "4.5.0"
-#define BABELFISH_INTERNAL_VERSION_STR "Babelfish 16.6.0.0"
+#define BABELFISH_INTERNAL_VERSION_STR "Babelfish 16.7.0.0"
 #define BABEL_COMPATIBILITY_VERSION "12.0.2000.8"
 #define BABEL_COMPATIBILITY_MAJOR_VERSION "12"
diff --git a/test/JDBC/upgrade/14_14/schedule b/test/JDBC/upgrade/14_16/schedule
similarity index 100%
rename from test/JDBC/upgrade/14_14/schedule
rename to test/JDBC/upgrade/14_16/schedule
diff --git a/test/JDBC/upgrade/15_9/schedule b/test/JDBC/upgrade/15_11/schedule
similarity index 100%
rename from test/JDBC/upgrade/15_9/schedule
rename to test/JDBC/upgrade/15_11/schedule
diff --git a/test/JDBC/upgrade/16_5/schedule b/test/JDBC/upgrade/16_6/schedule
similarity index 100%
rename from test/JDBC/upgrade/16_5/schedule
rename to test/JDBC/upgrade/16_6/schedule