diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f17be40..9a2d937 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -4,11 +4,14 @@ on:
   push:
     tags:
       - v*
+  workflow_dispatch:
 
 jobs:
   release:
     name: Release
     runs-on: ubuntu-latest
+    env:
+      DOCKER_CLI_EXPERIMENTAL: "enabled"
     steps:
       - name: Set up Go
         uses: actions/setup-go@v1
@@ -19,9 +22,16 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
+      
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
 
-      - name: Log into GitHub Container Registry
-        run: echo "${{ secrets.CR_PAT }}" | docker login https://ghcr.io -u ${{ github.actor }} --password-stdin
+      - name: Docker Login
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.CR_PAT }}
 
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v2
@@ -29,4 +39,4 @@ jobs:
           version: latest
           args: release --rm-dist
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.CR_PAT }}
diff --git a/.goreleaser.yml b/.goreleaser.yml
index 873364d..b367ac4 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -44,13 +44,29 @@ changelog:
 
 dockers:
   - image_templates:
-      - "ghcr.io/vilsol/yeet:{{ .Tag }}"
-      - "ghcr.io/vilsol/yeet:v{{ .Major }}"
-      - "ghcr.io/vilsol/yeet:v{{ .Major }}.{{ .Minor }}"
-      - "ghcr.io/vilsol/yeet:latest"
+      - "ghcr.io/astrofloof/{{ .ProjectName }}:{{ .Tag }}-amd64"
+      - "ghcr.io/astrofloof/{{ .ProjectName }}:v{{ .Major }}-amd64"
+      - "ghcr.io/astrofloof/{{ .ProjectName }}:v{{ .Major }}.{{ .Minor }}-amd64"
+      - "ghcr.io/astrofloof/{{ .ProjectName }}:latest-amd64"
+    use: buildx
     build_flag_templates:
       - "--pull"
-      - "--label=org.opencontainers.image.created={{.Date}}"
-      - "--label=org.opencontainers.image.title={{.ProjectName}}"
-      - "--label=org.opencontainers.image.revision={{.FullCommit}}"
-      - "--label=org.opencontainers.image.version={{.Version}}"
+      - "--platform=linux/amd64"
+      - "--label=org.opencontainers.image.created={{ .Date }}"
+      - "--label=org.opencontainers.image.title={{ .ProjectName }}"
+      - "--label=org.opencontainers.image.revision={{ .FullCommit }}"
+      - "--label=org.opencontainers.image.version={{ .Version }}"
+      
+  - image_templates:
+      - "ghcr.io/astrofloof/{{ .ProjectName }}:{{ .Tag }}-arm64v8"
+      - "ghcr.io/astrofloof/{{ .ProjectName }}:v{{ .Major }}-arm64v8"
+      - "ghcr.io/astrofloof/{{ .ProjectName }}:v{{ .Major }}.{{ .Minor }}-arm64v8"
+      - "ghcr.io/astrofloof/{{ .ProjectName }}:latest-arm64v8"
+    use: buildx
+    build_flag_templates:
+      - "--pull"
+      - "--platform=linux/arm64/v8"
+      - "--label=org.opencontainers.image.created={{ .Date }}"
+      - "--label=org.opencontainers.image.title={{ .ProjectName }}"
+      - "--label=org.opencontainers.image.revision={{ .FullCommit }}"
+      - "--label=org.opencontainers.image.version={{ .Version }}"