diff --git a/.github/workflows/build-test-images.yml b/.github/workflows/build-test-images.yml
index 1321eb0..ce9d096 100644
--- a/.github/workflows/build-test-images.yml
+++ b/.github/workflows/build-test-images.yml
@@ -23,6 +23,7 @@ jobs:
     if: github.ref_name != 'master'
     name: push-test-images-for-dev
     runs-on: ubuntu-latest
+    permissions: write-all
     needs:
       - prepare_pgversion_matrix
     strategy:
@@ -55,6 +56,7 @@ jobs:
     if: github.ref_name != 'master'
     name: push-test-images-for-dev
     runs-on: ubuntu-latest
+    permissions: write-all
     strategy:
       fail-fast: false
       matrix:
@@ -85,6 +87,7 @@ jobs:
     if: github.ref_name == 'master'
     name: push-test-images-for-release
     runs-on: ubuntu-latest
+    permissions: write-all
     strategy:
       fail-fast: false
 
diff --git a/circleci/images/Makefile b/circleci/images/Makefile
index 0389901..7eb2c57 100644
--- a/circleci/images/Makefile
+++ b/circleci/images/Makefile
@@ -18,8 +18,8 @@ STYLE_CHECKER_TOOLS_VERSION=0.8.18
 
 # we should add more majors/citus versions when we address https://github.com/citusdata/citus/issues/4807
 CITUS_UPGRADE_PG_VERSIONS=$(shell head -n1 PG_VERSIONS|cut -c 6-|tr '\n' ' ' )
-# 10.2.0 is the oldest version supporting PG14, whereas 11.3.0 is for upgrade_pg_dist_cleanup tests
-CITUS_UPGRADE_VERSIONS=v10.2.0 v11.3.0
+# 11.1.0 is the oldest version supporting PG15, whereas 11.3.0 is for upgrade_pg_dist_cleanup tests
+CITUS_UPGRADE_VERSIONS=v11.1.0 v11.3.0
 
 # code below creates targets for all postgres versions in PG_VERSIONS
 define make-image-targets
@@ -87,7 +87,8 @@ push-failtester-all:: push-failtester-$1
 endef
 
 # call make-image-targets($PG_VERSION, $PG_MAJOR) for every version in PG_VERSIONS
-$(foreach element,$(PG_VERSIONS),$(eval $(call make-image-targets,$(element),$(shell echo $(element) | awk -F'[^0-9]*' '/[0-9]/ { print $$1 }'),$(shell echo $(element) | sed 's/~//'))))
+#$(foreach element,$(PG_VERSIONS),$(eval $(call make-image-targets,$(element),$(shell echo $(element) | awk -F'[^0-9]*' '/[0-9]/ { print $$1 }'),$(shell echo $(element) | sed 's/~//'))))
+$(foreach element,$(PG_VERSIONS),$(eval $(call make-image-targets,$(element),$(shell echo $(element)|awk -F'[^0-9]*' '/[0-9]/{print$$1}'),$(subst ~,,$(element)))))
 
 define make-citus-upgrage-targets
 # $1 = PG_VERSION
diff --git a/circleci/images/PG_VERSIONS b/circleci/images/PG_VERSIONS
index 01757ad..b4ff923 100644
--- a/circleci/images/PG_VERSIONS
+++ b/circleci/images/PG_VERSIONS
@@ -1,4 +1,4 @@
-PG14=14.14
-PG15=15.9
-PG16=16.5
-PG17=17.1
+PG15=15.13
+PG16=16.9
+PG17=17.5
+PG18=18~beta2
diff --git a/circleci/images/citusupgradetester/Dockerfile b/circleci/images/citusupgradetester/Dockerfile
index fde5af2..fce9f65 100644
--- a/circleci/images/citusupgradetester/Dockerfile
+++ b/circleci/images/citusupgradetester/Dockerfile
@@ -68,8 +68,8 @@ apt-get update
 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 \
-    libpq-dev=${pgdg_version} \
     libpq5=${pgdg_version} \
+    libpq-dev=${pgdg_version} \
     postgresql-${PG_MAJOR}=${pgdg_version} \
     postgresql-client-${PG_MAJOR}=${pgdg_version} \
     postgresql-${PG_MAJOR}-dbgsym=${pgdg_version} \
diff --git a/circleci/images/extbuilder/Dockerfile b/circleci/images/extbuilder/Dockerfile
index d7e6e18..e340e82 100644
--- a/circleci/images/extbuilder/Dockerfile
+++ b/circleci/images/extbuilder/Dockerfile
@@ -57,8 +57,8 @@ apt-get update
 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 \
-    libpq-dev=${pgdg_version} \
     libpq5=${pgdg_version} \
+    libpq-dev=${pgdg_version} \
     postgresql-${PG_MAJOR}=${pgdg_version} \
     postgresql-client-${PG_MAJOR}=${pgdg_version} \
     postgresql-${PG_MAJOR}-dbgsym=${pgdg_version} \
diff --git a/circleci/images/exttester/Dockerfile b/circleci/images/exttester/Dockerfile
index 02bd74c..a54b32e 100644
--- a/circleci/images/exttester/Dockerfile
+++ b/circleci/images/exttester/Dockerfile
@@ -163,10 +163,8 @@ apt-get update
 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 \
-    libdbi-perl \
-    libdbd-pg-perl \
-    libpq-dev=${pgdg_version} \
     libpq5=${pgdg_version} \
+    libpq-dev=${pgdg_version} \
     postgresql-${PG_MAJOR}=${pgdg_version} \
     postgresql-client-${PG_MAJOR}=${pgdg_version} \
     postgresql-${PG_MAJOR}-dbgsym=${pgdg_version} \
diff --git a/circleci/images/failtester/Dockerfile b/circleci/images/failtester/Dockerfile
index 62cbeb7..ce286e2 100644
--- a/circleci/images/failtester/Dockerfile
+++ b/circleci/images/failtester/Dockerfile
@@ -67,8 +67,8 @@ apt-get update
 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 \
-    libpq-dev=${pgdg_version} \
     libpq5=${pgdg_version} \
+    libpq-dev=${pgdg_version} \
     postgresql-${PG_MAJOR}=${pgdg_version} \
     postgresql-client-${PG_MAJOR}=${pgdg_version} \
     postgresql-${PG_MAJOR}-dbgsym=${pgdg_version} \