diff --git a/.gitmodules b/.gitmodules
index 162243e..e052d2e 100755
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,12 @@
 [submodule "modules/qmining/qmining-page"]
 	path = submodules/qmining-page
     url = git@gitlab.com:MrFry/qmining-page.git
+    update = merge
 [submodule "modules/dataEditor/qmining-data-editor"]
 	path = submodules/qmining-data-editor
     url = git@gitlab.com:MrFry/qmining-data-editor.git
+    update = merge
 [submodule "qminingPublic/moodle-test-userscript"]
 	path = submodules/moodle-test-userscript
     url = git@gitlab.com:MrFry/moodle-test-userscript.git
+    update = merge
diff --git a/scripts/setup.sh b/scripts/setup.sh
index d5d8b4e..3f49400 100755
--- a/scripts/setup.sh
+++ b/scripts/setup.sh
@@ -64,7 +64,7 @@ cp -r ./defaultPublicFiles/* ./publicDirs/qminingPublic/
 # ------------------------------------------------------------------------------------
 log 'Updating / Cloning project'
 git pull || exit 1
-git submodule update --init --recursive || exit 1
+git submodule update --init --recursive --remote || exit 1
 
 # ------------------------------------------------------------------------------------
 # DB-s