diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml
index d624e04..82e4440 100644
--- a/.forgejo/workflows/build.yml
+++ b/.forgejo/workflows/build.yml
@@ -8,6 +8,8 @@ jobs:
       matrix:
         PG_MAJOR_VERSION:
           - 17
+          - 16
+          - 15
         DEB_RELEASE:
           - bookworm
     runs-on: self-hosted
@@ -57,6 +59,8 @@ jobs:
       matrix:
         PG_MAJOR_VERSION:
           - 17
+          - 16
+          - 15
         DEB_RELEASE:
           - bookworm
         POSTGIS_VERSiON:
@@ -67,6 +71,8 @@ jobs:
           - 1.4.1
         PGVECTOR_VERSION:
           - v0.8.0
+        PG_CRON_VERSION:
+          - v0.8.0
     runs-on: self-hosted
     steps:
       - name: Setup metadata
@@ -113,4 +119,5 @@ jobs:
             TO<ESCALEDB_VERSION=${{ matrix.TO<ESCALEDB_VERSION }}
             HYPOPG_VERSION=${{ matrix.HYPOPG_VERSION }}
             PGVECTOR_VERSION=${{ matrix.PGVECTOR_VERSION }}
+            PG_CRON_VERSION=${{ matrix.PG_CRON_VERSION }}
 
diff --git a/general/Dockerfile b/general/Dockerfile
index 94cee65..30b496d 100644
--- a/general/Dockerfile
+++ b/general/Dockerfile
@@ -10,6 +10,7 @@ ARG POSTGIS_VERSION=3.5.2
 ARG PGVECTOR_VERSION=v0.8.0
 ARG TIMESCALEDB_VERSION=2.19.3
 ARG HYPOPG_VERSION=1.4.1
+ARG PG_CRON_VERSION=v1.6.5
 
 RUN apt update && apt install -y build-essential flex bison git yacc cmake \
     docbook-xsl-ns \
@@ -49,6 +50,11 @@ RUN git clone https://github.com/pgvector/pgvector --depth=1 --recursive -b ${PG
 WORKDIR /build/pgvector
 RUN make -j && make install
 
+WORKDIR /build
+RUN git clone https://github.com/citusdata/pg_cron --depth=1 --recursive -b ${PG_CRON_VERSION} /build/pgcron
+WORKDIR /build/pgcron
+RUN make -j && make install
+
 FROM gitea.simcop2387.info/simcop2387/postgresql-container-base:${BASE_IMAGE_TAG} AS final
 RUN apt update && apt install -y \
     docbook-xsl-ns \