diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
index d63b10077..bb9e2c12e 100644
--- a/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@@ -98,8 +98,10 @@ jobs:
           path: |
             build-logs
       - name: Setup rclone
+        if: ${{ secrets.DO_SPACE_ACCESS_KEY != '' && secrets.DO_SPACE_SECRET_KEY != '' }}
         uses: AnimMouse/setup-rclone@v1
       - name: Copy Packages to repo
+        if: ${{ secrets.DO_SPACE_ACCESS_KEY != '' && secrets.DO_SPACE_SECRET_KEY != '' }}
         env:
           RCLONE_CONFIG_REPO_PROVIDER: DigitalOcean
           RCLONE_CONFIG_REPO_TYPE: s3
@@ -127,3 +129,12 @@ jobs:
           fi
 
           rclone copy latest_release repo:nethsecurity/${{ inputs.repo_channel }}/ --progress
+      - name: Archive packages (no repo secrets available)
+        if: ${{ secrets.DO_SPACE_ACCESS_KEY == '' || secrets.DO_SPACE_SECRET_KEY == '' }}
+        run: tar -czf packages.tar.gz -C bin packages
+      - name: Upload packages archive
+        if: ${{ secrets.DO_SPACE_ACCESS_KEY == '' || secrets.DO_SPACE_SECRET_KEY == '' }}
+        uses: actions/upload-artifact@v7
+        with:
+          name: packages-archive
+          path: packages.tar.gz