diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9827cce..6aaf0de 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,8 +3,7 @@ docker-build:
   stage: build
   variables:
     DOCKER_IMAGE_NAME: olytest/hermione-fe:$CI_COMMIT_SHORT_SHA
-    LOCAL_DNS: '34.159.118.61 olympus-gateway.gcp.it'
-    VITE_BACKEND_URL: http://olympus-gateway.gcp.it/hermione
+    VITE_BACKEND_URL: http://olympus-gateway-service.olympus.svc.cluster.local:8080/hermione
   before_script:
     - >
       echo  '{
@@ -19,9 +18,7 @@ docker-build:
       --context "${CI_PROJECT_DIR}"
       --dockerfile "${CI_PROJECT_DIR}/Dockerfile"
       --destination "${DOCKER_IMAGE_NAME}"
-      --build-arg "VITE_BACKEND_URL=http://olympus-gateway.gcp.it/hermione"
-      --build-arg "IP_ADDRESS=34.159.118.61"
-      --build-arg "LOCAL_DNS=olympus-gateway.gcp.it"
+      --build-arg "VITE_BACKEND_URL=${VITE_BACKEND_URL}"
   # Run this job in a branch where a Dockerfile exists
   rules:
     - if: $CI_COMMIT_BRANCH
diff --git a/Dockerfile b/Dockerfile
index 4a4d99a..5d8ff99 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,13 +22,6 @@ RUN npm run build
 
 FROM nginx:latest as prod
 
-# Add custom DNS mapping
-ARG LOCAL_DNS
-ARG IP_ADDRESS
-RUN echo "$IP_ADDRESS $LOCAL_DNS" >> /etc/hosts
-
-RUN cat /etc/hosts
-
 COPY --from=builder /usr/src/app/dist /usr/share/nginx/html
 
 CMD ["nginx", "-g", "daemon off;"]