diff --git a/script/build_package.sh b/script/build_package.sh
index f4ea34b..26294e0 100755
--- a/script/build_package.sh
+++ b/script/build_package.sh
@@ -1136,8 +1136,10 @@
 
 	pushd "$scp_root"
 
+	eval cmsis_dir="$(git submodule status | awk 'NR==1{print $2}')"
+
 	# Use filer submodule as a reference if it exists
-	if [ -d "$SCP_CHECKOUT_LOC/cmsis" ]; then
+	if [ -d "$SCP_CHECKOUT_LOC/$cmsis_dir" ]; then
 		cmsis_reference="--reference $SCP_CHECKOUT_LOC/cmsis"
 	fi
 
diff --git a/script/clone_repos.sh b/script/clone_repos.sh
index 0f0b3bc..c05046e 100755
--- a/script/clone_repos.sh
+++ b/script/clone_repos.sh
@@ -439,8 +439,11 @@
 		cmsis_reference="--reference $cmsis_ref_repo"
 	fi
 	git submodule -q update $cmsis_reference --init
+
+	eval cmsis_dir="$(git submodule status | awk 'NR==1{print $2}')"
+
 	# Workaround while fixing permissions on /arm/projectscratch/ssg/trusted-fw/ref-repos/cmsis
-	cd cmsis
+	cd $cmsis_dir
 	code_cov_emit_param "CMSIS" "URL" "$(git remote -v | grep fetch |  awk '{print $2}')"
 	code_cov_emit_param "CMSIS" "COMMIT" "$(git rev-parse HEAD)"
 	code_cov_emit_param "CMSIS" "REFSPEC" "master"