diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5963360eb678c85f6ec2b8eb95516964931f4cad..9e6d0a6889f1ce706c792dada7a2a1d12e79b746 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,9 @@ build_image:
   services:
     - docker:18.09.7-dind
   script:
-    - docker build -t $CI_REGISTRY_IMAGE .
+    - if [ "$CI_COMMIT_REF_NAME" == "master" ]; then TAG="latest"; else TAG="develop"; fi
+    - docker build -t $CI_REGISTRY_IMAGE:$TAG .
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    - docker push $CI_REGISTRY_IMAGE
+    - docker push $CI_REGISTRY_IMAGE:$TAG
+
 
diff --git a/httpd.conf b/httpd.conf
index 4f04ee424295fbb2d66c2e329be0995bbe0280bc..11190d72b8020e5350d3c689dfcd976c4592af9b 100644
--- a/httpd.conf
+++ b/httpd.conf
@@ -550,5 +550,5 @@ SSLRandomSeed connect builtin
 </IfModule>
 
 ProxyPreserveHost On
-ProxyPass /lexp/ http://lexp_service:8080/lex/
-ProxyPassReverse /lexp/ http://lexp_service:8080/lex/
\ No newline at end of file
+ProxyPass /lexp/ http://lexpservice:80/lex/
+ProxyPassReverse /lexp/ http://lexpservice:80/lex/
\ No newline at end of file