diff --git a/config/sources/families/meson-s4t7.conf b/config/sources/families/meson-s4t7.conf
index 1d27f9e37c..141585abfa 100644
--- a/config/sources/families/meson-s4t7.conf
+++ b/config/sources/families/meson-s4t7.conf
@@ -139,12 +139,14 @@ function kernel_copy_extra_sources__khadas_common_drivers() {
 			rm -rf "${common_drivers_git_bare_tree}"
 		fi
 
-		run_host_command_logged git clone --bare "${COMMON_DRIVERS_SOURCE}" \
-			"${common_drivers_git_bare_tree}"
+		run_host_command_logged git clone  --tags --no-checkout \
+			"${COMMON_DRIVERS_SOURCE}" "${common_drivers_git_bare_tree}"
 
 		touch "${common_drivers_git_bare_tree_done_marker}"
 	fi
 
+	git_ensure_safe_directory "${common_drivers_git_bare_tree}"
+
 	GIT_FIXED_WORKDIR="${LINUXSOURCEDIR}/common_drivers" \
 		GIT_BARE_REPO_FOR_WORKTREE="${common_drivers_git_bare_tree}" \
 		GIT_BARE_REPO_INITIAL_BRANCH="${KERNELBRANCH#*:}" \