diff --git a/Dockerfile-dev b/Dockerfile
similarity index 97%
rename from Dockerfile-dev
rename to Dockerfile
index c87f068327dc27b454f8924cecc3b0c29af367cd..44b9f0f6da4222934bb88bc47e05dbf9566f8ae1 100644
--- a/Dockerfile-dev
+++ b/Dockerfile
@@ -66,15 +66,10 @@ RUN ln -s /etc/apache2/conf-available/eccs.conf /etc/apache2/conf-enabled/eccs.c
 EXPOSE 80
 EXPOSE 443
 
-#CMD tail -f /dev/null
-
 #SUPERVISOR
 COPY supervisord.conf /etc/supervisor/supervisord.conf
 RUN  mkdir -p /var/run/supervisord
-#RUN mkdir -p /var/log/supervisor \
-#    && chmod -R 0755 /var/log/supervisor
 
 COPY start.sh /start.sh
 RUN chmod +x /start.sh
 CMD /start.sh
-
diff --git a/README-Docker.rst b/README-Docker.rst
index 6627dcc86120194f6dd907e26affac72e97f02b7..5870a8de82b1859452556f26efbfee01a43c12e5 100644
--- a/README-Docker.rst
+++ b/README-Docker.rst
@@ -52,10 +52,12 @@ Container Registry Authentication
 
 ``docker login gitlab.software.geant.org:5050``
 
+You need to create a Token if Federated access is used.
+
 Build a new docker container image
 ----------------------------------
 
-``docker build -t gitlab.software.geant.org:5050/edugain/eccs -f Dockerfile .``
+``docker build -t gitlab.software.geant.org:5050/edugain/eccs:MAJOR.MINOR.PATCH -f Dockerfile .``
 
 Load a container image to the Container Registry
 ------------------------------------------------