diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 94ae333..c15dcf9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,31 +1,33 @@
 name: "Build on main"
 on:
-  push:
-    branches: [ main ]
   workflow_dispatch:
+  push:
+    branches:
+      - main
+
 jobs:
   scheduler:
     name: Build Trigger
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version: [ 'buster', 'bullseye' ]
+        version: [ 'bullseye', 'bookworm' ]
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
       - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v6
         with:
           push: true
           platforms: linux/amd64,linux/arm64
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
new file mode 100644
index 0000000..5cdb309
--- /dev/null
+++ b/.github/workflows/pull_request.yml
@@ -0,0 +1,18 @@
+name: "Pull Request"
+on:
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  lint:
+    strategy:
+      matrix:
+        version: [ 'bullseye', 'bookworm' ]
+    runs-on: ubuntu-latest
+    container: pipelinecomponents/hadolint:latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: hadolint/hadolint-action@v3.1.0
+        with:
+          dockerfile: ./src/${{ matrix.version }}/src/Dockerfile
diff --git a/.github/workflows/schedule.yml b/.github/workflows/schedule.yml
index d12ebf1..814e610 100644
--- a/.github/workflows/schedule.yml
+++ b/.github/workflows/schedule.yml
@@ -2,7 +2,7 @@ name: "Build Scheduler"
 on:
   workflow_dispatch:
   schedule:
-  - cron:  '35 1 * * 0'
+  - cron:  '30 3 * * 1'
 
 jobs:
   scheduler:
@@ -10,23 +10,23 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version: [ 'buster', 'bullseye' ]
+        version: [ 'bullseye', 'bookworm' ]
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
       - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v6
         with:
           push: true
           platforms: linux/amd64,linux/arm64
diff --git a/README.md b/README.md
index 8d90cc5..a2eb1aa 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # PHP Base Image (WIP)
 
-This Repo contains the build instructions for the PHP base image (Stretch and Buster). All PHP images should inherit from this image.
+This Repo contains the build instructions for the PHP base image (bullseye and bookworm). All PHP images should inherit from this image.
 
 ## Documentation
 
diff --git a/src/buster/src/Dockerfile b/src/bookworm/src/Dockerfile
similarity index 92%
rename from src/buster/src/Dockerfile
rename to src/bookworm/src/Dockerfile
index 5b884e1..8115224 100644
--- a/src/buster/src/Dockerfile
+++ b/src/bookworm/src/Dockerfile
@@ -1,11 +1,10 @@
-FROM openmage/debian:buster-latest
+FROM openmage/debian:bookworm-latest
 
 COPY root /
 
 ## configure default environment stuff and file permissions
 RUN set -xe; \
-    chmod 755 /usr/local/bin/{docker-php-source-prepare,docker-entrypoint,docker-fpm-healthcheck,docker-php-ext-configure,docker-php-ext-enable,docker-php-ext-disable,docker-php-ext-install,docker-php-pecl-install,docker-php-source,phpgosu}; \
-    rm -rf /etc/apt/preferences.d/debian_main_cmake; \
+    chmod 755 /usr/local/bin/{docker-php-source-prepare,docker-entrypoint,docker-fpm-healthcheck,docker-php-ext-configure,docker-php-ext-enable,docker-php-ext-disable,docker-php-ext-disable,docker-php-ext-install,docker-php-pecl-install,docker-php-source,phpgosu}; \
     mkdir /home/www-data; \
     chmod 711 /home/www-data; \
     chown www-data:www-data /home/www-data; \
@@ -35,19 +34,19 @@ ARG IMAGICK_BUILD_REQUIREMENTS_EXTRA=""
 ARG IMAGICK_EXTRA_CONFIGURE_ARGS=""
 
 ARG MOZJPEG_EXTRA_CONFIGURE_ARGS=""
-ARG MOZJPEG_VERSION="4.0.3"
+ARG MOZJPEG_VERSION="4.1.1"
 
+ARG TIFF_VERSION="4.6.0"
 ARG TIFF_EXTRA_CONFIGURE_ARGS=""
-ARG TIFF_VERSION="4.3.0"
 
-ARG WEBP_VERSION="1.2.2"
+ARG WEBP_VERSION="1.4.0"
 ARG WEBP_EXTRA_CONFIGURE_ARGS=""
 
-ARG OPENJPEG_VERSION="2.4.0"
-
-ARG IMAGICK_VERSION="7.1.0-25"
+ARG IMAGICK_VERSION="7.1.1-36"
 ARG IMAGICK_EXTRA_CONFIGURE_ARGS=""
 
+ARG OPENJPEG_VERSION="2.5.2"
+
 ## configure imagick and the dependencies
 RUN set -xe; \
     \
