diff --git a/build/ci/.build-container.yml b/build/ci/.build-container.yml
index e1e6107d56fe9a6a1f14491641da3bfd9a72f83a..6a88ab817e52e9f601aafe8841aaaa4732a846bb 100644
--- a/build/ci/.build-container.yml
+++ b/build/ci/.build-container.yml
@@ -8,7 +8,7 @@ build-docker:
   allow_failure: false
   needs: []
   tags:
-    - shell-builder
+    - test-shell-builder
 
   rules:
     - if: $CI_COMMIT_BRANCH == "develop" && $CI_NIGHTLY == null
diff --git a/build/ci/.containerlab-ci.yml b/build/ci/.containerlab-ci.yml
index db038c76a60d1f4f5d396f551dd30df08c95aabf..8bcb7158f8e1e0384eccd347285c3e3a81135b62 100644
--- a/build/ci/.containerlab-ci.yml
+++ b/build/ci/.containerlab-ci.yml
@@ -8,7 +8,7 @@ variables:
 .containerlab_deploy: &containerlab_deploy
   stage: apply
   tags:
-    - shell
+    - test-shell
   before_script:
     - cd ${CLAB_DIR}
     - export PATH="${PATH}:${CI_PROJECT_DIR}/build/ci/scripts"
@@ -73,7 +73,7 @@ containerlab:deploy:integration:
 containerlab:destroy:
   stage: .post
   tags:
-    - shell
+    - test-shell
   before_script:
     - cd ${CLAB_DIR}
   script:
@@ -116,7 +116,7 @@ containerlab:deploy:develop:
 containerlab:clean:
   stage: .post
   tags:
-    - shell
+    - test-shell
   before_script:
     - cd ${CLAB_DIR}
   script:
diff --git a/build/ci/.test.yml b/build/ci/.test.yml
index 9531c7717b98bc8d4da7f7aa748247827ce54c53..44476b1e977466904756104d32479bfe53a02d44 100644
--- a/build/ci/.test.yml
+++ b/build/ci/.test.yml
@@ -5,8 +5,8 @@
     - job: "containerlab:deploy:integration"
   variables:
     GOSDN_LOG: "nolog"
-    GOSDN_TEST_API_ENDPOINT: "141.100.70.178:${GOSDN_GRPC_PORT}"
-    GOSDN_TEST_ENDPOINT: "141.100.70.178:${CEOS1_PORT}"
+    GOSDN_TEST_API_ENDPOINT: "192.168.69.133:${GOSDN_GRPC_PORT}"
+    GOSDN_TEST_ENDPOINT: "192.168.69.133:${CEOS1_PORT}"
     GOSDN_TEST_USER: "admin"
     GOSDN_TEST_PASSWORD: "admin"
   rules: