diff --git a/.gitmodules b/.gitmodules
index 2b69b903c91..00d9187a13a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,9 +13,9 @@
 [submodule "docs"]
 	path = docs
 	url = https://github.com/geonetwork/core-doc-sources.git
-[submodule "geoserver"]
-	path = geoserver
-	url = https://github.com/geonetwork/core-geoserver.git
 [submodule "web-itest/webspecs"]
 	path = web-itest/webspecs
 	url = https://github.com/camptocamp/webspecs.git
+[submodule "geoserver"]
+	path = geoserver
+	url = https://github.com/geonetwork/core-geoserver.git
diff --git a/geoserver b/geoserver
new file mode 160000
index 00000000000..761be66180f
--- /dev/null
+++ b/geoserver
@@ -0,0 +1 @@
+Subproject commit 761be66180fd7c2d8ec0952f56b0082422d5e04c
diff --git a/maven_repo b/maven_repo
index 3a7ddf615f8..2d6c678f2ff 160000
--- a/maven_repo
+++ b/maven_repo
@@ -1 +1 @@
-Subproject commit 3a7ddf615f8410fa97933fcc5e2ec6729d4a0e76
+Subproject commit 2d6c678f2ffae001e9381104d73c7abc6424ac0f