diff --git a/.github/workflows/build-docker-images.yaml b/.github/workflows/build-docker-images.yaml
index 9148d79..96ae011 100644
--- a/.github/workflows/build-docker-images.yaml
+++ b/.github/workflows/build-docker-images.yaml
@@ -291,6 +291,10 @@ jobs:
             php-version: "8.3"
             flavour: alpine
             template: https://github.com/shopware/shopware
+          - shopware-version: trunk
+            php-version: "8.3"
+            flavour: alpine
+            template: https://github.com/shopware/shopware
           - shopware-version: v6.4.0.0
             php-version: "7.4"
             flavour: debian
@@ -467,6 +471,10 @@ jobs:
             php-version: "8.3"
             flavour: debian
             template: https://github.com/shopware/shopware
+          - shopware-version: trunk
+            php-version: "8.3"
+            flavour: debian
+            template: https://github.com/shopware/shopware
 
     steps:
       - name: Clone
diff --git a/alpine/Dockerfile b/alpine/Dockerfile
index 412d669..cfceb49 100644
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -27,9 +27,16 @@ RUN \
         if [ -f composer.lock ]; then \
             composer install --no-interaction -o; \
         else \
+            if echo "${SHOPWARE_VERSION}" | grep -q '^trunk'; then \
+              jq '.conflict["symfony/type-info"] = "<7.1.8"' composer.json > composer.tmp.json && mv composer.tmp.json composer.json; \
+            fi && \
             composer update --prefer-lowest --prefer-stable --no-interaction -o; \
         fi && \
-        APP_URL="http://localhost" php bin/console system:setup --database-url=mysql://root:root@localhost:3306/shopware --generate-jwt-keys -nq && \
+        if echo "${SHOPWARE_VERSION}" | grep -q '^trunk'; then \
+            APP_URL="http://localhost" php bin/console system:setup --database-url=mysql://root:root@localhost:3306/shopware -nq; \
+        else \
+            APP_URL="http://localhost" php bin/console system:setup --database-url=mysql://root:root@localhost:3306/shopware --generate-jwt-keys -nq; \
+        fi && \
         php bin/console system:install -fnq --create-database && \
         composer clearcache && \
         rm -Rf .git && \
diff --git a/debian/Dockerfile b/debian/Dockerfile
index c888521..d33d024 100644
--- a/debian/Dockerfile
+++ b/debian/Dockerfile
@@ -37,9 +37,16 @@ RUN \
         if [ -f composer.lock ]; then \
             composer install --no-interaction -o; \
         else \
+            if echo "${SHOPWARE_VERSION}" | grep -q '^trunk'; then \
+              jq '.conflict["symfony/type-info"] = "<7.1.8"' composer.json > composer.tmp.json && mv composer.tmp.json composer.json; \
+            fi && \
             composer update --prefer-lowest --prefer-stable --no-interaction -o; \
         fi && \
-        APP_URL="http://localhost" php bin/console system:setup --database-url=mysql://root:root@localhost:3306/shopware --generate-jwt-keys -nq && \
+        if echo "${SHOPWARE_VERSION}" | grep -q '^trunk'; then \
+            APP_URL="http://localhost" php bin/console system:setup --database-url=mysql://root:root@localhost:3306/shopware -nq; \
+        else \
+            APP_URL="http://localhost" php bin/console system:setup --database-url=mysql://root:root@localhost:3306/shopware --generate-jwt-keys -nq; \
+        fi && \
         php bin/console system:install -fnq --create-database && \
         composer clearcache && \
         rm -Rf .git && \