diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad817ce..1df263a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
   [Github-2](https://github.com/geostreams/gltg/issues/2)
 - Update BMP results description
   [Github-5](https://github.com/geostreams/gltg/issues/5)
+- Update the build section in Dockerfile
+  [GLTG-7](https://github.com/geostreams/gltg/issues/7)
 
 ## [3.6.0] - 2020-12-14
 
diff --git a/Dockerfile b/Dockerfile
index c8e92f5..f58db3f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,22 @@
 FROM node:14 as build
 
+ARG GEODASHBOARD_VERSION
+ARG GEOSERVER_URL=/geoserver
+ARG GEOSTREAMS_URL=/geostreams
+ARG BMP_API_URL=/bmp-api
+
+ENV GEOSERVER_URL=$GEOSERVER_URL
+ENV GEOSTREAMS_URL=$GEOSTREAMS_URL
+ENV BMP_API_URL=$BMP_API_URL
+
 RUN git clone https://github.com/geostreams/geodashboard.git /tmp/geodashboard
 WORKDIR /tmp/geodashboard
+RUN if [[ -z "${GEODASHBOARD_VERSION}" ]] ; then git switch --detach $GEODASHBOARD_VERSION ; fi
 RUN yarn && yarn link:all
 
 COPY ./ /tmp/gltg/
 WORKDIR /tmp/gltg/
 RUN yarn
-RUN yarn link:geostreams
 RUN yarn build
 
 FROM nginx:stable-alpine