diff --git a/.goreleaser.template.yml b/.goreleaser.template.yml
index 7a9fa2d1d..e1f045422 100644
--- a/.goreleaser.template.yml
+++ b/.goreleaser.template.yml
@@ -13,17 +13,41 @@ builds:
     tags: $GO_BUILD_TAGS
     goos:
     - linux
+    goarch:
+    - amd64
+    - arm64
+    - ppc64le
+    - s390x
     ldflags:
     - -X main.Version={{ .Version }}
 dockers:
 - image_templates:
-  - "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}"
+  - "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-amd64"
   dockerfile: Dockerfile
   goos: linux
+  goarch: amd64
+- image_templates:
+    - "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-arm64"
+  dockerfile: Dockerfile
+  goos: linux
+  goarch: arm64
+- image_templates:
+    - "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-ppc64le"
+  dockerfile: Dockerfile
+  goos: linux
+  goarch: ppc64le
+- image_templates:
+    - "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-s390x"
+  dockerfile: Dockerfile
+  goos: linux
+  goarch: s390x
 docker_manifests:
 - name_template: "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}"
   image_templates:
-  - "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}"
+    - "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-amd64"
+    - "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-arm64"
+    - "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-ppc64le"
+    - "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-s390x"
 checksum:
   name_template: 'checksums.txt'
 snapshot: