diff --git a/Dockerfile.linux-ppc64le b/Dockerfile.linux-ppc64le
new file mode 100644
index 0000000..26aff2a
--- /dev/null
+++ b/Dockerfile.linux-ppc64le
@@ -0,0 +1,12 @@
+ARG GO_VERSION
+FROM golang:$GO_VERSION
+RUN \
+  apt-get update && \
+  apt-get install -y gcc-powerpc64le-linux-gnu g++-powerpc64le-linux-gnu
+
+ENV CGO_ENABLED=1
+ENV CC=powerpc64le-linux-gnu-gcc
+ENV CXX=powerpc64le-linux-gnu-g++
+ENV GOOS=linux
+ENV GOARCH=ppc64le
+
diff --git a/Dockerfile.linux-s390x b/Dockerfile.linux-s390x
new file mode 100644
index 0000000..5193736
--- /dev/null
+++ b/Dockerfile.linux-s390x
@@ -0,0 +1,12 @@
+ARG GO_VERSION
+FROM golang:$GO_VERSION
+RUN \
+  apt-get update && \
+  apt-get install -y gcc-s390x-linux-gnu g++-s390x-linux-gnu
+
+ENV CGO_ENABLED=1
+ENV CC=s390x-linux-gnu-gcc
+ENV CXX=s390x-linux-gnu-g++
+ENV GOOS=linux
+ENV GOARCH=s390x
+
diff --git a/Makefile b/Makefile
index d81ecbb..ec4ff13 100644
--- a/Makefile
+++ b/Makefile
@@ -36,5 +36,17 @@ build-linux-arm64:
 push-linux-arm64:
 	docker push ${PROJECT}:${GO_VERSION}-linux-arm64
 
-build: build-linux-amd64 build-linux-arm-7 build-linux-arm64 build-linux-386 build-windows-amd64 build-windows-386
-push:  push-linux-amd64  push-linux-arm-7  push-linux-arm64  push-linux-386  push-windows-amd64  push-windows-386
+build-linux-ppc64le:
+	docker build --build-arg GO_VERSION=${GO_VERSION} -t ${PROJECT}:${GO_VERSION}-linux-ppc64le -f Dockerfile.linux-ppc64le .
+
+push-linux-ppc64le:
+	docker push ${PROJECT}:${GO_VERSION}-linux-ppc64le
+
+build-linux-s390x:
+	docker build --build-arg GO_VERSION=${GO_VERSION} -t ${PROJECT}:${GO_VERSION}-linux-s390x -f Dockerfile.linux-s390x .
+
+push-linux-s390x:
+	docker push ${PROJECT}:${GO_VERSION}-linux-s390x
+
+build: build-linux-amd64 build-linux-arm-7 build-linux-arm64 build-linux-386 build-windows-amd64 build-windows-386 build-linux-ppc64le build-linux-s390x
+push:  push-linux-amd64  push-linux-arm-7  push-linux-arm64  push-linux-386  push-windows-amd64  push-windows-386  push-linux-ppc64le  push-linux-s390x