diff --git a/.github/workflows/image-release.yml b/.github/workflows/image-release.yml
index 7ebad66..479b7eb 100644
--- a/.github/workflows/image-release.yml
+++ b/.github/workflows/image-release.yml
@@ -23,6 +23,10 @@ on:
         required: false
         type: boolean
         default: false
+      suffix:
+        required: false
+        type: string
+        default: ""
     secrets:
       registry-username:
         required: true
@@ -30,7 +34,6 @@ on:
         required: true
 
 jobs:
-
   release:
     runs-on: [self-hosted, ARM64, stable]
     environment: DOCKER_HUB
@@ -46,6 +49,7 @@ jobs:
             ${{ inputs.image-name }}
           flavor: |
             latest=false
+            suffix=${{ inputs.suffix }}
           tags: |
             type=ref,event=branch
             type=ref,event=pr
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
deleted file mode 100644
index 1bcd006..0000000
--- a/.github/workflows/nightly.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-name: Generate Nightly Image
-
-on:
-  workflow_dispatch:
-
-#  schedule:
-#    - cron:  '15 22 * * *'
-
-jobs:
-
-  release:
-    runs-on: [self-hosted, ARM64, stable]
-    environment: DOCKER_HUB
-
-    steps:
-
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          # list of Docker images to use as base name for tags
-          images: |
-            plone/plone-frontend
-          # update label with proper version number
-          labels: |
-            org.label-schema.docker.cmd=docker run -d -p 3000:3000 plone/plone-frontend:nightly
-          # generate Docker tags based on the following events/attributes
-          tags: |
-            type=raw,value=nightly
-            type=schedule,pattern=nightly-{{date 'YYYYMMDD'}}
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2.4.1
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v4
-        with:
-          platforms: linux/amd64,linux/arm64
-          context: .
-          file: Dockerfile.nightly
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4e02b3f..257004c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -3,7 +3,7 @@ name: Release new Docker image
 on:
   push:
     tags:
-      - 'v*'
+      - "v*"
   workflow_dispatch:
 
 env:
@@ -12,7 +12,6 @@ env:
   IS_LATEST: false
 
 jobs:
-
   meta:
     runs-on: ubuntu-latest
     outputs:
@@ -33,7 +32,7 @@ jobs:
           echo "IS_LATEST=$IS_LATEST" >> $GITHUB_OUTPUT
           echo "VOLTO_VERSION=$(cat version.txt)" >> $GITHUB_OUTPUT
 
-  builder-image:
+  pnpm-builder-image:
     needs:
       - meta
     uses: ./.github/workflows/image-release.yml
@@ -47,7 +46,7 @@ jobs:
       registry-username: ${{ secrets.DOCKERHUB_USERNAME }}
       registry-password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-  prod-conf-image:
+  pnpm-prod-conf-image:
     uses: ./.github/workflows/image-release.yml
     with:
       volto-version: ${{ needs.meta.outputs.VOLTO_VERSION }}
@@ -62,7 +61,7 @@ jobs:
     needs:
       - meta
 
-  dev-image:
+  pnpm-dev-image:
     uses: ./.github/workflows/image-release.yml
     with:
       volto-version: ${{ needs.meta.outputs.VOLTO_VERSION }}
@@ -75,9 +74,9 @@ jobs:
       registry-password: ${{ secrets.DOCKERHUB_TOKEN }}
     needs:
       - meta
-      - builder-image
+      - pnpm-builder-image
 
-  plone-frontend:
+  pnpm-plone-frontend:
     uses: ./.github/workflows/image-release.yml
     with:
       volto-version: ${{ needs.meta.outputs.VOLTO_VERSION }}
@@ -90,5 +89,64 @@ jobs:
       registry-password: ${{ secrets.DOCKERHUB_TOKEN }}
     needs:
       - meta
