diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef579fa..f55ef61 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+### citus-docker v12.1.8.docker (May 30,2025) ###
+
+* Bump Citus version to 12.1.8
 ### citus-docker v13.2.0.docker (Sep 03,2025) ###
 
 * Bump Citus version to 13.2.0
diff --git a/Dockerfile b/Dockerfile
index 5c8711a..d716eb7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # This file is auto generated from it's template,
 # see citusdata/tools/packaging_automation/templates/docker/latest/latest.tmpl.dockerfile.
-FROM postgres:17.6-bookworm
-ARG VERSION=13.2.0
+FROM postgres:16.6
+ARG VERSION=12.1.8
 LABEL maintainer="Citus Data https://citusdata.com" \
       org.label-schema.name="Citus" \
       org.label-schema.description="Scalable PostgreSQL for multi-tenant and real-time workloads" \
@@ -19,7 +19,7 @@ RUN apt-get update \
        ca-certificates \
        curl \
     && curl -s https://install.citusdata.com/community/deb.sh | bash \
-    && apt-get install -y postgresql-$PG_MAJOR-citus-13.2=$CITUS_VERSION \
+    && apt-get install -y postgresql-$PG_MAJOR-citus-12.1=$CITUS_VERSION \
                           postgresql-$PG_MAJOR-hll=2.18.citus-1 \
                           postgresql-$PG_MAJOR-topn=2.7.0.citus-1 \
     && apt-get purge -y --auto-remove curl \
diff --git a/alpine/Dockerfile b/alpine/Dockerfile
index 28b7a6f..6727031 100644
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -1,7 +1,7 @@
 # This file is auto generated from it's template,
 # see citusdata/tools/packaging_automation/templates/docker/alpine/alpine.tmpl.dockerfile.
-FROM postgres:17.6-alpine
-ARG VERSION=13.2.0
+FROM postgres:16.6-alpine
+ARG VERSION=12.1.8
 LABEL maintainer="Citus Data https://citusdata.com" \
       org.label-schema.name="Citus" \
       org.label-schema.description="Scalable PostgreSQL for multi-tenant and real-time workloads" \
diff --git a/postgres-15/Dockerfile b/postgres-15/Dockerfile
index c70f254..84a643d 100644
--- a/postgres-15/Dockerfile
+++ b/postgres-15/Dockerfile
@@ -1,7 +1,7 @@
 # This file is auto generated from it's template,
 # see citusdata/tools/packaging_automation/templates/docker/postgres-15/postgres-15.tmpl.dockerfile.
-FROM postgres:15.14-bookworm
-ARG VERSION=13.2.0
+FROM postgres:15.10
+ARG VERSION=12.1.8
 LABEL maintainer="Citus Data https://citusdata.com" \
       org.label-schema.name="Citus" \
       org.label-schema.description="Scalable PostgreSQL for multi-tenant and real-time workloads" \
@@ -19,7 +19,7 @@ RUN apt-get update \
        ca-certificates \
        curl \
     && curl -s https://install.citusdata.com/community/deb.sh | bash \
-    && apt-get install -y postgresql-$PG_MAJOR-citus-13.2=$CITUS_VERSION \
+    && apt-get install -y postgresql-$PG_MAJOR-citus-12.1=$CITUS_VERSION \
                           postgresql-$PG_MAJOR-hll=2.18.citus-1 \
                           postgresql-$PG_MAJOR-topn=2.7.0.citus-1 \
     && apt-get purge -y --auto-remove curl \
diff --git a/postgres-16/Dockerfile b/postgres-16/Dockerfile
index ee04414..8efc6ad 100644
--- a/postgres-16/Dockerfile
+++ b/postgres-16/Dockerfile
@@ -1,7 +1,7 @@
 # This file is auto generated from it's template,
 # see citusdata/tools/packaging_automation/templates/docker/postgres-16/postgres-16.tmpl.dockerfile.
-FROM postgres:16.10-bookworm
-ARG VERSION=13.2.0
+FROM postgres:16.6
+ARG VERSION=12.1.8
 LABEL maintainer="Citus Data https://citusdata.com" \
       org.label-schema.name="Citus" \
       org.label-schema.description="Scalable PostgreSQL for multi-tenant and real-time workloads" \
@@ -19,7 +19,7 @@ RUN apt-get update \
        ca-certificates \
        curl \
     && curl -s https://install.citusdata.com/community/deb.sh | bash \
-    && apt-get install -y postgresql-$PG_MAJOR-citus-13.2=$CITUS_VERSION \
+    && apt-get install -y postgresql-$PG_MAJOR-citus-12.1=$CITUS_VERSION \
                           postgresql-$PG_MAJOR-hll=2.18.citus-1 \
                           postgresql-$PG_MAJOR-topn=2.7.0.citus-1 \
     && apt-get purge -y --auto-remove curl \