diff --git a/.circleci/config.yml b/.circleci/config.yml
index 57cdc2e6..a59103ac 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -40,7 +40,7 @@ jobs:
 
     steps:
     - checkout
-    - run: docker run --privileged linuxkit/binfmt:v0.6
+    - run: docker run --privileged linuxkit/binfmt:v0.7
     - run: make promu
     - run: promu crossbuild
     - run: promu --config .promu-cgo.yml crossbuild
diff --git a/.dockerignore b/.dockerignore
index 7aff1fd8..cfeaf5f6 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -5,3 +5,4 @@
 !.build/linux-armv7
 !.build/linux-arm64
 !.build/linux-ppc64le
+!.build/linux-s390x
diff --git a/Makefile b/Makefile
index 2e1f04ff..daa51ffb 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@
 all::
 
 # Needs to be defined before including Makefile.common to auto-generate targets
-DOCKER_ARCHS ?= amd64 armv7 arm64 ppc64le
+DOCKER_ARCHS ?= amd64 armv7 arm64 ppc64le s390x
 
 include Makefile.common