diff --git a/docker/README.md b/docker/README.md
index 333ce11999dea1fdc994ce8fe50012257e49b77f..6d6904275c506204d9c83f522c5ff344544d9cbf 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -102,15 +102,17 @@ cd moringa
 
 docker login gitlab-registry.irstea.fr
 
-# OTB base image, example with tag 7.2.0 (default value is release-7.2)
+# OTB base image, example with tag 7.2.0 (default value is release-7.2) 
+# It is located in subregistry gitlab-registry.irstea.fr/raffaele.gaetano/moringa/base
 docker build --build-arg OTB_BRANCH=7.2.0 -f docker/base-otb/Dockerfile \
-    -t gitlab-registry.irstea.fr/raffaele.gaetano/moringa:base-focal-otb72 .
-docker push gitlab-registry.irstea.fr/raffaele.gaetano/moringa:base-focal-otb72
+    -t gitlab-registry.irstea.fr/raffaele.gaetano/moringa/base:focal-otb72 .
+docker push gitlab-registry.irstea.fr/raffaele.gaetano/moringa/base:focal-otb72
 
-# Tag 'base-otb' == default base image for the moringa build
-docker tag gitlab-registry.irstea.fr/raffaele.gaetano/moringa:base-focal-otb72 \
-    gitlab-registry.irstea.fr/raffaele.gaetano/moringa:base-otb
-docker push gitlab-registry.irstea.fr/raffaele.gaetano/moringa:base-otb
+# Tag 'moringa/base:latest' == default base image for the moringa build
+docker tag gitlab-registry.irstea.fr/raffaele.gaetano/moringa/base:focal-otb72 \
+    gitlab-registry.irstea.fr/raffaele.gaetano/moringa/base:latest
+# Latest is default tag
+docker push gitlab-registry.irstea.fr/raffaele.gaetano/moringa/base
 
 # MORINGA build from the default 'base-otb' image
 # You don't need to rebuild OTB if you just want to update moringa files using current branch / local commits
@@ -120,8 +122,8 @@ docker push gitlab-registry.irstea.fr/raffaele.gaetano/moringa:latest
 
 # Build with custom ubuntu base image
 docker build --build-arg BASE_IMG=ubuntu:18.04 -f docker/base-otb/Dockerfile \
-    -t gitlab-registry.irstea.fr/raffaele.gaetano/moringa:base-bionic-otb72 .
-docker push gitlab-registry.irstea.fr/raffaele.gaetano/moringa:base-bionic-otb72
+    -t gitlab-registry.irstea.fr/raffaele.gaetano/moringa/base:bionic-otb72 .
+docker push gitlab-registry.irstea.fr/raffaele.gaetano/moringa/base:bionic-otb72
 ```
 
 ### Fix volume ownership issue (required if host's UID > 1000)
diff --git a/docker/moringa/Dockerfile b/docker/moringa/Dockerfile
index b9d5df5fdce4f783a96444a076b6683c0c373dc6..108668c1a326c8b653c9ff4e6bbdc4b545fc88bd 100644
--- a/docker/moringa/Dockerfile
+++ b/docker/moringa/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMG=gitlab-registry.irstea.fr/raffaele.gaetano/moringa:base
+ARG BASE_IMG=gitlab-registry.irstea.fr/raffaele.gaetano/moringa/base:latest
 FROM $BASE_IMG
 LABEL description="A container for the MORINGA processing chain, CIRAD/UMR TETIS"