diff --git a/kibot-ci.yml b/kibot-ci.yml
index 2913106..f03a474 100644
--- a/kibot-ci.yml
+++ b/kibot-ci.yml
@@ -7,9 +7,9 @@ workflow:
 
 variables:
   GIT_STRATEGY: clone
-  GIT_SUBMODULE_STRATEGY: recursive
+  GIT_SUBMODULE_STRATEGY: normal
   GIT_SUBMODULE_FORCE_HTTPS: "true"
-  GIT_SUBMODULE_UPDATE_FLAGS: --remote
+  GIT_SUBMODULE_UPDATE_FLAGS: --remote --merge
 
 stages:
   - gen_mech