diff --git a/b9/lib/package_storage_gcs.sh b/b9/lib/package_storage_gcs.sh
index d731e66c..1089405a 100644
--- a/b9/lib/package_storage_gcs.sh
+++ b/b9/lib/package_storage_gcs.sh
@@ -12,9 +12,9 @@ _d9_package_upload_gcs() {
     
     pushd $WORKDIR/.. &> /dev/null
 
-    TMP_TAR=$(mktemp -d b9-package-XXXXXXXXXXXXX --tmpdir=$TMP)/$VERSION.tar.xz
+    TMP_TAR=$(mktemp b9-package-XXXXXXXXXXXXX --tmpdir=$TMP --suffix=.tar.xz)
     tar --transform="s/^$(basename $WORKDIR)/$VERSION/" -cJf $TMP_TAR $(basename $WORKDIR)
-    gsutil cp $TMP_TAR gs://cloud9_ci_cache
+    gsutil cp $TMP_TAR gs://cloud9_ci_cache/$VERSION.tar.xz
     mv $TMP_TAR $TMP/$VERSION.tar.xz
     
     popd &> /dev/null