diff --git a/.github/workflows/go-driver.yml b/.github/workflows/go-driver.yml
index 10b1abaa6..3858489df 100644
--- a/.github/workflows/go-driver.yml
+++ b/.github/workflows/go-driver.yml
@@ -2,10 +2,10 @@ name: Go Driver Tests
 
 on:
   push:
-    branches: [ "master", "PG16" ]
+    branches: [ "master" ]
 
   pull_request:
-    branches: [ "master", "PG16" ]
+    branches: [ "master" ]
 
 jobs:
   build:
@@ -21,25 +21,9 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
-    - name: Set tag based on branch
-      run: |
-        if [[ "$GITHUB_EVENT_NAME" == "push" ]]; then
-          if [[ "$GITHUB_REF" == "refs/heads/master" ]]; then
-            echo "TAG=latest" >> $GITHUB_ENV
-          elif [[ "$GITHUB_REF" == "refs/heads/PG16" ]]; then
-            echo "TAG=PG16_latest" >> $GITHUB_ENV
-          fi
-        elif [[ "$GITHUB_EVENT_NAME" == "pull_request" ]]; then
-          if [[ "$GITHUB_BASE_REF" == "master" ]]; then
-            echo "TAG=latest" >> $GITHUB_ENV
-          elif [[ "$GITHUB_BASE_REF" == "PG16" ]]; then
-            echo "TAG=PG16_latest" >> $GITHUB_ENV
-          fi
-        fi
-
     - name: Run apache/age docker image
       run: |
-        export TAG=$TAG
+        export TAG=latest
         docker-compose up -d
 
     - name: Set up Go
diff --git a/.github/workflows/installcheck.yaml b/.github/workflows/installcheck.yaml
index a975aeb49..c38245382 100644
--- a/.github/workflows/installcheck.yaml
+++ b/.github/workflows/installcheck.yaml
@@ -2,9 +2,9 @@ name: Build / Regression
 
 on:
   push:
-    branches: [ 'master', 'PG16' ]
+    branches: [ "master" ]
   pull_request:
-    branches: [ 'master', 'PG16' ]
+    branches: [ "master" ]
 
 jobs:
   build:
diff --git a/.github/workflows/jdbc-driver.yaml b/.github/workflows/jdbc-driver.yaml
index 81d2558ae..055de564b 100644
--- a/.github/workflows/jdbc-driver.yaml
+++ b/.github/workflows/jdbc-driver.yaml
@@ -2,10 +2,10 @@ name: JDBC Driver Tests
 
 on:
   push:
-    branches: [ "master", "PG16" ]
+    branches: [ "master" ]
 
   pull_request:
-    branches: [ "master", "PG16" ]
+    branches: [ "master" ]
 
 jobs:
   build:
@@ -23,23 +23,7 @@ jobs:
         distribution: 'zulu'
         java-version: '17'
 
-    - name: Set tag based on branch
-      run: |
-        if [[ "$GITHUB_EVENT_NAME" == "push" ]]; then
-          if [[ "$GITHUB_REF" == "refs/heads/master" ]]; then
-            echo "TAG=latest" >> $GITHUB_ENV
-          elif [[ "$GITHUB_REF" == "refs/heads/PG16" ]]; then
-            echo "TAG=PG16_latest" >> $GITHUB_ENV
-          fi
-        elif [[ "$GITHUB_EVENT_NAME" == "pull_request" ]]; then
-          if [[ "$GITHUB_BASE_REF" == "master" ]]; then
-            echo "TAG=latest" >> $GITHUB_ENV
-          elif [[ "$GITHUB_BASE_REF" == "PG16" ]]; then
-            echo "TAG=PG16_latest" >> $GITHUB_ENV
-          fi
-        fi
-
     - name: Build and Test
       run: |
-        export TAG=$TAG
+        export TAG=latest
         gradle build
diff --git a/.github/workflows/nodejs-driver.yaml b/.github/workflows/nodejs-driver.yaml
index bc926e6fd..628cc3ff9 100644
--- a/.github/workflows/nodejs-driver.yaml
+++ b/.github/workflows/nodejs-driver.yaml
@@ -2,10 +2,10 @@ name: Nodejs Driver Tests
 
 on:
   push:
-    branches: [ "master", "PG16" ]
+    branches: [ "master" ]
 
   pull_request:
-    branches: [ "master", "PG16" ]
+    branches: [ "master" ]
 
 jobs:
   build:
@@ -18,25 +18,9 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
-    - name: Set tag based on branch
-      run: |
-        if [[ "$GITHUB_EVENT_NAME" == "push" ]]; then
-          if [[ "$GITHUB_REF" == "refs/heads/master" ]]; then
-            echo "TAG=latest" >> $GITHUB_ENV
-          elif [[ "$GITHUB_REF" == "refs/heads/PG16" ]]; then
-            echo "TAG=PG16_latest" >> $GITHUB_ENV
-          fi
-        elif [[ "$GITHUB_EVENT_NAME" == "pull_request" ]]; then
-          if [[ "$GITHUB_BASE_REF" == "master" ]]; then
-            echo "TAG=latest" >> $GITHUB_ENV
-          elif [[ "$GITHUB_BASE_REF" == "PG16" ]]; then
-            echo "TAG=PG16_latest" >> $GITHUB_ENV
-          fi
-        fi
-
     - name: Run apache/age docker image
       run: |
-        export TAG=$TAG
+        export TAG=latest
         docker-compose up -d
 
     - name: Set up Node
diff --git a/.github/workflows/python-driver.yaml b/.github/workflows/python-driver.yaml
index 3e7f8ee54..40eb58e5f 100644
--- a/.github/workflows/python-driver.yaml
+++ b/.github/workflows/python-driver.yaml
@@ -2,10 +2,10 @@ name: Python Driver Tests
 
 on:
   push:
-    branches: [ "master", "PG16" ]
+    branches: [ "master" ]
 
   pull_request:
-    branches: [ "master", "PG16" ]
+    branches: [ "master" ]
 
 jobs:
   build:
@@ -18,25 +18,9 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
-    - name: Set tag based on branch
-      run: |
-        if [[ "$GITHUB_EVENT_NAME" == "push" ]]; then
-          if [[ "$GITHUB_REF" == "refs/heads/master" ]]; then
-            echo "TAG=latest" >> $GITHUB_ENV
-          elif [[ "$GITHUB_REF" == "refs/heads/PG16" ]]; then
-            echo "TAG=PG16_latest" >> $GITHUB_ENV
-          fi
-        elif [[ "$GITHUB_EVENT_NAME" == "pull_request" ]]; then
-          if [[ "$GITHUB_BASE_REF" == "master" ]]; then
-            echo "TAG=latest" >> $GITHUB_ENV
-          elif [[ "$GITHUB_BASE_REF" == "PG16" ]]; then
-            echo "TAG=PG16_latest" >> $GITHUB_ENV
-          fi
-        fi
-
     - name: Run apache/age docker image
       run: |
-        export TAG=$TAG
+        export TAG=latest
         docker-compose up -d
 
     - name: Set up python