diff --git a/lib/configuration.sh b/lib/configuration.sh
index 3a7ce0ecd..2b77fcca0 100644
--- a/lib/configuration.sh
+++ b/lib/configuration.sh
@@ -47,17 +47,11 @@ fi
 
 # image artefact destination with or without subfolder
 FINALDEST=$DEST/images
-if [[ "${MAKE_FOLDERS}" == yes ]]; then
-
-	if [[ "$RC" == yes ]]; then
-		FINALDEST=$DEST/images/"${BOARD}"/rc
-	elif [[ "$BETA" == yes ]]; then
-		FINALDEST=$DEST/images/"${BOARD}"/nightly
-	else
-		FINALDEST=$DEST/images/"${BOARD}"/archive
-	fi
+if [[ -n "${MAKE_FOLDERS}" ]]; then
 
+	FINALDEST=$DEST/images/"${BOARD}"/"${MAKE_FOLDERS}"
 	install -d ${FINALDEST}
+
 fi