diff --git a/.circleci/config.yml b/.circleci/config.yml
index e7992d2454..e6638fc452 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,7 +2,7 @@
 version: 2.1
 
 orbs:
-  prometheus: prometheus/prometheus@0.3.0
+  prometheus: prometheus/prometheus@0.4.0
   go: circleci/go@0.2.0
   win: circleci/windows@2.3.0
 
diff --git a/.dockerignore b/.dockerignore
index 07a4d4f571..486d44ad9e 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -5,3 +5,4 @@ data/
 !.build/linux-amd64/
 !.build/linux-armv7/
 !.build/linux-arm64/
+!.build/linux-s390x/
diff --git a/Makefile b/Makefile
index 97f6e4fb86..1b8a448a1c 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@
 # limitations under the License.
 
 # Needs to be defined before including Makefile.common to auto-generate targets
-DOCKER_ARCHS ?= amd64 armv7 arm64
+DOCKER_ARCHS ?= amd64 armv7 arm64 s390x
 
 REACT_APP_PATH = web/ui/react-app
 REACT_APP_SOURCE_FILES = $(wildcard $(REACT_APP_PATH)/public/* $(REACT_APP_PATH)/src/* $(REACT_APP_PATH)/tsconfig.json)