diff --git a/.github/workflows/docker-image.yml b/.github/workflows/dockerhub.yml
similarity index 99%
rename from .github/workflows/docker-image.yml
rename to .github/workflows/dockerhub.yml
index 3f3cd57..4f62ec4 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/dockerhub.yml
@@ -13,7 +13,7 @@ jobs:
     steps:
       - name: Check out the repo
         uses: actions/checkout@v4
-      
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
 
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/ghcr.yml
similarity index 91%
rename from .github/workflows/docker-publish.yml
rename to .github/workflows/ghcr.yml
index b76b702..a0702b1 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/ghcr.yml
@@ -31,6 +31,9 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
       # Set up BuildKit Docker container builder to be able to build
       # multi-platform images and export cache
       # https://github.com/docker/setup-buildx-action
@@ -54,7 +57,10 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-
+          tags: |
+            type=sha
+            type=match,pattern=v(.*),group=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
@@ -65,6 +71,7 @@ jobs:
           build-args: |
             BASE_IMAGE=redhat/ubi8-minimal
             BUILDER_IMAGE=redhat/ubi8-minimal
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}