diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f7f70ab8278973f0a8ff46b6a566069f2fea5fbe..55b9e977341ffcfc2d9d7e1d088ea98a752b8de9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,7 +23,7 @@ build-zynthbox-image-armhf:
     # Update and install dependencies
     - echo "# Update and install dependencies"
     - apt-get update
-    - apt-get install -y coreutils p7zip-full qemu-user-static sudo git wget curl python3 lsof fdisk xz-utils openssh-client jq
+    - apt-get install -y coreutils p7zip-full qemu-user-static sudo git wget curl python3 lsof fdisk xz-utils openssh-client jq zip
 
     # Build custom base image with Low Latency Kernel with PREEMPT_RT patch
     - git clone https://github.com/guysoft/CustomPiOS.git
@@ -33,9 +33,10 @@ build-zynthbox-image-armhf:
     - ../../CustomPiOS/src/update-custompios-paths
     - bash -x ./build_dist
     - prefix=$(ls workspace/*.img | sed "s|workspace/||;s|-raspios-bullseye-armhf-lite.img||")
-    - mv workspace/*.img "/$prefix_$(date +"%d-%m-%Y")-realtimepi-bullseye-armhf-lite.img"
+    - mv workspace/*.img "/${prefix}_$(date +"%d-%m-%Y")-realtimepi-bullseye-armhf-lite.img"
     - cd /
-    - rm -rf CustomPiOS RealtimePi
+    - zip ${prefix}_$(date +"%d-%m-%Y")-realtimepi-bullseye-armhf-lite.img.zip *.img
+    - rm -rf CustomPiOS RealtimePi *.img
 
     # Clone repositories required to generate image
     - echo "# Clone repositories required to generate image"
@@ -49,7 +50,7 @@ build-zynthbox-image-armhf:
 
     # Use custom base image from above
     - echo "# Using custom base image"
-    - mv *.img ./ZynthianOS/src/image
+    - mv *.zip ./ZynthianOS/src/image
 
     # Build rpi4 image
     - echo "# Build rpi4 image"