-      - builder-image
-      - prod-conf-image
+      - pnpm-builder-image
+      - pnpm-prod-conf-image
+
+  yarn-builder-image:
+    needs:
+      - meta
+    uses: ./.github/workflows/image-release.yml
+    with:
+      volto-version: ${{ needs.meta.outputs.VOLTO_VERSION }}
+      image-name: ${{ needs.meta.outputs.BASE_IMAGE_NAME }}-builder
+      dockerfile: Dockerfile.builder
+      platforms: ${{ needs.meta.outputs.PLATFORMS  }}
+      suffix: -yarn
+    secrets:
+      registry-username: ${{ secrets.DOCKERHUB_USERNAME }}
+      registry-password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+  yarn-prod-conf-image:
+    uses: ./.github/workflows/image-release.yml
+    with:
+      volto-version: ${{ needs.meta.outputs.VOLTO_VERSION }}
+      image-name: ${{ needs.meta.outputs.BASE_IMAGE_NAME }}-prod-config
+      dockerfile: Dockerfile.prod
+      platforms: ${{ needs.meta.outputs.PLATFORMS  }}
+      suffix: -yarn
+    secrets:
+      registry-username: ${{ secrets.DOCKERHUB_USERNAME }}
+      registry-password: ${{ secrets.DOCKERHUB_TOKEN }}
+    needs:
+      - meta
+
+  yarn-dev-image:
+    uses: ./.github/workflows/image-release.yml
+    with:
+      volto-version: ${{ needs.meta.outputs.VOLTO_VERSION }}
+      image-name: ${{ needs.meta.outputs.BASE_IMAGE_NAME }}-dev
+      dockerfile: Dockerfile.dev
+      platforms: ${{ needs.meta.outputs.PLATFORMS  }}
+      suffix: -yarn
+    secrets:
+      registry-username: ${{ secrets.DOCKERHUB_USERNAME }}
+      registry-password: ${{ secrets.DOCKERHUB_TOKEN }}
+    needs:
+      - meta
+      - yarn-builder-image
+
+  yarn-plone-frontend:
+    uses: ./.github/workflows/image-release.yml
+    with:
+      volto-version: ${{ needs.meta.outputs.VOLTO_VERSION }}
+      image-name: plone/plone-frontend
+      dockerfile: Dockerfile
+      platforms: ${{ needs.meta.outputs.PLATFORMS  }}
+      suffix: -yarn
+    secrets:
+      registry-username: ${{ secrets.DOCKERHUB_USERNAME }}
+      registry-password: ${{ secrets.DOCKERHUB_TOKEN }}
+    needs:
+      - meta
+      - yarn-builder-image
+      - yarn-prod-conf-image
diff --git a/.github/workflows/runnertest.yml b/.github/workflows/runnertest.yml
index 6f864a7..ea6b036 100644
--- a/.github/workflows/runnertest.yml
+++ b/.github/workflows/runnertest.yml
@@ -4,13 +4,11 @@ on:
   workflow_dispatch:
 
 jobs:
-
   release:
     runs-on: [self-hosted, ARM64, Linux, unstable]
     environment: DOCKER_HUB
 
     steps:
-
       - name: Checkout
         uses: actions/checkout@v4
 
@@ -45,7 +43,7 @@ jobs:
         with:
           platforms: linux/amd64,linux/arm64
           context: .
