diff --git a/.github/workflows/frankenphp.yml b/.github/workflows/frankenphp.yml
index 716e3dc9..76401c92 100644
--- a/.github/workflows/frankenphp.yml
+++ b/.github/workflows/frankenphp.yml
@@ -95,6 +95,21 @@ jobs:
           cache-from: type=gha, scope=${{ github.workflow }}-frankenphp
           cache-to: type=gha, scope=${{ github.workflow }}-frankenphp, mode=max
 
+      - name: Build and push (frankenphp-cron)
+        uses: docker/build-push-action@v7
+        timeout-minutes: 120
+        with:
+          builder: ${{ steps.buildx.outputs.name }}
+          context: ./php
+          target: frankenphp-cron
+          file: ./php/${{ matrix.image.file || 'Dockerfile' }}
+          build-args: ${{ matrix.image.build-args }}
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ghcr.io/netlogix/docker/frankenphp-cron:${{ matrix.image.version }}
+          platforms: linux/amd64,linux/arm64
+          cache-from: type=gha, scope=${{ github.workflow }}-frankenphp
+          cache-to: type=gha, scope=${{ github.workflow }}-frankenphp, mode=max
+
   build-docker-dev-image:
     name: 'Build frankenphp-${{ matrix.image.version }}-dev docker image'
     runs-on: ubuntu-latest
@@ -164,3 +179,18 @@ jobs:
           platforms: linux/amd64,linux/arm64
           cache-from: type=gha, scope=${{ github.workflow }}-frankenphp-dev
           cache-to: type=gha, scope=${{ github.workflow }}-frankenphp-dev, mode=max
