diff --git a/.github/workflows/controller-image.yaml b/.github/workflows/controller-image.yaml
index 48f4639..44fa24e 100644
--- a/.github/workflows/controller-image.yaml
+++ b/.github/workflows/controller-image.yaml
@@ -34,8 +34,10 @@ jobs:
         run: |
           go mod tidy
           make generate fmt vet
-      - name: Set up Docker
-        uses: docker/setup-buildx-action@v1
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
       - name: Login to Docker
         uses: docker/login-action@v1
         with:
@@ -47,6 +49,7 @@ jobs:
         with:
           context: .
           push: true
+          platforms: linux/amd64,linux/arm64,linux/s390x
           tags: |
             ${{ env.IMAGE_NAME }}:v${{ env.IMAGE_VERSION }}
           file: ./Dockerfile
\ No newline at end of file
diff --git a/.github/workflows/parser-image.yaml b/.github/workflows/parser-image.yaml
index 44cd537..92541d9 100644
--- a/.github/workflows/parser-image.yaml
+++ b/.github/workflows/parser-image.yaml
@@ -23,8 +23,10 @@ jobs:
       - uses: actions/setup-go@v2
         with:
           go-version: '1.17.0'
-      - name: Set up Docker
-        uses: docker/setup-buildx-action@v1
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
       - name: Login to Docker
         uses: docker/login-action@v1
         with:
@@ -36,6 +38,7 @@ jobs:
         with:
           context: cpe-parser
           push: true
+          platforms: linux/amd64,linux/arm64,linux/s390x
           tags: |
             ${{ env.IMAGE_NAME }}:v${{ env.IMAGE_VERSION }}
           file: ./cpe-parser/Dockerfile
\ No newline at end of file