diff --git a/.github/workflows/build-and-publish-image.yml b/.github/workflows/build-and-publish-image.yml
index dbe15ad..18aa36e 100644
--- a/.github/workflows/build-and-publish-image.yml
+++ b/.github/workflows/build-and-publish-image.yml
@@ -20,6 +20,18 @@ jobs:
             type=semver,pattern={{major}}
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{version}}
+      - name: Docker meta NL
+        id: docker_meta_nl
+        uses: docker/metadata-action@v3
+        with:
+          images: ${{ env.image }}
+          flavor: |
+            latest=false
+            suffix=-nl
+          tags: |
+            type=semver,pattern={{major}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{version}}
       - name: Login to PDOK Docker Hub
         if: startsWith(env.image, 'pdok/')
         uses: docker/login-action@v2
@@ -50,10 +62,10 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           push: true
-          tags: ${{ steps.docker_meta.outputs.tags }}-nl
+          tags: ${{ steps.docker_meta_nl.outputs.tags }}
           file: ./Dockerfile
           target: NL
-          labels: ${{ steps.docker_meta.outputs.labels }}
+          labels: ${{ steps.docker_meta_nl.outputs.labels }}
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache-new
       - # Temp fix to cleanup cache