diff --git a/package.sh b/package.sh
index 00dd8c3d..8b4b2b1c 100755
--- a/package.sh
+++ b/package.sh
@@ -69,13 +69,13 @@ for platform in "linux/amd64" "linux/arm64"; do
   fi
 
   # add files
-  mkdir ${STAGING_DIR}
-  cp ${PROJECT_ROOT}/install.sh ${STAGING_DIR}/
-  cp -a ${PROJECT_ROOT}/root ${STAGING_DIR}/
+  PACKAGE_ROOT=${STAGING_DIR}/${OUTPUT_NAME}
+  IMAGES_DIR=${PACKAGE_ROOT}/images
+  mkdir -p ${IMAGES_DIR}
+  cp ${PROJECT_ROOT}/install.sh ${PACKAGE_ROOT}/
+  cp -a ${PROJECT_ROOT}/root ${PACKAGE_ROOT}/
 
   # add images
-  IMAGES_DIR=${STAGING_DIR}/images
-  mkdir -p ${IMAGES_DIR}
   i=0
   # read image list from file (e.g. 'images-aarch64')
   # images are listed as SAVED_TAG=SOURCE_IMAGE
@@ -97,7 +97,7 @@ for platform in "linux/amd64" "linux/arm64"; do
   rm -rf $OUTPUT_PATH
 
   pushd $STAGING_DIR  > /dev/null
-  tar -cjf $OUTPUT_PATH *
+  tar -cjf $OUTPUT_PATH ${OUTPUT_NAME}
   popd > /dev/null
 
   # cleanup staging files