diff --git a/.github/workflows/images_build.yml b/.github/workflows/images_build.yml
index 523bdb932..64fbfbbd7 100644
--- a/.github/workflows/images_build.yml
+++ b/.github/workflows/images_build.yml
@@ -111,10 +111,15 @@ jobs:
           fetch-depth: 1
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v1.2.0
+        with:
+          image: tonistiigi/binfmt:latest
+          platforms: all
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v1.6.0
+        with:
+          driver-opts: image=moby/buildkit:master
 
       - name: Login to DockerHub
         uses: docker/login-action@v1
@@ -182,10 +187,15 @@ jobs:
         uses: actions/checkout@v2.3.4
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v1.2.0
+        with:
+          image: tonistiigi/binfmt:latest
+          platforms: all
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v1.6.0
+        with:
+          driver-opts: image=moby/buildkit:master
 
       - name: Login to DockerHub
         uses: docker/login-action@v1
@@ -267,10 +277,15 @@ jobs:
       - uses: actions/checkout@v2.3.4
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v1.2.0
+        with:
+          image: tonistiigi/binfmt:latest
+          platforms: all
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v1.6.0
+        with:
+          driver-opts: image=moby/buildkit:master
 
       - name: Login to DockerHub
         uses: docker/login-action@v1
@@ -288,6 +303,11 @@ jobs:
                 platform_list=$(jq -r '.["os-linux"].${{ matrix.os }} | join(",")' "./build.json")
             fi
 
+            # Build only Agent and Agent2 on 386
+            if [ "${{ matrix.build }}" != "agent"* ]; then
+                platform_list="${platform_list#linux/386,}"
+            fi
+
             # Can not compile Java applications on ppc64le
             if [ "${{ matrix.build }}" == "java-gateway" ]; then
                 platform_list="${platform_list%linux/ppc64le}"
diff --git a/Dockerfiles/build-mysql/ubuntu/Dockerfile b/Dockerfiles/build-mysql/ubuntu/Dockerfile
index 3e2d3265b..501d4f3a4 100644
--- a/Dockerfiles/build-mysql/ubuntu/Dockerfile
+++ b/Dockerfiles/build-mysql/ubuntu/Dockerfile
@@ -31,6 +31,9 @@ RUN set -eux && \
         armv7l) \
             additional_components='--enable-java'; \
             ;; \
+        s390x) \
+            additional_components='--enable-java'; \
+            ;; \
         ppc64le) \
             additional_components=''; \
             ;; \
diff --git a/Dockerfiles/build-pgsql/ubuntu/Dockerfile b/Dockerfiles/build-pgsql/ubuntu/Dockerfile
index 501a05f67..31143d591 100644
--- a/Dockerfiles/build-pgsql/ubuntu/Dockerfile
+++ b/Dockerfiles/build-pgsql/ubuntu/Dockerfile
@@ -31,6 +31,9 @@ RUN set -eux && \
         armv7l) \
             additional_components='--enable-java'; \
             ;; \
+        s390x) \
+            additional_components='--enable-java'; \
+            ;; \
         ppc64le) \
             additional_components=''; \
             ;; \
diff --git a/Dockerfiles/build-sqlite3/ubuntu/Dockerfile b/Dockerfiles/build-sqlite3/ubuntu/Dockerfile
index 33645057e..6e24eebdd 100644
--- a/Dockerfiles/build-sqlite3/ubuntu/Dockerfile
+++ b/Dockerfiles/build-sqlite3/ubuntu/Dockerfile
@@ -31,6 +31,9 @@ RUN set -eux && \
         armv7l) \
             additional_components='--enable-java'; \
             ;; \
+        s390x) \
+            additional_components='--enable-java'; \
+            ;; \
         ppc64le) \
             additional_components=''; \
             ;; \
diff --git a/build.json b/build.json
index 9ae7568b5..9f9a2f157 100644
--- a/build.json
+++ b/build.json
@@ -1,6 +1,7 @@
 {
   "os-linux": {
     "alpine": [
+      "linux/386",
       "linux/amd64",
       "linux/arm/v6",
       "linux/arm/v7",
@@ -15,6 +16,7 @@
       "linux/amd64",
       "linux/arm/v7",
       "linux/arm64",
+      "linux/s390x",
       "linux/ppc64le"
     ],
     "centos": [