diff --git a/create_tarball.sh b/create_tarball.sh
index 0a7669f73f..2dee665060 100755
--- a/create_tarball.sh
+++ b/create_tarball.sh
@@ -26,7 +26,8 @@ if [ ! -d ${software_dir} ]; then
     exit 2
 fi
 
-overlay_upper_dir="${eessi_tmpdir}/overlay-upper"
+cvmfs_repo_name=${cvmfs_repo#/cvmfs/}
+overlay_upper_dir="${eessi_tmpdir}/${cvmfs_repo_name}/overlay-upper"
 
 software_dir_overlay="${overlay_upper_dir}/versions/${eessi_version}"
 if [ ! -d ${software_dir_overlay} ]; then