diff --git a/Makefile b/Makefile
index 0a50daf7c2..0ffe0cc610 100644
--- a/Makefile
+++ b/Makefile
@@ -27,9 +27,12 @@ GO_BUILD_FLAGS=-mod vendor -ldflags "-extldflags \"-static\" -X main.version=$(S
 ifeq ($(GOARCH),arm)
 GO_ENV+=CGO_ENABLED=1
 ARM_CC=CC=/usr/bin/arm-linux-gnueabihf-gcc
+else ifeq ($(GOARCH),s390x)
+GO_ENV+=CGO_ENABLED=1
+S390X_CC=CC=/usr/bin/s390x-linux-gnu-gcc
 endif
 
-GO=env $(GO_ENV) $(ARM_CC) go
+GO=env $(GO_ENV) $(ARM_CC) $(S390X_CC) go
 
 NO_CROSS_COMP=unset GOOS GOARCH
 GO_HOST=$(NO_CROSS_COMP); env $(GO_ENV) go
diff --git a/backend/Dockerfile b/backend/Dockerfile
index ea9d016af8..9654072e39 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -4,7 +4,7 @@ RUN set -eux; \
    export arch_val="$(dpkg --print-architecture)"; \
    apt-get update && \
    if [ "$arch_val" = "amd64" ]; then \
-     apt-get install -y libpcap-dev time file shellcheck git gcc-arm-linux-gnueabihf curl build-essential; \
+     apt-get install -y libpcap-dev time file shellcheck git gcc-arm-linux-gnueabihf curl build-essential gcc-s390x-linux-gnu; \
    else \
      apt-get install -y libpcap-dev time file shellcheck git curl build-essential; \
    fi; \