diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cf96d8a..ad0fabe 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,6 +8,10 @@ on:
   schedule:
     - cron: '10 4 * * *'
 
+concurrency:
+  group: "${{ github.ref }}"
+  cancel-in-progress: true
+
 env:
   DOCKER_BUILDKIT: 1
   COSIGN_EXPERIMENTAL: 1
@@ -167,7 +171,6 @@ jobs:
     name: Test Image
     runs-on: ubuntu-latest
     needs: [caddy]
-    if: github.ref != 'refs/heads/main'
     steps:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -177,7 +180,14 @@ jobs:
         with:
           repository: shopwareLabs/example-docker-repository
 
-      - name: Build
+      - name: Build main branch
+        if: github.ref == 'refs/heads/main'
+        run: docker compose build --build-arg BASE_IMAGE=ghcr.io/shopware/docker-base:8.3-caddy
+        env:
+          DOCKER_BUILDKIT: 0
+
+      - name: Build PR
+        if: github.ref != 'refs/heads/main'
         run: docker compose build --build-arg BASE_IMAGE=ghcr.io/shopware/docker-base-ci-test:${{ github.run_id }}-8.3-caddy
         env:
           DOCKER_BUILDKIT: 0
diff --git a/fpm/Dockerfile b/fpm/Dockerfile
index 4d44ba9..17048c0 100644
--- a/fpm/Dockerfile
+++ b/fpm/Dockerfile
@@ -10,7 +10,7 @@ ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/do
 RUN apk add --no-cache icu-data-full curl jq trurl && \
     apk upgrade --no-cache && \
     chmod +x /usr/local/bin/install-php-extensions && \
-    install-php-extensions bcmath gd intl mysqli pdo_mysql pcntl sockets bz2 gmp soap zip ffi redis-6.0.2 opcache apcu amqp zstd && \
+    install-php-extensions bcmath gd intl mysqli pdo_mysql pcntl sockets bz2 gmp soap zip ffi opcache redis-6.0.2 apcu-5.1.24 amqp-2.1.2 zstd-0.13.3  && \
     mkdir -p /var/www/html && \
     mv "${PHP_INI_DIR}/php.ini-production" "${PHP_INI_DIR}/php.ini" && \
     rm -f /usr/local/etc/php-fpm.d/zz-docker.conf && \