+
+      - name: Build and push (frankenphp-cron-dev)
+        uses: docker/build-push-action@v7
+        timeout-minutes: 120
+        with:
+          builder: ${{ steps.buildx.outputs.name }}
+          context: ./php
+          target: frankenphp-cron-dev
+          file: ./php/${{ matrix.image.file || 'Dockerfile' }}
+          build-args: ${{ matrix.image.build-args }}
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ghcr.io/netlogix/docker/frankenphp-cron-dev:${{ matrix.image.version }}
+          platforms: linux/amd64,linux/arm64
+          cache-from: type=gha, scope=${{ github.workflow }}-frankenphp-dev
+          cache-to: type=gha, scope=${{ github.workflow }}-frankenphp-dev, mode=max)
diff --git a/build-container.sh b/build-container.sh
index 004a25af..9e59336b 100755
--- a/build-container.sh
+++ b/build-container.sh
@@ -41,33 +41,12 @@ docker buildx build -t ghcr.io/netlogix/docker/prometheus-redis-exporter:${VERSI
 docker buildx build -t ghcr.io/netlogix/docker/prometheus-solr-exporter:${VERSION} -f prometheus-solr-exporter/Dockerfile prometheus-solr-exporter
 docker buildx build -t ghcr.io/netlogix/docker/prometheus-varnish-exporter:${VERSION} -f prometheus-varnish-exporter/Dockerfile prometheus-varnish-exporter
 
-docker buildx build -t ghcr.io/netlogix/docker/php-fpm:7.2 --build-arg PHP_VERSION=7.2 --build-arg UBUNTU_VERSION=24.04 -f php/7.x.Dockerfile --target=php-fpm php
-docker buildx build -t ghcr.io/netlogix/docker/php-cli:7.2 --build-arg PHP_VERSION=7.2 --build-arg UBUNTU_VERSION=24.04 -f php/7.x.Dockerfile --target=php-cli php
-docker buildx build -t ghcr.io/netlogix/docker/php-fpm-dev:7.2 --build-arg PHP_VERSION=7.2 --build-arg UBUNTU_VERSION=24.04 -f php/7.x.Dockerfile --target=php-fpm-dev php
-docker buildx build -t ghcr.io/netlogix/docker/php-cli-dev:7.2 --build-arg PHP_VERSION=7.2 --build-arg UBUNTU_VERSION=24.04 -f php/7.x.Dockerfile --target=php-cli-dev php
-docker buildx build -t ghcr.io/netlogix/docker/php-cron:7.2 --build-arg PHP_VERSION=7.2 --build-arg UBUNTU_VERSION=24.04 -f php/7.x.Dockerfile --target=php-cron php
-docker buildx build -t ghcr.io/netlogix/docker/php-cron-dev:7.2 --build-arg PHP_VERSION=7.2 --build-arg UBUNTU_VERSION=24.04 -f php/7.x.Dockerfile --target=php-cron-dev php
-docker buildx build -t ghcr.io/netlogix/docker/php-supervisor:7.2 --build-arg PHP_VERSION=7.2 --build-arg UBUNTU_VERSION=24.04 -f php/7.x.Dockerfile --target=php-supervisor php
-
-docker buildx build -t ghcr.io/netlogix/docker/php-fpm:7.3 --build-arg PHP_VERSION=7.3 --build-arg UBUNTU_VERSION=24.04 -f php/7.x.Dockerfile --target=php-fpm php
-docker buildx build -t ghcr.io/netlogix/docker/php-cli:7.3 --build-arg PHP_VERSION=7.3 --build-arg UBUNTU_VERSION=24.04 -f php/7.x.Dockerfile --target=php-cli php
-docker buildx build -t ghcr.io/netlogix/docker/php-fpm-dev:7.3 --build-arg PHP_VERSION=7.3 --build-arg UBUNTU_VERSION=24.04 -f php/7.x.Dockerfile --target=php-fpm-dev php
-docker buildx build -t ghcr.io/netlogix/docker/php-cli-dev:7.3 --build-arg PHP_VERSION=7.3 --build-arg UBUNTU_VERSION=24.04 -f php/7.x.Dockerfile --target=php-cli-dev php
-docker buildx build -t ghcr.io/netlogix/docker/php-cron:7.3 --build-arg PHP_VERSION=7.3 --build-arg UBUNTU_VERSION=24.04 -f php/7.x.Dockerfile --target=php-cron php
-docker buildx build -t ghcr.io/netlogix/docker/php-cron-dev:7.3 --build-arg PHP_VERSION=7.3 --build-arg UBUNTU_VERSION=24.04 -f php/7.x.Dockerfile --target=php-cron-dev php
-docker buildx build -t ghcr.io/netlogix/docker/php-supervisor:7.3 --build-arg PHP_VERSION=7.3 --build-arg UBUNTU_VERSION=24.04 -f php/7.x.Dockerfile --target=php-supervisor php
-
-docker buildx build -t ghcr.io/netlogix/docker/php-fpm:7.4 --build-arg PHP_VERSION=7.4 --build-arg UBUNTU_VERSION=20.04 -f php/7.x.Dockerfile --target=php-fpm php
-docker buildx build -t ghcr.io/netlogix/docker/php-cli:7.4 --build-arg PHP_VERSION=7.4 --build-arg UBUNTU_VERSION=20.04 -f php/7.x.Dockerfile --target=php-cli php
-docker buildx build -t ghcr.io/netlogix/docker/php-fpm-dev:7.4 --build-arg PHP_VERSION=7.4 --build-arg UBUNTU_VERSION=20.04 -f php/7.x.Dockerfile --target=php-fpm-dev php
-docker buildx build -t ghcr.io/netlogix/docker/php-cli-dev:7.4 --build-arg PHP_VERSION=7.4 --build-arg UBUNTU_VERSION=20.04 -f php/7.x.Dockerfile --target=php-cli-dev php
-docker buildx build -t ghcr.io/netlogix/docker/php-cron:7.4 --build-arg PHP_VERSION=7.4 --build-arg UBUNTU_VERSION=20.04 -f php/7.x.Dockerfile --target=php-cron php
-docker buildx build -t ghcr.io/netlogix/docker/php-cron-dev:7.4 --build-arg PHP_VERSION=7.4 --build-arg UBUNTU_VERSION=20.04 -f php/7.x.Dockerfile --target=php-cron-dev php
-docker buildx build -t ghcr.io/netlogix/docker/php-supervisor:7.4 --build-arg PHP_VERSION=7.4 --build-arg UBUNTU_VERSION=20.04 -f php/7.x.Dockerfile --target=php-supervisor php
-
 docker buildx build -t ghcr.io/netlogix/docker/php-fpm:8.0 --build-arg PHP_VERSION=8.0 --build-arg UBUNTU_VERSION=24.04 -f php/8.x.Dockerfile --target=php-fpm php
 docker buildx build -t ghcr.io/netlogix/docker/php-cli:8.0 --build-arg PHP_VERSION=8.0 --build-arg UBUNTU_VERSION=24.04 -f php/8.x.Dockerfile --target=php-cli php
-docker buildx build -t ghcr.io/netlogix/docker/php-cron:8.0--build-arg PHP_VERSION=8.0 --build-arg UBUNTU_VERSION=24.04 -f php/8.x.Dockerfile --target=php-cron php
+docker buildx build -t ghcr.io/netlogix/docker/php-fpm-dev:8.0 --build-arg PHP_VERSION=8.0 --build-arg UBUNTU_VERSION=24.04 -f php/8.x.Dockerfile --target=php-fpm-dev php
+docker buildx build -t ghcr.io/netlogix/docker/php-cli-dev:8.0 --build-arg PHP_VERSION=8.0 --build-arg UBUNTU_VERSION=24.04 -f php/8.x.Dockerfile --target=php-cli-dev php
+docker buildx build -t ghcr.io/netlogix/docker/php-cron:8.0 --build-arg PHP_VERSION=8.0 --build-arg UBUNTU_VERSION=24.04 -f php/8.x.Dockerfile --target=php-cron php
+docker buildx build -t ghcr.io/netlogix/docker/php-cron-dev:8.0 --build-arg PHP_VERSION=8.0 --build-arg UBUNTU_VERSION=24.04 -f php/8.x.Dockerfile --target=php-cron-dev php
 docker buildx build -t ghcr.io/netlogix/docker/php-supervisor:8.0 --build-arg PHP_VERSION=8.0 --build-arg UBUNTU_VERSION=24.04 -f php/8.x.Dockerfile --target=php-supervisor php
 
 docker buildx build -t ghcr.io/netlogix/docker/php-fpm:8.1 --build-arg PHP_VERSION=8.1 --build-arg UBUNTU_VERSION=22.04 -f php/Dockerfile --target=php-fpm php
@@ -114,12 +93,24 @@ docker buildx build -t ghcr.io/netlogix/docker/frankenphp:8.3 --build-arg PHP_VE
 docker buildx build -t ghcr.io/netlogix/docker/frankenphp-dev:8.3 --build-arg PHP_VERSION=8.3 -f php/frankenphp.Dockerfile --target=frankenphp-dev php
 docker buildx build -t ghcr.io/netlogix/docker/frankenphp-cli:8.3 --build-arg PHP_VERSION=8.3 -f php/frankenphp.Dockerfile --target=frankenphp-cli php
 docker buildx build -t ghcr.io/netlogix/docker/frankenphp-cli-dev:8.3 --build-arg PHP_VERSION=8.3 -f php/frankenphp.Dockerfile --target=frankenphp-cli-dev php
+docker buildx build -t ghcr.io/netlogix/docker/frankenphp-cron:8.3 --build-arg PHP_VERSION=8.3 -f php/frankenphp.Dockerfile --target=frankenphp-cron php
+docker buildx build -t ghcr.io/netlogix/docker/frankenphp-cron-dev:8.3 --build-arg PHP_VERSION=8.3 -f php/frankenphp.Dockerfile --target=frankenphp-cron-dev php
 
 docker buildx build -t ghcr.io/netlogix/docker/frankenphp:8.4 --build-arg PHP_VERSION=8.4 -f php/frankenphp.Dockerfile --target=frankenphp php
 docker buildx build -t ghcr.io/netlogix/docker/frankenphp-dev:8.4 --build-arg PHP_VERSION=8.4 -f php/frankenphp.Dockerfile --target=frankenphp-dev php
 docker buildx build -t ghcr.io/netlogix/docker/frankenphp-cli:8.4 --build-arg PHP_VERSION=8.4 -f php/frankenphp.Dockerfile --target=frankenphp-cli php
 docker buildx build -t ghcr.io/netlogix/docker/frankenphp-cli-dev:8.4 --build-arg PHP_VERSION=8.4 -f php/frankenphp.Dockerfile --target=frankenphp-cli-dev php
+docker buildx build -t ghcr.io/netlogix/docker/frankenphp-cron:8.4 --build-arg PHP_VERSION=8.4 -f php/frankenphp.Dockerfile --target=frankenphp-cron php
+docker buildx build -t ghcr.io/netlogix/docker/frankenphp-cron-dev:8.4 --build-arg PHP_VERSION=8.4 -f php/frankenphp.Dockerfile --target=frankenphp-cron-dev php
+
+docker buildx build -t ghcr.io/netlogix/docker/frankenphp:8.5 --build-arg PHP_VERSION=8.5 -f php/frankenphp.Dockerfile --target=frankenphp php
+docker buildx build -t ghcr.io/netlogix/docker/frankenphp-dev:8.5 --build-arg PHP_VERSION=8.5 -f php/frankenphp.Dockerfile --target=frankenphp-dev php
+docker buildx build -t ghcr.io/netlogix/docker/frankenphp-cli:8.5 --build-arg PHP_VERSION=8.5 -f php/frankenphp.Dockerfile --target=frankenphp-cli php
+docker buildx build -t ghcr.io/netlogix/docker/frankenphp-cli-dev:8.5 --build-arg PHP_VERSION=8.5 -f php/frankenphp.Dockerfile --target=frankenphp-cli-dev php
+docker buildx build -t ghcr.io/netlogix/docker/frankenphp-cron:8.5 --build-arg PHP_VERSION=8.5 -f php/frankenphp.Dockerfile --target=frankenphp-cron php
+docker buildx build -t ghcr.io/netlogix/docker/frankenphp-cron-dev:8.5 --build-arg PHP_VERSION=8.5 -f php/frankenphp.Dockerfile --target=frankenphp-cron-dev php
 
 docker buildx build -t ghcr.io/netlogix/docker/node:18 --build-arg NODE_VERSION=18 -f node/Dockerfile node
 docker buildx build -t ghcr.io/netlogix/docker/node:20 --build-arg NODE_VERSION=20 -f node/Dockerfile node
 docker buildx build -t ghcr.io/netlogix/docker/node:22 --build-arg NODE_VERSION=22 -f node/Dockerfile node
+docker buildx build -t ghcr.io/netlogix/docker/node:24 --build-arg NODE_VERSION=24 -f node/Dockerfile node
diff --git a/php/frankenphp.Dockerfile b/php/frankenphp.Dockerfile
index 7e184147..7048a8f0 100644
--- a/php/frankenphp.Dockerfile
+++ b/php/frankenphp.Dockerfile
@@ -1,6 +1,6 @@
 ARG PHP_VERSION=8.4
 
-FROM dunglas/frankenphp:php${PHP_VERSION} AS app-frankenphp-base
+FROM dunglas/frankenphp:php${PHP_VERSION} AS frankenphp-base
 RUN <<EOF
     set -e
     apt-get update -y
@@ -39,6 +39,7 @@ RUN <<EOF
         opcache \
         pcntl \
         pdo_mysql \
+        pdo_pgsql \
         pgsql \
         raphf \
         readline \
@@ -119,20 +120,34 @@ USER www-data
 
 RUN frankenphp adapt --config /etc/frankenphp/Caddyfile --pretty --validate
 
-HEALTHCHECK --interval=2s --timeout=2s --start-period=2s --retries=3 \
-  CMD curl --fail --silent http://localhost:8080/health-check || exit 1
+HEALTHCHECK NONE
+
+FROM frankenphp-base AS frankenphp
 
 LABEL prometheus_port="2020"
 
-FROM app-frankenphp-base AS frankenphp
-COPY --chown=www-data:www-data . /var/www/
+HEALTHCHECK --interval=2s --timeout=2s --start-period=2s --retries=3 \
+  CMD curl --fail --silent http://localhost:8080/health-check || exit 1
+
+EXPOSE 2020
 
-FROM frankenphp AS frankenphp-cli
+FROM frankenphp-base AS frankenphp-cli
 ENTRYPOINT [ "frankenphp", "php-cli" ]
 CMD []
 
+FROM frankenphp-base AS frankenphp-cron
 
-FROM app-frankenphp-base AS frankenphp-base-dev
+USER root
+
+ENV CRONTAB_PATH=/var/www/config/crontab
+# cron runs jobs with a minimal PATH (/usr/bin:/bin) that excludes /usr/local/bin, so
+# crontab entries calling plain `php` would fail without this symlink
+RUN ln -s /usr/local/bin/php /usr/bin/php
+
+ENTRYPOINT ["/bin/sh", "-c", "env > /etc/environment && crontab -u www-data - < \"$CRONTAB_PATH\" && exec cron -f"]
+CMD []
+
+FROM frankenphp-base AS frankenphp-base-dev
 
 USER root
 
@@ -177,6 +192,25 @@ USER www-data
 
 FROM frankenphp-base-dev AS frankenphp-dev
 
+LABEL prometheus_port="2020"
+
+HEALTHCHECK --interval=2s --timeout=2s --start-period=2s --retries=3 \
+  CMD curl --fail --silent http://localhost:8080/health-check || exit 1
+
+EXPOSE 2020
+
 FROM frankenphp-base-dev AS frankenphp-cli-dev
 ENTRYPOINT [ "frankenphp", "php-cli" ]
 CMD []
+
+FROM frankenphp-base-dev AS frankenphp-cron-dev
+
+USER root
+
+ENV CRONTAB_PATH=/var/www/config/crontab
+# cron runs jobs with a minimal PATH (/usr/bin:/bin) that excludes /usr/local/bin, so
+# crontab entries calling plain `php` would fail without this symlink
+RUN ln -s /usr/local/bin/php /usr/bin/php
+
+ENTRYPOINT ["/bin/sh", "-c", "env > /etc/environment && crontab -u www-data - < \"$CRONTAB_PATH\" && exec cron -f"]
+CMD []