diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml
index 70f443ec67..3cfab30f30 100644
--- a/.github/workflows/nightly.yaml
+++ b/.github/workflows/nightly.yaml
@@ -14,7 +14,7 @@ jobs:
       - name: Install required packages
         run: sudo apt install build-essential qemu-user qemu-user-static  
 
-      - name: launch build
+      - name: launch build image
         run: make build-containerized-cross-build
 
       - name: move binary
@@ -27,6 +27,19 @@ jobs:
       - name: generate checksum
         run: sha256sum ./microshift-linux-amd64 ./microshift-linux-arm64 >> ./release.sha256
 
+      - name: launch build all-in-one
+        run: make build-containerized-all-in-one-cross-build
+
+      - name: move binary
+        run: |
+          aio-arm=$(podman images | grep aio | grep arm64 | awk '{print $3}')
+          aio-amd=$(podman images | grep aio | grep amd | awk '{print $3}')
+          podman cp $(podman create --rm $arm):/usr/bin/microshift ./microshift-aio-linux-arm64
+          podman cp $(podman create --rm $amd):/usr/bin/microshift ./microshift-aio-linux-amd64
+
+      - name: generate checksum
+        run: sha256sum ./microshift-aio-linux-amd64 ./microshift-aio-linux-arm64 >> ./release.sha256
+
       - name: post nightly release
         uses: "marvinpinto/action-automatic-releases@latest"
         with:
@@ -37,4 +50,6 @@ jobs:
           files: |
             microshift-linux-amd64
             microshift-linux-arm64
+            microshift-aio-linux-amd64
+            microshift-aio-linux-arm64
             release.sha256
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 68515d0fc0..cecc5fcfef 100644
--- a/Makefile
+++ b/Makefile
@@ -196,6 +196,11 @@ build-containerized-all-in-one-arm64:
 	+$(MAKE) _build_containerized_aio ARCH=arm64
 .PHONY: build-containerized-all-in-one
 
+build-containerized-all-in-one-cross-build:
+	+$(MAKE) build-containerized-all-in-one-amd64
+	+$(MAKE) build-containerized-all-in-one-arm64
+.PHONY: build-containerized-all-in-one-cross-build
+
 build-containerized-all-in-one-iptables-arm64:
 	+$(MAKE) _build_containerized_aio ARCH=arm64 IPTABLES=iptables
 .PHONY: build-containerized-all-in-one-iptables-arm64