diff --git a/.github/workflows/image-release.yml b/.github/workflows/image-release.yml
index 7ebad66..01a053e 100644
--- a/.github/workflows/image-release.yml
+++ b/.github/workflows/image-release.yml
@@ -32,15 +32,18 @@ on:
 jobs:
 
   release:
-    runs-on: [self-hosted, ARM64, stable]
+    runs-on: ubuntu-latest
     environment: DOCKER_HUB
+    permissions:
+      contents: read
+      packages: write
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: |
             ${{ inputs.image-name }}
@@ -58,19 +61,20 @@ jobs:
             type=raw,value=${{ inputs.volto-version }}
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
-      - name: Login to Registry
+      - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         with:
-          username: ${{ secrets.registry-username }}
-          password: ${{ secrets.registry-password }}
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           platforms: ${{ inputs.platforms }}
           context: .
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 1bcd006..d6fb67a 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -9,9 +9,11 @@ on:
 jobs:
 
   release:
-    runs-on: [self-hosted, ARM64, stable]
+    runs-on: ubuntu-latest
     environment: DOCKER_HUB
-
+    permissions:
+      contents: read
+      packages: write
     steps:
 
       - name: Checkout
@@ -19,7 +21,7 @@ jobs:
 
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           # list of Docker images to use as base name for tags
           images: |
@@ -33,19 +35,20 @@ jobs:
             type=schedule,pattern=nightly-{{date 'YYYYMMDD'}}
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2.4.1
+        uses: docker/setup-buildx-action@v3.4.1
 
-      - name: Login to DockerHub
+      - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           platforms: linux/amd64,linux/arm64
           context: .
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4e02b3f..6ddb1af 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -2,12 +2,12 @@ name: Release new Docker image
 
 on:
   push:
-    tags:
-      - 'v*'
+    branches:
+      - newapproach
   workflow_dispatch:
 
 env:
-  BASE_IMAGE_NAME: plone/frontend
+  BASE_IMAGE_NAME: ghcr.io/kitconcept/frontend
   PLATFORMS: linux/amd64,linux/arm64
   IS_LATEST: false
 
@@ -81,7 +81,7 @@ jobs:
     uses: ./.github/workflows/image-release.yml
     with:
       volto-version: ${{ needs.meta.outputs.VOLTO_VERSION }}
-      image-name: plone/plone-frontend
+      image-name: ghcr.io/kitconcept/plone-frontend
       dockerfile: Dockerfile
       platforms: ${{ needs.meta.outputs.PLATFORMS  }}
       is-latest: ${{ needs.meta.outputs.IS_LATEST == 'true'  }}
diff --git a/.github/workflows/runnertest.yml b/.github/workflows/runnertest.yml
index 6f864a7..c00f873 100644
--- a/.github/workflows/runnertest.yml
+++ b/.github/workflows/runnertest.yml
@@ -16,7 +16,7 @@ jobs:
 
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           # list of Docker images to use as base name for tags
           images: |
@@ -29,10 +29,10 @@ jobs:
             type=raw,value=buildtest
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to DockerHub
         uses: docker/login-action@v3
@@ -41,7 +41,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           platforms: linux/amd64,linux/arm64
           context: .
diff --git a/Dockerfile b/Dockerfile
index 18f6988..3b479c0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,16 @@
 # syntax=docker/dockerfile:1
 ARG VOLTO_VERSION
-FROM plone/frontend-builder:${VOLTO_VERSION} as builder
+FROM ghcr.io/kitconcept/frontend-builder:${VOLTO_VERSION} as builder
 
 # Build Volto Project and then remove directories not needed for production
-RUN <<EOT
-    set -e 
-    yarn build
-    rm -rf cache omelette .yarn/cache
+COPY pnpm-workspace.yaml /app/
+RUN --mount=type=cache,id=pnpm,target=/app/.pnpm-store,uid=1000 <<EOT
+    pnpm build
+    rm -rf node_modules
+    pnpm install --prod
 EOT
 
-FROM plone/frontend-prod-config:${VOLTO_VERSION} as base
+FROM ghcr.io/kitconcept/frontend-prod-config:${VOLTO_VERSION} as base
 
 LABEL maintainer="Plone Community <dev@plone.org>" \
       org.label-schema.name="plone-frontend" \
diff --git a/Dockerfile.builder b/Dockerfile.builder
index 002c9a3..bbec331 100644
--- a/Dockerfile.builder
+++ b/Dockerfile.builder
@@ -1,6 +1,8 @@
 # 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" \
