diff --git a/circleci/images/PG_VERSIONS b/circleci/images/PG_VERSIONS
index b2f63b2..e158c66 100644
--- a/circleci/images/PG_VERSIONS
+++ b/circleci/images/PG_VERSIONS
@@ -1,3 +1,4 @@
 PG14=14.12
 PG15=15.7
 PG16=16.3
+PG17=17.2
diff --git a/circleci/images/citusupgradetester/Dockerfile b/circleci/images/citusupgradetester/Dockerfile
index fde5af2..918c276 100644
--- a/circleci/images/citusupgradetester/Dockerfile
+++ b/circleci/images/citusupgradetester/Dockerfile
@@ -67,7 +67,7 @@ apt-get update
 # infer the pgdgversion of postgres based on the $PG_VERSION
 pgdg_version=$(apt list -a postgresql-server-dev-${PG_MAJOR} 2>/dev/null | grep "${PG_VERSION}" | awk '{print $2}' | head -n1 )
 
-apt-get install -y --no-install-recommends --allow-downgrades \
+apt-get install -y --no-install-recommends \
     libpq-dev=${pgdg_version} \
     libpq5=${pgdg_version} \
     postgresql-${PG_MAJOR}=${pgdg_version} \
diff --git a/circleci/images/extbuilder/Dockerfile b/circleci/images/extbuilder/Dockerfile
index d7e6e18..fa28aac 100644
--- a/circleci/images/extbuilder/Dockerfile
+++ b/circleci/images/extbuilder/Dockerfile
@@ -56,7 +56,7 @@ apt-get update
 # infer the pgdgversion of postgres based on the $PG_VERSION
 pgdg_version=$(apt list -a postgresql-server-dev-${PG_MAJOR} 2>/dev/null | grep "${PG_VERSION}" | awk '{print $2}' | head -n1 )
 
-apt-get install -y --no-install-recommends --allow-downgrades \
+apt-get install -y --no-install-recommends \
     libpq-dev=${pgdg_version} \
     libpq5=${pgdg_version} \
     postgresql-${PG_MAJOR}=${pgdg_version} \
diff --git a/circleci/images/exttester/Dockerfile b/circleci/images/exttester/Dockerfile
index 4f822a4..c1d0095 100644
--- a/circleci/images/exttester/Dockerfile
+++ b/circleci/images/exttester/Dockerfile
@@ -32,6 +32,8 @@ apt-get install -y --no-install-recommends \
     locales \
     make \
     perl \
+    bison \
+    flex \
 
 # clear apt cache
 rm -rf /var/lib/apt/lists/*
@@ -120,6 +122,8 @@ apt-get install -y --no-install-recommends \
     locales \
     make \
     perl \
+    bison \
+    flex \
 
 # clear apt cache
 rm -rf /var/lib/apt/lists/*
@@ -158,7 +162,7 @@ apt-get update
 # infer the pgdgversion of postgres based on the $PG_VERSION
 pgdg_version=$(apt list -a postgresql-server-dev-${PG_MAJOR} 2>/dev/null | grep "${PG_VERSION}" | awk '{print $2}' | head -n1 )
 
-apt-get install -y --no-install-recommends --allow-downgrades \
+apt-get install -y --no-install-recommends \
     libdbi-perl \
     libdbd-pg-perl \
     libpq-dev=${pgdg_version} \
@@ -167,7 +171,12 @@ apt-get install -y --no-install-recommends --allow-downgrades \
     postgresql-client-${PG_MAJOR}=${pgdg_version} \
     postgresql-${PG_MAJOR}-dbgsym=${pgdg_version} \
     postgresql-server-dev-${PG_MAJOR}=${pgdg_version} \
-    postgresql-${PG_MAJOR}-wal2json \
+
+# wal2json not available yet for PG17
+if [ "$PG_MAJOR" != "17" ];
+then
+    apt-get install -y --no-install-recommends --allow-downgrades postgresql-${PG_MAJOR}-wal2json;
+fi;
 
     # clear apt cache
 rm -rf /var/lib/apt/lists/*
diff --git a/circleci/images/failtester/Dockerfile b/circleci/images/failtester/Dockerfile
index 62cbeb7..934a84b 100644
--- a/circleci/images/failtester/Dockerfile
+++ b/circleci/images/failtester/Dockerfile
@@ -66,7 +66,7 @@ apt-get update
 # infer the pgdgversion of postgres based on the $PG_VERSION
 pgdg_version=$(apt list -a postgresql-server-dev-${PG_MAJOR} 2>/dev/null | grep "${PG_VERSION}" | awk '{print $2}' | head -n1 )
 
-apt-get install -y --no-install-recommends --allow-downgrades \
+apt-get install -y --no-install-recommends \
     libpq-dev=${pgdg_version} \
     libpq5=${pgdg_version} \
     postgresql-${PG_MAJOR}=${pgdg_version} \