diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 78017d3d..6133ff8c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -48,7 +48,7 @@ jobs:
         uses: goreleaser/goreleaser-action@5df302e5e9e4c66310a6b6493a8865b12c555af2
         with:
           distribution: goreleaser
-          version: v0.176.0
+          version: v0.184.0
           args: release --rm-dist --release-notes=tmp/release_changelog.md
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9a9990a0..39e7a0d5 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -57,5 +57,5 @@ jobs:
         uses: goreleaser/goreleaser-action@5df302e5e9e4c66310a6b6493a8865b12c555af2
         with:
           distribution: goreleaser
-          version: v0.176.0
+          version: v0.184.0
           args: build --snapshot --rm-dist --skip-post-hooks --skip-validate
diff --git a/.goreleaser.yml b/.goreleaser.yml
index 06809e2a..54448f93 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -33,15 +33,40 @@ builds:
     ignore:
       - goos: windows
         goarch: arm64
+      - goarch: arm
 
     ldflags:
       - -s -w -X github.com/Shopify/toxiproxy/v2.Version={{.Version}}
 
   - <<: *build_default
+    id: server-arm
+    goarch:
+      - arm
+    goarm:
+      - 6
+      - 7
+    ignore:
+      - goos: windows
+        goarch: arm
+    binary: toxiproxy-server-{{.Os}}-{{.Arch}}v{{.Arm}}
+
+  - &build_client
+    <<: *build_default 
     id: client
     main: ./cmd/cli
     binary: toxiproxy-cli-{{.Os}}-{{.Arch}}
 
+  - <<: *build_client
+    id: client-arm
+    goarch:
+      - arm
+    goarm:
+      - 6
+      - 7
+    ignore:
+      - goos: windows
+        goarch: arm
+    binary: toxiproxy-cli-{{.Os}}-{{.Arch}}v{{.Arm}}
 
   - <<: *build_default
     id: pkg-server
@@ -122,6 +147,42 @@ dockers:
       - --label=org.opencontainers.image.created={{ time "2006-01-02T15:04:05Z07:00" }}
       - --label=org.opencontainers.image.revision={{ .FullCommit }}
       - --label=org.opencontainers.image.licenses=MIT
+  - <<: *docker
+    goarch: arm
+    goarm: 7
+    image_templates:
+      - ghcr.io/shopify/toxiproxy:{{ .Version }}-armv7
+      - ghcr.io/shopify/toxiproxy:v{{ .Major }}-armv7
+      - ghcr.io/shopify/toxiproxy:v{{ .Major }}.{{ .Minor }}-armv7
+    build_flag_templates:
+      - --platform=linux/arm/v6
+      - --no-cache
+      - --label=org.opencontainers.image.title={{ .ProjectName }}
+      - --label=org.opencontainers.image.description={{ .ProjectName }}
+      - --label=org.opencontainers.image.url=https://github.com/Shopify/{{ .ProjectName }}
+      - --label=org.opencontainers.image.source=https://github.com/Shopify/{{ .ProjectName }}
+      - --label=org.opencontainers.image.version={{ .Version }}
+      - --label=org.opencontainers.image.created={{ time "2006-01-02T15:04:05Z07:00" }}
+      - --label=org.opencontainers.image.revision={{ .FullCommit }}
+      - --label=org.opencontainers.image.licenses=MIT
+  - <<: *docker
+    goarch: arm
+    goarm: 6
+    image_templates:
+      - ghcr.io/shopify/toxiproxy:{{ .Version }}-armv6
+      - ghcr.io/shopify/toxiproxy:v{{ .Major }}-armv6
+      - ghcr.io/shopify/toxiproxy:v{{ .Major }}.{{ .Minor }}-armv6
+    build_flag_templates:
+      - --platform=linux/arm/v6
+      - --no-cache
+      - --label=org.opencontainers.image.title={{ .ProjectName }}
+      - --label=org.opencontainers.image.description={{ .ProjectName }}
+      - --label=org.opencontainers.image.url=https://github.com/Shopify/{{ .ProjectName }}
+      - --label=org.opencontainers.image.source=https://github.com/Shopify/{{ .ProjectName }}
+      - --label=org.opencontainers.image.version={{ .Version }}
+      - --label=org.opencontainers.image.created={{ time "2006-01-02T15:04:05Z07:00" }}
+      - --label=org.opencontainers.image.revision={{ .FullCommit }}
+      - --label=org.opencontainers.image.licenses=MIT
 
 docker_manifests:
   -
@@ -129,11 +190,15 @@ docker_manifests:
     image_templates:
       - ghcr.io/shopify/{{ .ProjectName }}:{{ .Version }}-amd64
       - ghcr.io/shopify/{{ .ProjectName }}:{{ .Version }}-arm64
+      - ghcr.io/shopify/{{ .ProjectName }}:{{ .Version }}-armv6
+      - ghcr.io/shopify/{{ .ProjectName }}:{{ .Version }}-armv7
   -
     name_template: ghcr.io/shopify/{{ .ProjectName }}:latest
     image_templates:
       - ghcr.io/shopify/{{ .ProjectName }}:{{ .Version }}-amd64
       - ghcr.io/shopify/{{ .ProjectName }}:{{ .Version }}-arm64
+      - ghcr.io/shopify/{{ .ProjectName }}:{{ .Version }}-armv6
+      - ghcr.io/shopify/{{ .ProjectName }}:{{ .Version }}-armv7
 
 changelog:
   sort: asc
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 79a7d2b1..0f8d0a79 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 * client.Populate assign client to proxy. (#291, @hellodudu)
 * fix: The release-test task is always success.
   add: Allow to run release-test on arm machines. (#340, @miry)
+* Upgrade `goreleaser`. Support `armv7` and `armv6` oses. (#339, @mitchellrj)
 
 # [2.2.0]