diff --git a/.github/workflows/machine-images.yml b/.github/workflows/machine-images.yml
index fe67d8f09b60..5d1eb7755b0d 100644
--- a/.github/workflows/machine-images.yml
+++ b/.github/workflows/machine-images.yml
@@ -41,20 +41,50 @@ jobs:
         cosa build
         #cosa compress
 
-    - name: cosa build applehv
+        #- name: cosa build applehv
+        #run: |
+        #cd fcos
+        #cosa buildextend-applehv
+
+        #- name: cosa build windows
+        #run: |
+        #cd fcos
+        #cosa buildextend-hyperv
+
+    - name: compress image
       run: |
         cd fcos
-        cosa buildextend-applehv
+        cosa compress
 
-    - name: cosa build windows
+    - name: create qcow2 containerfile
       run: |
-        cd fcos
-        cosa buildextend-hyperv
+        echo "QCOW_IMAGE=$(ls | grep qcow2.xz)" >> "$GITHUB_ENV"
+        cat > Containerfile.qcow2 << EOF
+        FROM scratch
+        COPY ./builds/latest/x86_64/${{ env.QCOW_IMAGE }} ${{ env.$QCOW_IMAGE }}
+        EOF
+
+    - name: Build FCOS Image with qcow2
+      id: build_image_multiarch
+      # Ref: https://github.com/redhat-actions/buildah-build
+      uses: redhat-actions/buildah-build@v2
+      with:
+        image: podman-machine-images
+        tags: 5.0-qemu
+        archs: x86_64
+        containerfiles: Containerfile.qcow2
+        labels: |
+          org.opencontainers.image.title=fcos-podman-next qcow2 image
+          #org.opencontainers.image.source=https://raw.githubusercontent.com/${{ github.repository }}/${{ github.sha }}/contrib/podman-next/fcos-podmanimage/Containerfile
+          #org.opencontainers.image.url=https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
+          #org.opencontainers.image.description=FCOS image with rpms from rhcontainerbot/podman-next copr
+          #org.opencontainers.image.revision=${{ github.sha }}
 
-    - name: podman build 3 images with containerfile
 
     - name: podman manifest create
+      run: podman manifest create quay.io/podman/machine-images:5.0
 
     - name: podman manifest add 3 images
+      run: podman manifest add quay.io/podman/machine-images:5.0 quay.io/podman/machine-images:5.0-qemu
 
-    - name: push 3 images to quay
+        #- name: push 3 images to quay