diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d500e7b..b34605f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -118,7 +118,7 @@ jobs:
         with:
           context: .
           file: ./docker/Dockerfile
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
           pull: true
           push: true
           tags: |
@@ -147,7 +147,7 @@ jobs:
         with:
           context: .
           file: ./docker/Dockerfile
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
           pull: true
           push: true
           tags: |
diff --git a/.goreleaser.yml b/.goreleaser.yml
index 4619dbd..3fa968a 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -14,6 +14,9 @@ builds:
     goarch:
       - amd64
       - arm64
+      - arm
+    goarm:
+      - 7
     ldflags:
       - -s -w
       - -X "main.Version={{ .Version }}"
@@ -25,7 +28,7 @@ builds:
 # Archive
 archives:
   -
-    name_template: "{{ .ProjectName }}_v{{ .Version }}_{{ .Os }}_{{ .Arch }}"
+    name_template: "{{ .ProjectName }}_v{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}{{ if .Mips }}_{{ .Mips }}{{ end }}"
     format: "binary"
 
 # Checksum
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 7ed54f6..0fdbe00 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -2,6 +2,7 @@ FROM sc4h/alpine-s6overlay:3.12
 
 ARG TARGETOS
 ARG TARGETARCH
+ARG TARGETVARIANT
 
 ENV \
   PATH="/app/nabarr:${PATH}" \
@@ -11,7 +12,7 @@ ENV \
   APP_VERBOSITY="0"
 
 # Binary
-COPY ["dist/nabarr_${TARGETOS}_${TARGETARCH}/nabarr", "/app/nabarr/nabarr"]
+COPY ["dist/nabarr_${TARGETOS}_${TARGETARCH}${TARGETVARIANT:+_7}/nabarr", "/app/nabarr/nabarr"]
 
 # Add root files
 COPY ["docker/run", "/etc/services.d/nabarr/run"]