diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml
index 95f9480..36616d2 100644
--- a/.github/workflows/build-and-publish.yml
+++ b/.github/workflows/build-and-publish.yml
@@ -37,6 +37,9 @@ jobs:
           username: ${{ env.REGISTRY_USER }}
           password: ${{ env.REGISTRY_PASSWORD }}
 
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db
+
       - name: Build packager
         uses: docker/build-push-action@91df6b874e498451163feb47610c87c4a218c1ee
         with:
@@ -64,6 +67,12 @@ jobs:
           images: ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAME }}
           flavor: |
             suffix=-slurmctld
+          tags: |
+            type=schedule
+            type=ref,event=branch
+            type=ref,event=tag
+            type=ref,event=pr
+            type=sha,format=long
 
       - name: Build and push slurmctld image
         uses: docker/build-push-action@91df6b874e498451163feb47610c87c4a218c1ee
@@ -83,12 +92,19 @@ jobs:
           images: ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAME }}
           flavor: |
             suffix=-slurmdbd
+          tags: |
+            type=schedule
+            type=ref,event=branch
+            type=ref,event=tag
+            type=ref,event=pr
+            type=sha,format=long
 
       - name: Build and push slurmdbd image
         uses: docker/build-push-action@91df6b874e498451163feb47610c87c4a218c1ee
         with:
           context: .
           target: slurmdbd
+          platforms: linux/amd64,linux/arm64
           push: true
           build-args: |
             DOCKER_METADATA_OUTPUT_JSON