-          file: Dockerfile.nightly
+          file: Dockerfile.builder
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/Dockerfile.nightly b/Dockerfile.nightly
deleted file mode 100644
index e661bb6..0000000
--- a/Dockerfile.nightly
+++ /dev/null
@@ -1,38 +0,0 @@
-# syntax=docker/dockerfile:1
-FROM node:18-slim as base
-FROM base as builder
-
-
-RUN <<EOT
-    set -e
-    apt-get update
-    buildDeps="curl python3 build-essential unzip"
-    apt-get install -y --no-install-recommends $buildDeps git
-    rm -rf /var/lib/apt/lists/*
-    mkdir build && chown -R node:node build
-EOT
-
-USER node
-WORKDIR /build
-
-# Generate new volto app
-RUN <<EOT
-    set -e
-    curl -k -L -o workspace.zip https://github.com/plone/volto/archive/refs/heads/main.zip
-    unzip workspace.zip
-    mv volto-main plone-frontend
-    cd plone-frontend
-    yarn install --network-timeout 1000000
-    yarn build
-    rm -rf cache omelette .yarn/cache
-EOT
-
-FROM plone/frontend-prod-config:latest
-
-LABEL maintainer="Plone Community <dev@plone.org>" \
-      org.label-schema.name="plone-frontend" \
-      org.label-schema.description="Plone frontend nightly image" \
-      org.label-schema.vendor="Plone Foundation"
-
-
-COPY --from=builder --chown=node:node /build/plone-frontend/ /app/
diff --git a/pnpm/Dockerfile b/pnpm/Dockerfile
new file mode 100644
index 0000000..907a826
--- /dev/null
+++ b/pnpm/Dockerfile
@@ -0,0 +1,22 @@
+# syntax=docker/dockerfile:1
+ARG VOLTO_VERSION
+FROM plone/frontend-builder:${VOLTO_VERSION} as builder
+
+# Build Volto Project and then remove directories not needed for production
+COPY pnpm-workspace.yaml /app/
+RUN --mount=type=cache,id=pnpm,target=/app/.pnpm-store/uid=1000 <<EOT
+    set -e
+    pnpm build
+    rm -rf node_modules
+    pnpm install --prod
+EOT
+
+FROM plone/frontend-prod-config:${VOLTO_VERSION} as base
+
+LABEL maintainer="Plone Community <dev@plone.org>" \
+      org.label-schema.name="plone-frontend" \
+      org.label-schema.description="Plone frontend image" \
+      org.label-schema.vendor="Plone Foundation"
+
+# Copy Volto project
+COPY --from=builder /app/ /app/
diff --git a/pnpm/Dockerfile.builder b/pnpm/Dockerfile.builder
new file mode 100644
index 0000000..abf1a0c
--- /dev/null
+++ b/pnpm/Dockerfile.builder
@@ -0,0 +1,36 @@
+# syntax=docker/dockerfile:1
+FROM node:20-slim
+ARG VOLTO_VERSION
+ENV PNPM_HOME="/pnpm"
+ENV PATH="$PNPM_HOME:$PATH"
+
+LABEL maintainer="Plone Community <dev@plone.org>" \
+      org.label-schema.name="frontend-base" \
+      org.label-schema.description="Plone frontend builder image" \
+      org.label-schema.vendor="Plone Foundation"
+
+RUN <<EOT
+    set -e
+    apt update
+    apt install -y --no-install-recommends python3 python3-pip build-essential git ca-certificates pipx
+    rm -rf /var/lib/apt/lists/*
+EOT
+
+RUN <<EOT
+    set -e
+    pipx run --no-cache cookieplone sub/frontend_project --no_input __version_plone_volto=$VOLTO_VERSION
+    chown -R node:node /app
+EOT
+
+COPY --chown=node:node volto.config.js /app/
+
+RUN corepack enable
+USER node 
+
+WORKDIR /app
+
+RUN --mount=type=cache,id=pnpm,target=/app/.pnpm-store,uid=1000 <<EOT
+    set -e
+    git clone -b $VOLTO_VERSION --depth 1 https://github.com/plone/volto core
+    pnpm install
+EOT
diff --git a/Dockerfile.dev b/pnpm/Dockerfile.dev
similarity index 95%
rename from Dockerfile.dev
rename to pnpm/Dockerfile.dev
index a07ecef..79dbc7d 100644
--- a/Dockerfile.dev
+++ b/pnpm/Dockerfile.dev
@@ -13,7 +13,7 @@ WORKDIR /app
 EXPOSE 3000 3001 6006
 
 # Entrypoint would be yarn
-ENTRYPOINT [ "yarn" ]
+ENTRYPOINT [ "pnpm" ]
 
 # Run the project in development mode
 CMD ["start"]
diff --git a/pnpm/Dockerfile.prod b/pnpm/Dockerfile.prod
new file mode 100644
index 0000000..d35fe19
--- /dev/null
+++ b/pnpm/Dockerfile.prod
@@ -0,0 +1,40 @@
+# syntax=docker/dockerfile:1
+FROM node:20-slim
+
+LABEL maintainer="Plone Community <dev@plone.org>" \
+      org.label-schema.name="frontend-prod-config" \
+      org.label-schema.description="Slim image for Plone frontend deployments" \
+      org.label-schema.vendor="Plone Foundation"
+
+
+# Install busybox and wget
+RUN <<EOT
+    set -e
+    apt update
+    apt install -y --no-install-recommends busybox wget git
+    busybox --install -s
+    rm -rf /var/lib/apt/lists/*
+    mkdir /app
+    chown -R node:node /app
+EOT
+
+RUN corepack enable
+
+# Run the image with user node
+USER node
+
+# Set working directory to /app
+WORKDIR /app
+RUN corepack use pnpm@9
+
+# Expose default Express port
+EXPOSE 3000
+
+# Set healthcheck to port 3000
+HEALTHCHECK --interval=10s --timeout=5s --start-period=30s CMD [ -n "$LISTEN_PORT" ] || LISTEN_PORT=3000 ; wget -q http://127.0.0.1:"$LISTEN_PORT" -O - || exit 1
+
+# Entrypoint would be pnpm
+ENTRYPOINT [ "pnpm" ]
+
+# And the image will run in production mode
+CMD ["start:prod"]
diff --git a/pnpm/pnpm-workspace.yaml b/pnpm/pnpm-workspace.yaml
new file mode 100644
index 0000000..8c2f3d0
--- /dev/null
+++ b/pnpm/pnpm-workspace.yaml
@@ -0,0 +1,10 @@
+packages:
+  # all packages in direct subdirs of packages/
+  - "core/packages/volto"
+  - "core/packages/types"
+  - "core/packages/registry"
+  - "core/packages/scripts"
+  - "core/packages/tsconfig"
+  - "core/packages/volto-slate"
+  - "core/packages/coresandbox"
+  - "packages/*"
diff --git a/pnpm/volto.config.js b/pnpm/volto.config.js
new file mode 100644
index 0000000..91ad254
--- /dev/null
+++ b/pnpm/volto.config.js
@@ -0,0 +1,7 @@
+const addons = [];
+const theme = "";
+
+module.exports = {
+  addons,
+  theme,
+};
diff --git a/Dockerfile b/yarn/Dockerfile
similarity index 79%
rename from Dockerfile
rename to yarn/Dockerfile
index 18f6988..37343c7 100644
--- a/Dockerfile
+++ b/yarn/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG VOLTO_VERSION
-FROM plone/frontend-builder:${VOLTO_VERSION} as builder
+FROM plone/frontend-builder:${VOLTO_VERSION}-yarn as builder
 
 # Build Volto Project and then remove directories not needed for production
 RUN <<EOT
@@ -9,7 +9,7 @@ RUN <<EOT
     rm -rf cache omelette .yarn/cache
 EOT
 
-FROM plone/frontend-prod-config:${VOLTO_VERSION} as base
+FROM plone/frontend-prod-config:${VOLTO_VERSION}-yarn as base
 
 LABEL maintainer="Plone Community <dev@plone.org>" \
       org.label-schema.name="plone-frontend" \
diff --git a/Dockerfile.builder b/yarn/Dockerfile.builder
similarity index 100%
rename from Dockerfile.builder
rename to yarn/Dockerfile.builder
diff --git a/yarn/Dockerfile.dev b/yarn/Dockerfile.dev
new file mode 100644
index 0000000..6c2e8f8
--- /dev/null
+++ b/yarn/Dockerfile.dev
@@ -0,0 +1,19 @@
+# syntax=docker/dockerfile:1
+ARG VOLTO_VERSION
+FROM plone/frontend-builder:${VOLTO_VERSION}-yarn
+
+LABEL maintainer="Plone Community <dev@plone.org>" \
+      org.label-schema.name="frontend-dev" \
+      org.label-schema.description="Plone frontend image for development" \
+      org.label-schema.vendor="Plone Foundation"
+
+WORKDIR /app
+
+# Expose ports 3000 and 3001 (used by Express in development mode) and port 6006 (Storybook)
+EXPOSE 3000 3001 6006
+
+# Entrypoint would be yarn
+ENTRYPOINT [ "yarn" ]
+
+# Run the project in development mode
+CMD ["start"]
diff --git a/Dockerfile.prod b/yarn/Dockerfile.prod
similarity index 98%
rename from Dockerfile.prod
rename to yarn/Dockerfile.prod
index f56aced..730d8af 100644
--- a/Dockerfile.prod
+++ b/yarn/Dockerfile.prod
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM node:18-slim
+FROM node:20-slim
 
 LABEL maintainer="Plone Community <dev@plone.org>" \
       org.label-schema.name="frontend-prod-config" \
diff --git a/scripts/helper.py b/yarn/scripts/helper.py
similarity index 100%
rename from scripts/helper.py
rename to yarn/scripts/helper.py