diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c55845f345cfcaab3818277a1b264731ea6dd808..b7325fc937bc267dd3cf1afc03a5974e5362cda3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,7 +15,10 @@ workflow:
 
 variables:
   GIT_STRATEGY: clone
-  GIT_SUBMODULE_STRATEGY: recursive
+  GIT_DEPTH: 1
+  GIT_SUBMODULE_STRATEGY: none
+  GIT_SUBMODULE_DEPTH: 1
+
   PACKAGES_TO_CHECK: "tests/ beekeepy/"
   # colors:
   TXT_BLUE: "\e[1;34m"
@@ -83,6 +86,7 @@ prepare_hived_image:
   needs: []
   stage: build
   variables:
+    GIT_SUBMODULE_STRATEGY: recursive
     SUBMODULE_DIR: "$CI_PROJECT_DIR/hive"
     REGISTRY_USER: "$HIVED_CI_IMGBUILDER_USER"
     REGISTRY_PASS: $HIVED_CI_IMGBUILDER_PASSWORD