diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index c430f0a3..89daea13 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -61,25 +61,48 @@ jobs:
 
       # Extract metadata (tags, labels) for Docker
       # https://github.com/docker/metadata-action
-      - name: Extract Docker metadata
-        id: meta
+      - name: Extract Docker metadata 12.1
+        id: meta-12-1
         uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=raw,value=12.1
+
+      - name: Extract Docker metadata 16.1
+        id: meta-16-1
+        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=raw,value=16.1
 
       # Build and push Docker image with Buildx (don't push on PR)
       # https://github.com/docker/build-push-action
-      - name: Build and push Docker image
-        id: build-and-push
+      - name: Build and push 16.1 Docker image
+        id: build-and-push-16-1
         uses: docker/build-push-action@ac9327eae2b366085ac7f6a2d02df8aa8ead720a
         with:
           context: .
           push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+          tags: ${{ steps.meta-16-1.outputs.tags }}
+          labels: ${{ steps.meta-16-1.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
           file: 16.1.Dockerfile
+          # Build and push Docker image with Buildx (don't push on PR)
+      # https://github.com/docker/build-push-action
+      - name: Build and push 12.1 Docker image
+        id: build-and-push-12-1
+        uses: docker/build-push-action@ac9327eae2b366085ac7f6a2d02df8aa8ead720a
+        with:
+          context: .
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta-12-1.outputs.tags }}
+          labels: ${{ steps.meta-12-1.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          file: 12.1.Dockerfile
 
 
       # Sign the resulting Docker image digest except on PRs.