diff --git a/.github/workflows/jdbc-driver.yaml b/.github/workflows/jdbc-driver.yaml
index 090c55503..9be72f8cc 100644
--- a/.github/workflows/jdbc-driver.yaml
+++ b/.github/workflows/jdbc-driver.yaml
@@ -27,13 +27,13 @@ jobs:
       run: |
         if [[ "$GITHUB_EVENT_NAME" == "push" ]]; then
           if [[ "$GITHUB_REF" == "refs/heads/master" ]]; then
-            echo "TAG=PG14_latest" >> $GITHUB_ENV
+            echo "TAG=latest" >> $GITHUB_ENV
           elif [[ "$GITHUB_REF" == "refs/heads/PG14" ]]; then
             echo "TAG=PG14_latest" >> $GITHUB_ENV
           fi
         elif [[ "$GITHUB_EVENT_NAME" == "pull_request" ]]; then
           if [[ "$GITHUB_BASE_REF" == "master" ]]; then
-            echo "TAG=PG14_latest" >> $GITHUB_ENV
+            echo "TAG=latest" >> $GITHUB_ENV
           elif [[ "$GITHUB_BASE_REF" == "PG14" ]]; then
             echo "TAG=PG14_latest" >> $GITHUB_ENV
           fi
diff --git a/drivers/docker-compose.yml b/drivers/docker-compose.yml
index 095d72565..45ab86a39 100644
--- a/drivers/docker-compose.yml
+++ b/drivers/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3.3"
 services:
   db:
-    image: apache/age:PG14_latest
+    image: apache/age:${TAG}
     environment:
       - POSTGRES_USER=postgres
       - POSTGRES_PASSWORD=agens