diff --git a/bot/build.sh b/bot/build.sh
index 24549a2a..11b8ec41 100755
--- a/bot/build.sh
+++ b/bot/build.sh
@@ -298,8 +298,8 @@ export EESSI_DEV_PROJECT=${EESSI_DEV_PROJECT}
 TMP_IN_CONTAINER=/tmp
 echo "Executing command to create tarball:"
 echo "$software_layer_dir/eessi_container.sh ${COMMON_ARGS[@]} ${TARBALL_STEP_ARGS[@]}"
-echo "                     -- $software_layer_dir/create_tarball.sh ${TMP_IN_CONTAINER} ${EESSI_VERSION} ${EESSI_SOFTWARE_SUBDIR_OVERRIDE} \"${EESSI_ACCELERATOR_TARGET}\" /eessi_bot_job/${TGZ} 2>&1 | tee -a ${tar_outerr}"
+echo "                     -- $software_layer_dir/create_tarball.sh ${TMP_IN_CONTAINER} ${EESSI_VERSION} ${EESSI_SOFTWARE_SUBDIR_OVERRIDE} \"${EESSI_ACCELERATOR_TARGET_OVERRIDE}\" /eessi_bot_job/${TGZ} 2>&1 | tee -a ${tar_outerr}"
 $software_layer_dir/eessi_container.sh "${COMMON_ARGS[@]}" "${TARBALL_STEP_ARGS[@]}" \
-                     -- $software_layer_dir/create_tarball.sh ${TMP_IN_CONTAINER} ${EESSI_VERSION} ${EESSI_SOFTWARE_SUBDIR_OVERRIDE} "${EESSI_ACCELERATOR_TARGET}" /eessi_bot_job/${TGZ} 2>&1 | tee -a ${tar_outerr}
+                     -- $software_layer_dir/create_tarball.sh ${TMP_IN_CONTAINER} ${EESSI_VERSION} ${EESSI_SOFTWARE_SUBDIR_OVERRIDE} "${EESSI_ACCELERATOR_TARGET_OVERRIDE}" /eessi_bot_job/${TGZ} 2>&1 | tee -a ${tar_outerr}
 
 exit 0
diff --git a/create_tarball.sh b/create_tarball.sh
index 2fe15531..ff465ccf 100755
--- a/create_tarball.sh
+++ b/create_tarball.sh
@@ -62,8 +62,12 @@ if [ -d ${eessi_version}/init ]; then
     find ${eessi_version}/init -type f \! -name '.wh.*' >> ${files_list}
 fi
 
-# consider both CPU-only and accelerator subdirectories
-for subdir in ${cpu_arch_subdir} ${cpu_arch_subdir}/${accel_subdir}; do
+# consider both CPU-only and accelerator subdirectories (if an accelerator was configured)
+sw_subdirs=${cpu_arch_subdir}
+if [ -n ${accel_subdir} ]; then
+    sw_subdirs="${sw_subdirs} ${cpu_arch_subdir}/${accel_subdir}"
+fi
+for subdir in ${sw_subdirs}; do
 
     if [ -d ${eessi_version}/software/${os}/${subdir}/modules ]; then
         # module files