diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d2ca485..e1f9667 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -29,7 +29,7 @@ jobs:
         working-directory: ${{ env.working-directory }} 
         run: |
           bash build-docker.sh
-          echo ::set-output name=filename::$(ls deploy/*.tar.xz | xargs -n 1 basename)
+          echo ::set-output name=filename::$(ls deploy/*.img.xz | xargs -n 1 basename)
       - name: Fix Permissions
         id: fix_perm_filename
         run: |
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index 7a66b51..3f58f75 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -26,7 +26,7 @@ jobs:
         working-directory: ${{ env.working-directory }} 
         run: |
           bash build-docker.sh
-          echo ::set-output name=filename::$(ls deploy/*.tar.xz | xargs -n 1 basename)
+          echo ::set-output name=filename::$(ls deploy/*.img.xz | xargs -n 1 basename)
       - name: Fix Permissions
         id: fix_perm_filename
         run: |
diff --git a/builder/export-image/04-finalise/01-run.sh b/builder/export-image/04-finalise/01-run.sh
index a2bff5e..ca08af0 100755
--- a/builder/export-image/04-finalise/01-run.sh
+++ b/builder/export-image/04-finalise/01-run.sh
@@ -86,13 +86,12 @@ unmount_image "${IMG_FILE}"
 
 mkdir -p "${DEPLOY_DIR}"
 
-rm -f "${DEPLOY_DIR}/${ZIP_FILENAME}${IMG_SUFFIX}.tar.xz"
+rm -f "${DEPLOY_DIR}/${ZIP_FILENAME}${IMG_SUFFIX}.img.xz"
 rm -f "${DEPLOY_DIR}/${IMG_FILENAME}${IMG_SUFFIX}.img"
 
 if [ "${DEPLOY_ZIP}" == "1" ]; then
 	pushd "${STAGE_WORK_DIR}" > /dev/null
-	tar -cJf "${DEPLOY_DIR}/${ZIP_FILENAME}${IMG_SUFFIX}.tar.xz" \
-		"$(basename "${IMG_FILE}")"
+	xz -c "$(basename "${IMG_FILE}")" > "${DEPLOY_DIR}/${ZIP_FILENAME}${IMG_SUFFIX}.img.xz"
 	popd > /dev/null
 	rm -f "${DEPLOY_DIR}/${IMG_FILENAME}${IMG_SUFFIX}.img"
 else