diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 0ecba1a..aca018c 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -8,6 +8,10 @@ on:
     paths-ignore:
       - '**.md'
 
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -27,17 +31,20 @@ jobs:
       - name: set up qemu
         uses: docker/setup-qemu-action@v1
       - name: set up buildx
+        id: docker_buildx
         uses: docker/setup-buildx-action@v1
       - name: log in to ghcr
         uses: docker/login-action@v1
         with:
-          registry: ghcr.io
-          username: lus
-          password: ${{ secrets.CR_TOKEN }}
+          registry: ${{ env.REGISTRY }}
+          username: ${{ secrets.SERVICE_USER }} # Defined in secrets for auth to registry
+          password: ${{ secrets.GITHUB_TOKEN }}
       - name: build and push
         uses: docker/build-push-action@v2
         with:
+          builder: ${{ steps.docker_buildx.outputs.name }}
+          platforms: linux/amd64, linux/arm64
           push: true
-          tags: ghcr.io/lus/pasty:${{ env.TAG }}
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.TAG }}, ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.COMMIT_HASH }}
           build-args:
-            PASTY_VERSION=${{ env.BRANCH }}-${{ env.COMMIT_HASH }}
\ No newline at end of file
+            PASTY_VERSION=${{ env.BRANCH }}-${{ env.COMMIT_HASH }}