diff --git a/.github/labeler.yml b/.github/labeler.yml
index 6dfd5f530..6baa297c5 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -13,8 +13,11 @@ PG14:
 PG15:
 - base-branch: 'PG15'
 
+PG16:
+- base-branch: 'PG16'
+
 PG17:
 - base-branch: 'PG17'
 
 master:
-- base-branch: 'master'
\ No newline at end of file
+- base-branch: 'master'
diff --git a/.github/workflows/go-driver.yml b/.github/workflows/go-driver.yml
index ea0092b6e..64044f91e 100644
--- a/.github/workflows/go-driver.yml
+++ b/.github/workflows/go-driver.yml
@@ -2,10 +2,10 @@ name: Go Driver Tests
 
 on:
   push:
-    branches: [ "PG17_prepare" ]
+    branches: [ "PG17" ]
 
   pull_request:
-    branches: [ "PG17_prepare" ]
+    branches: [ "PG17" ]
 
 jobs:
   build:
diff --git a/.github/workflows/installcheck.yaml b/.github/workflows/installcheck.yaml
index 276b2709e..f2b69a02f 100644
--- a/.github/workflows/installcheck.yaml
+++ b/.github/workflows/installcheck.yaml
@@ -2,9 +2,9 @@ name: Build / Regression
 
 on:
   push:
-    branches: [ "PG17_prepare" ]
+    branches: [ "PG17" ]
   pull_request:
-    branches: [ "PG17_prepare" ]
+    branches: [ "PG17" ]
 
 jobs:
   build:
@@ -13,7 +13,7 @@ jobs:
     steps:
       - name: Get latest commit id of PostgreSQL 17
         run: |
-          echo "PG_COMMIT_HASH=$(git ls-remote git://git.postgresql.org/git/postgresql.git refs/heads/REL_17_STABLE | awk '{print $1}')" >> $GITHUB_ENV
+          echo "PG_COMMIT_HASH=$(git ls-remote https://git.postgresql.org/git/postgresql.git refs/heads/REL_17_STABLE | awk '{print $1}')" >> $GITHUB_ENV
 
       - name: Cache PostgreSQL 17
         uses: actions/cache@v3
@@ -30,7 +30,7 @@ jobs:
       - name: Install PostgreSQL 17 and some extensions
         if: steps.pg17cache.outputs.cache-hit != 'true'
         run: |
-          git clone --depth 1 --branch REL_17_STABLE git://git.postgresql.org/git/postgresql.git ~/pg17source
+          git clone --depth 1 --branch REL_17_STABLE https://git.postgresql.org/git/postgresql.git ~/pg17source
           cd ~/pg17source
           ./configure --prefix=$HOME/pg17 CFLAGS="-std=gnu99 -ggdb -O0" --enable-cassert
           make install -j$(nproc) > /dev/null
diff --git a/.github/workflows/jdbc-driver.yaml b/.github/workflows/jdbc-driver.yaml
index 2b074b855..54ca612f1 100644
--- a/.github/workflows/jdbc-driver.yaml
+++ b/.github/workflows/jdbc-driver.yaml
@@ -2,10 +2,10 @@ name: JDBC Driver Tests
 
 on:
   push:
-    branches: [ "PG17_prepare" ]
+    branches: [ "PG17" ]
 
   pull_request:
-    branches: [ "PG17_prepare" ]
+    branches: [ "PG17" ]
 
 jobs:
   build:
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
index 5c302618e..d5fc8c835 100644
--- a/.github/workflows/labeler.yml
+++ b/.github/workflows/labeler.yml
@@ -10,6 +10,9 @@ jobs:
       issues: write
     runs-on: ubuntu-latest
     steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+
     - name: Apply branch labels
       uses: actions/labeler@v5.0.0
 
diff --git a/.github/workflows/nodejs-driver.yaml b/.github/workflows/nodejs-driver.yaml
index 8e8d2af67..156cb8518 100644
--- a/.github/workflows/nodejs-driver.yaml
+++ b/.github/workflows/nodejs-driver.yaml
@@ -2,10 +2,10 @@ name: Nodejs Driver Tests
 
 on:
   push:
-    branches: [ "PG17_prepare" ]
+    branches: [ "PG17" ]
 
   pull_request:
-    branches: [ "PG17_prepare" ]
+    branches: [ "PG17" ]
 
 jobs:
   build:
diff --git a/.github/workflows/python-driver.yaml b/.github/workflows/python-driver.yaml
index 03f1ca84a..70488e738 100644
--- a/.github/workflows/python-driver.yaml
+++ b/.github/workflows/python-driver.yaml
@@ -2,10 +2,10 @@ name: Python Driver Tests
 
 on:
   push:
-    branches: [ "PG17_prepare" ]
+    branches: [ "PG17" ]
 
   pull_request:
-    branches: [ "PG17_prepare" ]
+    branches: [ "PG17" ]
 
 jobs:
   build:
diff --git a/drivers/docker-compose.yml b/drivers/docker-compose.yml
index 3789fe4a9..c83d26f47 100644
--- a/drivers/docker-compose.yml
+++ b/drivers/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3.3"
 services:
   db:
-    image: apache/age:dev_snapshot_PG17_prepare
+    image: apache/age:dev_snapshot_PG17
     environment:
       - POSTGRES_USER=postgres
       - POSTGRES_PASSWORD=agens