diff --git a/services/api-gateway/Dockerfile b/services/api-gateway/Dockerfile
index 6b596daf68f61d7c8eaca07a89c60d44298fc357..f40464af80ca4887df946d9303eb26fa4e64eeef 100644
--- a/services/api-gateway/Dockerfile
+++ b/services/api-gateway/Dockerfile
@@ -56,7 +56,8 @@ COPY sudoers /etc/sudoers
 # Code
 #------------------------
 
-COPY esap-api-gateway /opt/esap-api-gateway
+RUN cd /opt && git clone https://git.astron.nl/astron-sdc/esap-api-gateway.git
+RUN cd /opt/esap-api-gateway && git pull && git checkout 74188b358615fd4e8f0fc60dfa6a19d2f38426ab
 RUN chown -R esap:esap /opt/esap-api-gateway
 
 
diff --git a/services/api-gateway/run_api-gateway.sh b/services/api-gateway/run_api-gateway.sh
index a3d95069aebbc1eea88a87347ebd01b4e32e2305..7355d289c7c485cba599a2f8abbe2dd8db564001 100644
--- a/services/api-gateway/run_api-gateway.sh
+++ b/services/api-gateway/run_api-gateway.sh
@@ -30,9 +30,6 @@ if [[ "x$EXIT_CODE" != "x0" ]] ; then
 fi
 echo ""
 
-# Hopefully this will not stay here long
-#DJANGO_DEV_SERVER=True
-
 if [[ "x$DJANGO_DEV_SERVER" == "xTrue" ]] ; then
     
     # Run the development server