diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4448db806..631aed4f2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@ variables:
 .setup_idf: &setup_idf
     # - cd $REPOS_PATH      # IDF_PATH is set to something else already?
     # using release/v4.4 branch of espressif/esp-idf github repo
-    - git clone --recursive -b release/v4.4 --reference-if-able /local_references/github/ https://github.com/espressif/esp-idf.git
+    - git clone --recursive --single-branch -b v4.4.1 --reference-if-able /local_references/github/ https://github.com/espressif/esp-idf.git
     - cd esp-idf
     - ./install.sh
     - . export.sh
diff --git a/.gitmodules b/.gitmodules
index 8ae0c1616..908740f27 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "connectedhomeip"]
+[submodule "connectedhomeip/connectedhomeip"]
 	path = connectedhomeip/connectedhomeip
 	url = https://github.com/espressif/connectedhomeip.git