diff --git a/.gitmodules b/.gitmodules
index b69834a10a34..25bf39c695f3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -109,3 +109,6 @@
 [submodule "src/modules/secure_udp_proxy"]
 	path = src/modules/secure_udp_proxy
 	url = git@github.com:tiiuae/secure-udp-proxy.git
+[submodule "src/drivers/imx9_keystore"]
+	path = src/drivers/imx9_keystore
+	url = git@github.com:tiiuae/imx9_keystore.git
diff --git a/clone_public.sh b/clone_public.sh
index 6731dac61b3f..8ad367957616 100755
--- a/clone_public.sh
+++ b/clone_public.sh
@@ -8,6 +8,7 @@ do
   [[ "${repo}" == *saluki-sec-scripts ]] || \
   [[ "${repo}" == *pfsoc_crypto ]]  || \
   [[ "${repo}" == *pfsoc_keystore ]]  || \
+  [[ "${repo}" == *imx9_keystore ]]  || \
   [[ "${repo}" == *pf_crypto ]] || \
   [[ "${repo}" == *px4_fw_update_client ]] || \
   [[ "${repo}" == *secure_udp ]] || \
diff --git a/src/drivers/imx9_keystore b/src/drivers/imx9_keystore
new file mode 160000
index 000000000000..9df673d91b79
--- /dev/null
+++ b/src/drivers/imx9_keystore
@@ -0,0 +1 @@
+Subproject commit 9df673d91b796ccaefdd92e4a8cbd28b2f365edd