diff --git a/.github/push-images.sh b/.github/push-images.sh
index 6b803eeb..894f405e 100755
--- a/.github/push-images.sh
+++ b/.github/push-images.sh
@@ -10,3 +10,39 @@ do
     echo "Pushing ${IMG}"
     docker push ${IMG}
 done
+
+manifest_push () {
+    local image=$1
+    local tag=$2
+
+    docker manifest create quay.io/quarkus/${image}:${tag} \
+        --amend quay.io/quarkus/${image}:${tag}-amd64 \
+        --amend quay.io/quarkus/${image}:${tag}-arm64
+    docker manifest push quay.io/quarkus/${image}:${tag}
+}
+
+# Manually combine manifests for multi-arch native builder images
+if [[ $(docker images | grep quay.io/quarkus/ | grep "ubi-quarkus-native-image") ]]; then
+    manifest_push "ubi-quarkus-native-image" "22.0.0-java17"
+    manifest_push "ubi-quarkus-native-image" "22.0.0-java11"
+    manifest_push "ubi-quarkus-native-image" "22.0-java17"
+    manifest_push "ubi-quarkus-native-image" "22.0-java11"
+
+    manifest_push "ubi-quarkus-native-image" "22.1.0-java17"
+    manifest_push "ubi-quarkus-native-image" "22.1.0-java11"
+    manifest_push "ubi-quarkus-native-image" "22.1-java17"
+    manifest_push "ubi-quarkus-native-image" "22.1-java11"
+fi
+
+# Manually combine manifests for multi-arch mandrel images
+if [[ $(docker images | grep quay.io/quarkus/ | grep "ubi-quarkus-mandrel") ]]; then
+    manifest_push "ubi-quarkus-mandrel" "22.0.0.2.Final-java17"
+    manifest_push "ubi-quarkus-mandrel" "22.0.0.2.Final-java11"
+    manifest_push "ubi-quarkus-mandrel" "22.0-java17"
+    manifest_push "ubi-quarkus-mandrel" "22.0-java11"
+
+    manifest_push "ubi-quarkus-mandrel" "22.1.0.0.Final-java17"
+    manifest_push "ubi-quarkus-mandrel" "22.1.0.0.Final-java11"
+    manifest_push "ubi-quarkus-mandrel" "22.1-java17"
+    manifest_push "ubi-quarkus-mandrel" "22.1-java11"
+fi
diff --git a/.github/workflows/push-images.yml b/.github/workflows/push-images.yml
index af5c62d6..707aa288 100644
--- a/.github/workflows/push-images.yml
+++ b/.github/workflows/push-images.yml
@@ -17,6 +17,20 @@ jobs:
           - .github/tooling-images.yaml
     steps:
     - uses: actions/checkout@v1
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v1
+    - name: Set up Docker Buildx
+      id: buildx
+      uses: docker/setup-buildx-action@v1
+      with:
+        install: true
+    - name: Inspect builder
+      run: |
+        echo "Name:      ${{ steps.buildx.outputs.name }}"
+        echo "Endpoint:  ${{ steps.buildx.outputs.endpoint }}"
+        echo "Status:    ${{ steps.buildx.outputs.status }}"
+        echo "Flags:     ${{ steps.buildx.outputs.flags }}"
+        echo "Platforms: ${{ steps.buildx.outputs.platforms }}"
     - name: Prerequisites
       run: .github/ci-prerequisites.sh
     - name: Build images