diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index 14e115c..b6f48e8 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -1,15 +1,13 @@
 # syntax=docker/dockerfile:1
 ARG VOLTO_VERSION
-# TODO: Replace with
-# FROM plone/frontend-builder:${VOLTO_VERSION}
-# when the main image is ready
-FROM ghcr.io/kitconcept/frontend-builder:${VOLTO_VERSION} AS builder
+FROM plone//frontend-builder:${VOLTO_VERSION} AS builder
 
 COPY --chown=node packages/volto-ploneconf /app/packages/volto-ploneconf
 COPY --chown=node volto.config.js /app/
 COPY --chown=node package.json /app/package.json.temp
 
 RUN --mount=type=cache,id=pnpm,target=/app/.pnpm-store,uid=1000 <<EOT
+     set -e
      python3 -c "import json; data = json.load(open('package.json.temp')); deps = data['dependencies']; data['dependencies'].update(deps); json.dump(data, open('package.json', 'w'), indent=2)"
      rm package.json.temp
      pnpm install && pnpm build:deps
@@ -17,10 +15,7 @@ RUN --mount=type=cache,id=pnpm,target=/app/.pnpm-store,uid=1000 <<EOT
      pnpm install --prod
 EOT
 
-# TODO: Replace with
-# FROM plone/frontend-prod-config:${VOLTO_VERSION}
-# when the main image is ready
-FROM ghcr.io/kitconcept/frontend-prod-config:${VOLTO_VERSION}
+FROM plone/frontend-prod-config:${VOLTO_VERSION}
 
 LABEL maintainer="Plone Foundation <collective@plone.org>" \
       org.label-schema.name="ghcr.io/plone/ploneconf-2024-frontend" \