diff --git a/circleci/images/Makefile b/circleci/images/Makefile
index 8e69a55..a2f620c 100644
--- a/circleci/images/Makefile
+++ b/circleci/images/Makefile
@@ -14,10 +14,11 @@ PG_VERSIONS=$(shell cat PG_VERSIONS|cut -c 6-|tr '\n' ' ' )
 
 PG_UPGRADE_TESTER_VERSION=$(shell echo ${PG_VERSIONS}|tr ' ' '-'|sed 's/~//g')
 
-STYLE_CHECKER_TOOLS_VERSION=0.8.33
+STYLE_CHECKER_TOOLS_VERSION=0.8.18
 
 # Upgrade tests for the PG major versions from PG_VERSIONS file
 CITUS_UPGRADE_PG_VERSIONS=$(shell head PG_VERSIONS|cut -c 6-|tr '\n' ' ')
+CITUS_UPGRADE_VERSIONS_15=v12.1.10
 # 12.1.10 is the latest release of Citus 12 when the test is expanded to cover Citus 12
 CITUS_UPGRADE_VERSIONS_16=v12.1.10
 # Latest minor version of Citus 13
diff --git a/circleci/images/PG_VERSIONS b/circleci/images/PG_VERSIONS
index 98c38dc..179016b 100644
--- a/circleci/images/PG_VERSIONS
+++ b/circleci/images/PG_VERSIONS
@@ -1,3 +1,4 @@
+PG15=15.17
 PG16=16.13
 PG17=17.9
 PG18=18.3
diff --git a/circleci/images/stylechecker/Dockerfile b/circleci/images/stylechecker/Dockerfile
index 8ef50b8..8e3ee6d 100644
--- a/circleci/images/stylechecker/Dockerfile
+++ b/circleci/images/stylechecker/Dockerfile
@@ -48,15 +48,15 @@ make uncrustify/.install
 cd ..
 rm -rf "v${TOOLS_VERSION}.tar.gz"
 
-curl -fsSL "https://codeload.github.com/uncrustify/uncrustify/tar.gz/uncrustify-0.82.0" | tar xz
-cd uncrustify-uncrustify-0.82.0/
+curl -fsSL "https://codeload.github.com/uncrustify/uncrustify/tar.gz/uncrustify-0.68.1" | tar xz
+cd uncrustify-uncrustify-0.68.1/
 mkdir build
 cd build
 cmake ..
 make -j5
 make install
 cd ../..
-rm -rf uncrustify-uncrustify-0.82.0/
+rm -rf uncrustify-uncrustify-0.68.1/
 
 export CARGO_HOME="${CARGO_HOME:-/root/.cargo}"
 export RUSTUP_HOME="${RUSTUP_HOME:-/root/.rustup}"