diff --git a/.github/ci_build.sh b/.github/ci_build.sh
index bf05a2a94..89c8a6ab1 100755
--- a/.github/ci_build.sh
+++ b/.github/ci_build.sh
@@ -41,8 +41,19 @@ echo "ROOTFS is: ${rootfs_tarball}"
 
 CMD="./RootStock-NG.sh -c ${target_config}"
 echo "CMD is: ${CMD}"
-#$CMD
-[[ -f deploy/${rootfs_tarball} ]] && ${archive} deploy/${rootfs_tarball}
+echo ""
+
+./RootStock-NG.sh -c ${target_config}
+
+source .project
+if [ ! -f ./deploy/${export_filename}.tar ] ; then
+    echo "Error: deploy/${export_filename}.tar"
+    exit 1
+else
+    echo "Compressing: deploy/${export_filename}.tar"
+    sudo chown $(id -u):$(id -g) ./deploy/${export_filename}.tar || true
+    ${archive} ./deploy/${export_filename}.tar
+fi
 
 if ((failures != 0)); then
     echo "Something went wrong !!!"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c54d06062..d0412e8f8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -48,7 +48,7 @@ jobs:
       - name: Build image
         run: |
           ./.github/ci_build.sh ${{ matrix.dist }} ${{ matrix.suite }}
-          ls -lh deploy/*.tar.xz
+          ls -lh deploy/
 
       - name: Upload image
         uses: actions/upload-artifact@v3