@@ -10,28 +12,24 @@ LABEL maintainer="Plone Community <dev@plone.org>" \
 RUN <<EOT
     set -e
     apt update
-    apt install -y --no-install-recommends python3 build-essential git ca-certificates
-    npm install --no-audit --no-fund -g yo @plone/generator-volto@alpha
-    mkdir /app
-    chown -R node:node /app
+    apt install -y --no-install-recommends python3 python3-pip build-essential git ca-certificates pipx
     rm -rf /var/lib/apt/lists/*
 EOT
 
-WORKDIR /app
-RUN corepack enable
+RUN <<EOT
+    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
-RUN <<EOT
+
+WORKDIR /app
+
+RUN --mount=type=cache,id=pnpm,target=/app/.pnpm-store,uid=1000 <<EOT
     set -e
-    yo @plone/volto \
-        app \
-        --description "Plone frontend using Volto" \
-        --skip-addons \
-        --skip-install \
-        --skip-workspaces \
-        --volto=${VOLTO_VERSION} \
-        --no-interactive
-    yarn install --network-timeout 1000000
+    git clone -b $VOLTO_VERSION --depth 1 https://github.com/plone/volto core
+    pnpm install
 EOT
-
-COPY --chown=node:node scripts/helper.py /setupAddon
diff --git a/Dockerfile.dev b/Dockerfile.dev
index a07ecef..e032725 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG VOLTO_VERSION
-FROM plone/frontend-builder:${VOLTO_VERSION}
+FROM ghcr.io/kitconcept/frontend-builder:${VOLTO_VERSION}
 
 LABEL maintainer="Plone Community <dev@plone.org>" \
       org.label-schema.name="frontend-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/Dockerfile.nightly b/Dockerfile.nightly
index e661bb6..109d6f3 100644
--- a/Dockerfile.nightly
+++ b/Dockerfile.nightly
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM node:18-slim as base
+FROM node:20-slim as base
 FROM base as builder
 
 
@@ -27,7 +27,7 @@ RUN <<EOT
     rm -rf cache omelette .yarn/cache
 EOT
 
-FROM plone/frontend-prod-config:latest
+FROM ghcr.io/kitconcept/frontend-prod-config:latest
 
 LABEL maintainer="Plone Community <dev@plone.org>" \
       org.label-schema.name="plone-frontend" \
diff --git a/Dockerfile.prod b/Dockerfile.prod
index f56aced..d35fe19 100644
--- a/Dockerfile.prod
+++ b/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" \
@@ -9,7 +9,7 @@ LABEL maintainer="Plone Community <dev@plone.org>" \
 
 # Install busybox and wget
 RUN <<EOT
-    set -e 
+    set -e
     apt update
     apt install -y --no-install-recommends busybox wget git
     busybox --install -s
@@ -18,11 +18,14 @@ RUN <<EOT
     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
@@ -30,8 +33,8 @@ 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 yarn
-ENTRYPOINT [ "yarn" ]
+# Entrypoint would be pnpm
+ENTRYPOINT [ "pnpm" ]
 
 # And the image will run in production mode
 CMD ["start:prod"]
diff --git a/Makefile b/Makefile
index 9c1804b..9ecb10d 100644
--- a/Makefile
+++ b/Makefile
@@ -18,8 +18,8 @@ RESET=`tput sgr0`
 YELLOW=`tput setaf 3`
 
 # Current version
-MAIN_IMAGE_NAME=plone/plone-frontend
-BASE_IMAGE_NAME=plone/frontend
+MAIN_IMAGE_NAME=ghcr.io/kitconcept/plone-frontend
+BASE_IMAGE_NAME=ghcr.io/kitconcept/frontend
 VOLTO_VERSION=$$(cat version.txt)
 IMAGE_TAG=${VOLTO_VERSION}
 NIGHTLY_IMAGE_TAG=nightly
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
new file mode 100644
index 0000000..d4c8715
--- /dev/null
+++ b/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/version.txt b/version.txt
index 63b7798..d3d34f4 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-18.0.0-alpha.27
+18.0.0-alpha.42
diff --git a/volto.config.js b/volto.config.js
new file mode 100644
index 0000000..91ad254
--- /dev/null
+++ b/volto.config.js
@@ -0,0 +1,7 @@
+const addons = [];
+const theme = "";
+
+module.exports = {
+  addons,
+  theme,
+};