diff --git a/src/buster/src/root/etc/apt/preferences.d/debian_main_cmake b/src/bookworm/src/root/etc/apt/preferences.d/debian_main_cmake
similarity index 100%
rename from src/buster/src/root/etc/apt/preferences.d/debian_main_cmake
rename to src/bookworm/src/root/etc/apt/preferences.d/debian_main_cmake
diff --git a/src/buster/src/root/etc/php-src b/src/bookworm/src/root/etc/php-src
similarity index 100%
rename from src/buster/src/root/etc/php-src
rename to src/bookworm/src/root/etc/php-src
diff --git a/src/buster/src/root/usr/local/bin/docker-entrypoint b/src/bookworm/src/root/usr/local/bin/docker-entrypoint
similarity index 100%
rename from src/buster/src/root/usr/local/bin/docker-entrypoint
rename to src/bookworm/src/root/usr/local/bin/docker-entrypoint
diff --git a/src/buster/src/root/usr/local/bin/docker-fpm-healthcheck b/src/bookworm/src/root/usr/local/bin/docker-fpm-healthcheck
similarity index 100%
rename from src/buster/src/root/usr/local/bin/docker-fpm-healthcheck
rename to src/bookworm/src/root/usr/local/bin/docker-fpm-healthcheck
diff --git a/src/buster/src/root/usr/local/bin/docker-php-ext-configure b/src/bookworm/src/root/usr/local/bin/docker-php-ext-configure
similarity index 100%
rename from src/buster/src/root/usr/local/bin/docker-php-ext-configure
rename to src/bookworm/src/root/usr/local/bin/docker-php-ext-configure
diff --git a/src/buster/src/root/usr/local/bin/docker-php-ext-disable b/src/bookworm/src/root/usr/local/bin/docker-php-ext-disable
similarity index 100%
rename from src/buster/src/root/usr/local/bin/docker-php-ext-disable
rename to src/bookworm/src/root/usr/local/bin/docker-php-ext-disable
diff --git a/src/buster/src/root/usr/local/bin/docker-php-ext-enable b/src/bookworm/src/root/usr/local/bin/docker-php-ext-enable
similarity index 100%
rename from src/buster/src/root/usr/local/bin/docker-php-ext-enable
rename to src/bookworm/src/root/usr/local/bin/docker-php-ext-enable
diff --git a/src/buster/src/root/usr/local/bin/docker-php-ext-install b/src/bookworm/src/root/usr/local/bin/docker-php-ext-install
similarity index 100%
rename from src/buster/src/root/usr/local/bin/docker-php-ext-install
rename to src/bookworm/src/root/usr/local/bin/docker-php-ext-install
diff --git a/src/buster/src/root/usr/local/bin/docker-php-pecl-install b/src/bookworm/src/root/usr/local/bin/docker-php-pecl-install
similarity index 100%
rename from src/buster/src/root/usr/local/bin/docker-php-pecl-install
rename to src/bookworm/src/root/usr/local/bin/docker-php-pecl-install
diff --git a/src/buster/src/root/usr/local/bin/docker-php-source b/src/bookworm/src/root/usr/local/bin/docker-php-source
similarity index 100%
rename from src/buster/src/root/usr/local/bin/docker-php-source
rename to src/bookworm/src/root/usr/local/bin/docker-php-source
diff --git a/src/buster/src/root/usr/local/bin/docker-php-source-prepare b/src/bookworm/src/root/usr/local/bin/docker-php-source-prepare
similarity index 100%
rename from src/buster/src/root/usr/local/bin/docker-php-source-prepare
rename to src/bookworm/src/root/usr/local/bin/docker-php-source-prepare
diff --git a/src/buster/src/root/usr/local/bin/phpgosu b/src/bookworm/src/root/usr/local/bin/phpgosu
similarity index 100%
rename from src/buster/src/root/usr/local/bin/phpgosu
rename to src/bookworm/src/root/usr/local/bin/phpgosu
diff --git a/src/buster/src/root/usr/local/etc/php-src b/src/bookworm/src/root/usr/local/etc/php-src
similarity index 100%
rename from src/buster/src/root/usr/local/etc/php-src
rename to src/bookworm/src/root/usr/local/etc/php-src
diff --git a/src/bullseye/src/Dockerfile b/src/bullseye/src/Dockerfile
index 138ab92..b89cd45 100644
--- a/src/bullseye/src/Dockerfile
+++ b/src/bullseye/src/Dockerfile
@@ -33,20 +33,20 @@ ARG IMAGICK_BUILD_REQUIREMENTS="curl cmake gcc libtool libedit-dev liblcms2-dev
 ARG IMAGICK_BUILD_REQUIREMENTS_EXTRA=""
 ARG IMAGICK_EXTRA_CONFIGURE_ARGS=""
 
+ARG MOZJPEG_VERSION="4.1.1"
 ARG MOZJPEG_EXTRA_CONFIGURE_ARGS=""
-ARG MOZJPEG_VERSION="4.0.3"
 
+ARG TIFF_VERSION="4.6.0"
 ARG TIFF_EXTRA_CONFIGURE_ARGS=""
-ARG TIFF_VERSION="4.3.0"
 
-ARG WEBP_VERSION="1.2.2"
+ARG WEBP_VERSION="1.4.0"
 ARG WEBP_EXTRA_CONFIGURE_ARGS=""
 
-ARG OPENJPEG_VERSION="2.4.0"
-
-ARG IMAGICK_VERSION="7.1.0-25"
+ARG IMAGICK_VERSION="7.1.1-36"
 ARG IMAGICK_EXTRA_CONFIGURE_ARGS=""
 
+ARG OPENJPEG_VERSION="2.5.2"
+
 ## configure imagick and the dependencies
 RUN set -xe; \
     \