diff --git a/.github/workflows/image-release.yml b/.github/workflows/image-release.yml
index 479b7eb..5ba0b79 100644
--- a/.github/workflows/image-release.yml
+++ b/.github/workflows/image-release.yml
@@ -23,6 +23,10 @@ on:
         required: false
         type: boolean
         default: false
+      context:
+        required: false
+        type: string
+        default: "."
       suffix:
         required: false
         type: string
@@ -77,7 +81,7 @@ jobs:
         uses: docker/build-push-action@v4
         with:
           platforms: ${{ inputs.platforms }}
-          context: .
+          context: ${{ inputs.context }}
           file: ${{ inputs.dockerfile }}
           build-args: |
             VOLTO_VERSION=${{ inputs.volto-version }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 257004c..330467b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -39,6 +39,7 @@ jobs:
     with:
       volto-version: ${{ needs.meta.outputs.VOLTO_VERSION }}
       image-name: ${{ needs.meta.outputs.BASE_IMAGE_NAME }}-builder
+      context: pnpm
       dockerfile: Dockerfile.builder
       platforms: ${{ needs.meta.outputs.PLATFORMS  }}
       is-latest: ${{ needs.meta.outputs.IS_LATEST == 'true'  }}
@@ -51,6 +52,7 @@ jobs:
     with:
       volto-version: ${{ needs.meta.outputs.VOLTO_VERSION }}
       image-name: ${{ needs.meta.outputs.BASE_IMAGE_NAME }}-prod-config
+      context: pnpm
       dockerfile: Dockerfile.prod
       platforms: ${{ needs.meta.outputs.PLATFORMS  }}
       is-latest: ${{ needs.meta.outputs.IS_LATEST == 'true'  }}
@@ -66,6 +68,7 @@ jobs:
     with:
       volto-version: ${{ needs.meta.outputs.VOLTO_VERSION }}
       image-name: ${{ needs.meta.outputs.BASE_IMAGE_NAME }}-dev
+      context: pnpm
       dockerfile: Dockerfile.dev
       platforms: ${{ needs.meta.outputs.PLATFORMS  }}
       is-latest: ${{ needs.meta.outputs.IS_LATEST == 'true'  }}
@@ -81,6 +84,7 @@ jobs:
     with:
       volto-version: ${{ needs.meta.outputs.VOLTO_VERSION }}
       image-name: plone/plone-frontend
+      context: pnpm
       dockerfile: Dockerfile
       platforms: ${{ needs.meta.outputs.PLATFORMS  }}
       is-latest: ${{ needs.meta.outputs.IS_LATEST == 'true'  }}
@@ -99,6 +103,7 @@ jobs:
     with:
       volto-version: ${{ needs.meta.outputs.VOLTO_VERSION }}
       image-name: ${{ needs.meta.outputs.BASE_IMAGE_NAME }}-builder
+      context: yarn
       dockerfile: Dockerfile.builder
       platforms: ${{ needs.meta.outputs.PLATFORMS  }}
       suffix: -yarn
@@ -111,6 +116,7 @@ jobs:
     with:
       volto-version: ${{ needs.meta.outputs.VOLTO_VERSION }}
       image-name: ${{ needs.meta.outputs.BASE_IMAGE_NAME }}-prod-config
+      context: yarn
       dockerfile: Dockerfile.prod
       platforms: ${{ needs.meta.outputs.PLATFORMS  }}
       suffix: -yarn
@@ -125,6 +131,7 @@ jobs:
     with:
       volto-version: ${{ needs.meta.outputs.VOLTO_VERSION }}
       image-name: ${{ needs.meta.outputs.BASE_IMAGE_NAME }}-dev
+      context: yarn
       dockerfile: Dockerfile.dev
       platforms: ${{ needs.meta.outputs.PLATFORMS  }}
       suffix: -yarn
@@ -140,6 +147,7 @@ jobs:
     with:
       volto-version: ${{ needs.meta.outputs.VOLTO_VERSION }}
       image-name: plone/plone-frontend
+      context: yarn
       dockerfile: Dockerfile
       platforms: ${{ needs.meta.outputs.PLATFORMS  }}
       suffix: -yarn