diff --git a/.github/workflows/build-multi-stage.yaml b/.github/workflows/build-multi-stage.yaml
index 9dd416e3cf1..7af6cbd2693 100644
--- a/.github/workflows/build-multi-stage.yaml
+++ b/.github/workflows/build-multi-stage.yaml
@@ -25,3 +25,19 @@ jobs:
         # yamllint disable-line rule:line-length
         if: ${{ contains(github.event.pull_request.labels.*.name, 'ci/skip/multi-arch-build') }}
         run: make containerized-build
+      - name: Build binary
+        run: |
+          echo "creating images cache..."
+          docker save hub.easystack.io/captain/cephcsi:v3.9.0-es| pigz > ceph-csi-x86.tar.gz
+          docker save hub.easystack.io/arm64v8/cephcsi:v3.9.0-es| pigz > ceph-csi-arm.tar.gz
+      - name: cache x86 image
+        uses: actions/upload-artifact@v2
+        with:
+          name: ceph-csi-x86.tar.gz
+          path: ceph-csi-x86.tar.gz
+      - name: cache arm image
+        uses: actions/upload-artifact@v2
+        with:
+          name: ceph-csi-arm.tar.gz
+          path: ceph-csi-arm.tar.gz
+      
diff --git a/.gitkeep b/.gitkeep
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/Makefile b/Makefile
index cb872e0dcfb..7f5c97ee564 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,15 @@ ifeq ($(HAVE_CPUSET),1)
     CPUSET ?= --cpuset-cpus=0-${CPUS}
 endif
 
-CSI_IMAGE_NAME=$(if $(ENV_CSI_IMAGE_NAME),$(ENV_CSI_IMAGE_NAME),hub.easystack.io/captain/cephcsi)
+
+ifeq ($(GOARCH),amd64)
+    CSI_IMAGE_NAME=hub.easystack.io/captain/cephcsi
+else ifeq ($(GOARCH),arm64)
+    CSI_IMAGE_NAME=hub.easystack.io/arm64v8/cephcsi
+else
+    CSI_IMAGE_NAME=hub.easystack.io/arm64v8/cephcsi
+endif
+
 CSI_IMAGE_VERSION=$(shell . $(CURDIR)/build.env ; echo $${CSI_IMAGE_VERSION})
 CSI_IMAGE=$(CSI_IMAGE_NAME):$(CSI_IMAGE_VERSION)