diff --git a/src/dlt/.gitlab-ci.yml b/src/dlt/.gitlab-ci.yml
index 3c2013f50904eb9cd366bf3e3b3cfce6d10c6fd6..5d9875ef9e1f5373072e3321397499bc91bb2328 100644
--- a/src/dlt/.gitlab-ci.yml
+++ b/src/dlt/.gitlab-ci.yml
@@ -109,20 +109,32 @@ unit test dlt-connector:
     - build dlt
   before_script:
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
-    - if docker network list | grep teraflowbridge; then echo "teraflowbridge is already created"; else docker network create --driver=bridge --subnet=172.28.0.0/24 --gateway=172.28.0.254 teraflowbridge; fi
+    - if docker network list | grep teraflowbridge; then echo "teraflowbridge is already created"; else docker network create --driver=bridge teraflowbridge; fi
     - if docker container ls | grep ${IMAGE_NAME}-connector; then docker rm -f ${IMAGE_NAME}-connector; else echo "${IMAGE_NAME}-connector image is not in the system"; fi
     - if docker container ls | grep ${IMAGE_NAME}-gateway; then docker rm -f ${IMAGE_NAME}-gateway; else echo "${IMAGE_NAME}-gateway image is not in the system"; fi
   script:
     - docker pull "$CI_REGISTRY_IMAGE/${IMAGE_NAME}-connector:$IMAGE_TAG"
     - docker pull "$CI_REGISTRY_IMAGE/${IMAGE_NAME}-gateway:$IMAGE_TAG"
-    - docker run --name ${IMAGE_NAME}-gateway -d -p 50051:50051 -v "$PWD/src/${IMAGE_NAME}/gateway/tests:/opt/results" --network=teraflowbridge --ip 172.28.0.1 $CI_REGISTRY_IMAGE/${IMAGE_NAME}-gateway:$IMAGE_TAG
+    - >
+      docker run --name ${IMAGE_NAME}-gateway -d -p 50051:50051 --network=teraflowbridge
+      --volume "$PWD/src/${IMAGE_NAME}/gateway/tests:/opt/results"
+      $CI_REGISTRY_IMAGE/${IMAGE_NAME}-gateway:$IMAGE_TAG
+    - DLT_GATEWAY_HOST=$(docker inspect ${IMAGE_NAME}-gateway --format "{{.NetworkSettings.Networks.teraflowbridge.IPAddress}}")
+    - echo $DLT_GATEWAY_HOST
     - sleep 1
-    - docker run --name ${IMAGE_NAME}-connector -d -p 8080:8080 --env "DLT_GATEWAY_HOST=172.28.0.1" --env "DLT_GATEWAY_PORT=50051" -v "$PWD/src/${IMAGE_NAME}/connector/tests:/opt/results" --network=teraflowbridge --ip 172.28.0.2 $CI_REGISTRY_IMAGE/${IMAGE_NAME}-connector:$IMAGE_TAG
+    - >
+      docker run --name ${IMAGE_NAME}-connector -d -p 8080:8080 --network=teraflowbridge
+      --volume "$PWD/src/${IMAGE_NAME}/connector/tests:/opt/results"
+      --env "DLT_GATEWAY_HOST=${DLT_GATEWAY_HOST}"
+      --env "DLT_GATEWAY_PORT=50051"
+      $CI_REGISTRY_IMAGE/${IMAGE_NAME}-connector:$IMAGE_TAG
     - sleep 5
     - docker ps -a
     - docker logs ${IMAGE_NAME}-connector
     - docker logs ${IMAGE_NAME}-gateway
-    - docker exec -i ${IMAGE_NAME}-connector bash -c "coverage run -m pytest --log-level=INFO --verbose $IMAGE_NAME/connector/tests/test_unitary.py --junitxml=/opt/results/${IMAGE_NAME}-connector_report.xml"
+    - >
+      docker exec -i ${IMAGE_NAME}-connector bash -c
+      "coverage run -m pytest --log-level=INFO --verbose $IMAGE_NAME/connector/tests/test_unitary.py --junitxml=/opt/results/${IMAGE_NAME}-connector_report.xml"
     - docker exec -i ${IMAGE_NAME}-connector bash -c "coverage report --include='${IMAGE_NAME}/*' --show-missing"
   coverage: '/TOTAL\s+\d+\s+\d+\s+(\d+%)/'
   after_script: