diff --git a/.goreleaser.yml b/.goreleaser.yml
index 404f2a6..24f4426 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -17,7 +17,7 @@ builds:
       - arm
 
     goarm:
-      - 6 # For old RPIs
+      - 7 # For old RPIs
 
     main: cmd/OliveTin/main.go
 
@@ -70,15 +70,65 @@ archives:
 
 dockers:
   - image_templates:
-      - "docker.io/jamesread/olivetin:latest"
-      - "docker.io/jamesread/olivetin:{{ .Tag }}"
+      - "docker.io/jamesread/olivetin:{{ .Tag }}-amd64"
     dockerfile: Dockerfile
     goos: linux
     goarch: amd64
     skip_push: false
+    use_buildx: true
+    build_flag_templates:
+      - "--platform=linux/amd64"
+      - "--label=org.opencontainers.image.title={{.ProjectName}}"
+      - "--label=org.opencontainers.image.revision={{.FullCommit}}"
+      - "--label=org.opencontainers.image.version={{.Tag}}"
     extra_files:
       - webui
 
+  - image_templates:
+      - "docker.io/jamesread/olivetin:{{ .Tag }}-arm64"
+    dockerfile: Dockerfile
+    goos: linux
+    goarch: arm64
+    skip_push: false
+    use_buildx: true
+    build_flag_templates:
+      - "--platform=linux/arm64/v8"
+      - "--label=org.opencontainers.image.title={{.ProjectName}}"
+      - "--label=org.opencontainers.image.revision={{.FullCommit}}"
+      - "--label=org.opencontainers.image.version={{.Tag}}"
+    extra_files:
+      - webui
+
+  - image_templates:
+      - "docker.io/jamesread/olivetin:{{ .Tag }}-arm"
+    dockerfile: Dockerfile
+    goos: linux
+    goarch: arm
+    skip_push: false
+    use_buildx: true
+    build_flag_templates:
+      - "--platform=linux/arm/v7"
+      - "--label=org.opencontainers.image.title={{.ProjectName}}"
+      - "--label=org.opencontainers.image.revision={{.FullCommit}}"
+      - "--label=org.opencontainers.image.version={{.Tag}}"
+    extra_files:
+      - webui
+
+
+
+docker_manifests:
+  - name_template: "docker.io/jamesread/olivetin:{{ .Tag }}"
+    image_templates:
+      - "docker.io/jamesread/olivetin:{{ .Tag }}-amd64"
+      - "docker.io/jamesread/olivetin:{{ .Tag }}-arm64"
+      - "docker.io/jamesread/olivetin:{{ .Tag }}-arm"
+
+    create_flags:
+      - --insecure
+
+    push_flags:
+      - --insecure
+
 nfpms:
   - maintainer: James Read <contact@jread.com>
     description: OliveTin is a web interface for running Linux shell commands.