diff --git a/.github/workflows/build_docker_tagged.yml b/.github/workflows/build_docker_tagged.yml
index 8d95e7b..5320cd5 100644
--- a/.github/workflows/build_docker_tagged.yml
+++ b/.github/workflows/build_docker_tagged.yml
@@ -28,6 +28,11 @@ jobs:
           # We must fetch at least the immediate parents so that if this is
           # a pull request then we can checkout the head.
           fetch-depth: 2
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: ghcr.io/${{ github.repository }}
       - name: Set output
         id: vars
         run: echo ::set-output name=tag::${GITHUB_REF#refs/*/}
@@ -40,7 +45,7 @@ jobs:
           file: ./Dockerfile.latest
           platforms: linux/amd64,linux/arm64
           push: true
-          tags: philipssoftware/fluent-bit-out-hsdp:${{ steps.vars.outputs.tag }}
+          tags: philipssoftware/fluent-bit-out-hsdp:${{ steps.vars.outputs.tag }},${{ steps.meta.outputs.tags }}
       -
         name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}
@@ -66,6 +71,11 @@ jobs:
           # We must fetch at least the immediate parents so that if this is
           # a pull request then we can checkout the head.
           fetch-depth: 2
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: ghcr.io/${{ github.repository }}-debug
       - name: Set output
         id: vars
         run: echo ::set-output name=tag::${GITHUB_REF#refs/*/}
@@ -78,7 +88,7 @@ jobs:
           file: ./Dockerfile.debug
           platforms: linux/amd64,linux/arm64
           push: true
-          tags: philipssoftware/fluent-bit-out-hsdp:${{ steps.vars.outputs.tag }}-debug
+          tags: philipssoftware/fluent-bit-out-hsdp-debug:${{ steps.vars.outputs.tag }},${{ steps.meta.outputs.tags }}
       -
         name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}
@@ -121,7 +131,7 @@ jobs:
         id: meta
         uses: docker/metadata-action@v4
         with:
-          images: ghcr.io/${{ github.repository }}
+          images: ghcr.io/${{ github.repository }}-init
       - name: Set output
         id: vars
         run: echo ::set-output name=tag::${GITHUB_REF#refs/*/}