diff --git a/.github/workflows/Containerfile b/.github/workflows/Containerfile
index 8113994..c10c49e 100644
--- a/.github/workflows/Containerfile
+++ b/.github/workflows/Containerfile
@@ -3,3 +3,7 @@ FROM ghcr.io/siemens/kas/kas:latest
 LABEL org.opencontainers.image.source https://github.com/HULKs/meta-nao
 
 COPY aldebaran_binaries.tar.gz /
+
+RUN sudo apt-get update && sudo apt-get install --no-install-recommends --yes \
+  buildah \
+  qemu-user-static
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index 5dda0d3..c0822c7 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -20,12 +20,29 @@ jobs:
         run: kas checkout meta-nao/kas/base.yml:meta-nao/kas/hulks.yml
       - name: Populate aldebaran_binaries.tar.gz
         run: mkdir -p meta-nao/meta/recipes-support/aldebaran/aldebaran-binaries/ && cp /aldebaran_binaries.tar.gz meta-nao/meta/recipes-support/aldebaran/aldebaran-binaries/
-      - name: Build image
+      - name: Build NAO image
         run: kas build --target nao-image --cmd build meta-nao/kas/base.yml:meta-nao/kas/hulks.yml
       - name: Build SDK (x86_64)
         run: kas build --target nao-image --cmd populate_sdk meta-nao/kas/base.yml:meta-nao/kas/hulks.yml
       - name: Build SDK (aarch64)
         run: kas build --target nao-image --cmd populate_sdk meta-nao/kas/base.yml:meta-nao/kas/hulks.yml:meta-nao/kas/aarch64.yml
+      - name: Build development image
+        id: build-image
+        uses: redhat-actions/buildah-build@v2
+        with:
+          image: naosdk
+          tags: latest ${{ github.sha }} ${{ github.ref_name }}
+          archs: amd64, arm64
+          containerfiles: ./Containerfile
+          build-args: version=${{ github.ref_name }}
+      - name: Push development image to ghcr.io
+        uses: redhat-actions/push-to-registry@v2
+        with:
+          image: ${{ steps.build-image.outputs.image }}
+          tags: ${{ steps.build-image.outputs.tags }}
+          registry: ghcr.io/${{ github.repository_owner }}
+          username: ${{ github.actor }}
+          password: ${{ github.token }}
       - name: Release
         uses: softprops/action-gh-release@v2
         with: