diff --git a/conan-el6-gcc44-x86/.gitlab-ci.yml b/conan-el6-gcc44-x86/.gitlab-ci.yml
index 47f25aa3d5563fc557a26e3dc24f668047c5ace8..a06a0a3692e8bdb8cc074645eef480c73599998a 100644
--- a/conan-el6-gcc44-x86/.gitlab-ci.yml
+++ b/conan-el6-gcc44-x86/.gitlab-ci.yml
@@ -19,11 +19,12 @@ stages:
     - release
 
 before_script:
-    - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY_EXT} -u ${CI_REGISTRY_USER} --password-stdin
+    - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} --password-stdin
 
 build:
     stage: build
     script:
+        - echo "DOCKER_HOST=$DOCKER_HOST"
         - docker build --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile .
         - docker push ${CONTAINER_TEST_IMAGE}
 
diff --git a/conan-el6-gcc44/.gitlab-ci.yml b/conan-el6-gcc44/.gitlab-ci.yml
index 83be0e3807d23220d44efdd4112622f07c32553d..456b1ba1ada44f93e54fb43ab1b314728ff05a17 100644
--- a/conan-el6-gcc44/.gitlab-ci.yml
+++ b/conan-el6-gcc44/.gitlab-ci.yml
@@ -19,7 +19,7 @@ stages:
     - release
 
 before_script:
-    - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY_EXT} -u ${CI_REGISTRY_USER} --password-stdin
+    - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} --password-stdin
 
 build:
     stage: build
diff --git a/conan-el6-gcc91-x86/.gitlab-ci.yml b/conan-el6-gcc91-x86/.gitlab-ci.yml
index eee5d4fd603a6cc1bd6539df9d2736178a64448c..8da5704a067c383258a9322ca92a75593f9ece98 100644
--- a/conan-el6-gcc91-x86/.gitlab-ci.yml
+++ b/conan-el6-gcc91-x86/.gitlab-ci.yml
@@ -19,7 +19,7 @@ stages:
     - release
 
 before_script:
-    - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY_EXT} -u ${CI_REGISTRY_USER} --password-stdin
+    - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} --password-stdin
 
 build:
     stage: build
diff --git a/conan-el6-gcc91/.gitlab-ci.yml b/conan-el6-gcc91/.gitlab-ci.yml
index 97870b23442ae2b5002470fb7f4c791e920b7519..addb5a9f88d4682b653c7b84643c2e45b58d327a 100644
--- a/conan-el6-gcc91/.gitlab-ci.yml
+++ b/conan-el6-gcc91/.gitlab-ci.yml
@@ -19,7 +19,7 @@ stages:
     - release
 
 before_script:
-    - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY_EXT} -u ${CI_REGISTRY_USER} --password-stdin
+    - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} --password-stdin
 
 build:
     stage: build
diff --git a/conan-el7-gcc112/.gitlab-ci.yml b/conan-el7-gcc112/.gitlab-ci.yml
index 77a866405ad64739c2816a666a17f712f973c11a..e84141da5e23d3d9a15c088060c8bd043ab1145e 100644
--- a/conan-el7-gcc112/.gitlab-ci.yml
+++ b/conan-el7-gcc112/.gitlab-ci.yml
@@ -19,7 +19,7 @@ stages:
     - release
 
 before_script:
-    - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY_EXT} -u ${CI_REGISTRY_USER} --password-stdin
+    - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} --password-stdin
 
 build:
     stage: build
diff --git a/conan-el7-gcc114-conda-forge/.gitlab-ci.yml b/conan-el7-gcc114-conda-forge/.gitlab-ci.yml
index 4ce594b9c0f568dc1bfd88e70dd1ce5cb68d3e5e..0d74aa4b40609d617a217b763e3d974becd28eca 100644
--- a/conan-el7-gcc114-conda-forge/.gitlab-ci.yml
+++ b/conan-el7-gcc114-conda-forge/.gitlab-ci.yml
@@ -19,7 +19,7 @@ stages:
     - release
 
 before_script:
-    - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY_EXT} -u ${CI_REGISTRY_USER} --password-stdin
+    - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} --password-stdin
 
 build:
     stage: build
diff --git a/conan-el7-gcc115/.gitlab-ci.yml b/conan-el7-gcc115/.gitlab-ci.yml
index 590e07b9567668cff77890989796e95874a82605..67c1ca8d1d87592066013e883815ed4cbb4efb29 100644
--- a/conan-el7-gcc115/.gitlab-ci.yml
+++ b/conan-el7-gcc115/.gitlab-ci.yml
@@ -20,8 +20,7 @@ stages:
 
 before_script:
     - echo "${CI_REGISTRY}"
-    - echo "${CI_REGISTRY_EXT}"
-    - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY_EXT} -u ${CI_REGISTRY_USER} --password-stdin
+    - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} --password-stdin
 
 build:
     stage: build
diff --git a/conan-el7-gcc48-x86/.gitlab-ci.yml b/conan-el7-gcc48-x86/.gitlab-ci.yml
index 411f49e635d170bd3ef64dfcc780658f3a1f9ed5..e58d0d867c2c65275320ac5e169061ad12cdee8b 100644
--- a/conan-el7-gcc48-x86/.gitlab-ci.yml
+++ b/conan-el7-gcc48-x86/.gitlab-ci.yml
@@ -19,7 +19,7 @@ stages:
     - release
 
 before_script:
-    - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY_EXT} -u ${CI_REGISTRY_USER} --password-stdin
+    - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} --password-stdin
 
 build:
     stage: build
diff --git a/conan-el7-gcc48/.gitlab-ci.yml b/conan-el7-gcc48/.gitlab-ci.yml
index 3b945f39e37d925d20f7a2ae155d1fefd187ee4a..2d61a0028ebbd279b93ff41fde8f6335c1eec5dd 100644
--- a/conan-el7-gcc48/.gitlab-ci.yml
+++ b/conan-el7-gcc48/.gitlab-ci.yml
@@ -19,7 +19,7 @@ stages:
     - release
 
 before_script:
-    - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY_EXT} -u ${CI_REGISTRY_USER} --password-stdin
+    - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} --password-stdin
 
 build:
     stage: build
diff --git a/conan-el7-gcc93-x86/.gitlab-ci.yml b/conan-el7-gcc93-x86/.gitlab-ci.yml
index b07696a646ed8a7c563d8ce7831ab7d9da48242c..7d30984d125e57d051860a3a609e20440bf06f5f 100644
--- a/conan-el7-gcc93-x86/.gitlab-ci.yml
+++ b/conan-el7-gcc93-x86/.gitlab-ci.yml
@@ -19,7 +19,7 @@ stages:
     - release
 
 before_script:
-    - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY_EXT} -u ${CI_REGISTRY_USER} --password-stdin
+    - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} --password-stdin
 
 build:
     stage: build
diff --git a/conan-el7-gcc93/.gitlab-ci.yml b/conan-el7-gcc93/.gitlab-ci.yml
index 498fa2937ad84d5332a87a277546f12eb06b1f9b..34b351deaca796cea84b73674e47a07f761fde98 100644
--- a/conan-el7-gcc93/.gitlab-ci.yml
+++ b/conan-el7-gcc93/.gitlab-ci.yml
@@ -19,7 +19,7 @@ stages:
     - release
 
 before_script:
-    - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY_EXT} -u ${CI_REGISTRY_USER} --password-stdin
+    - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} --password-stdin
 
 build:
     stage: build
diff --git a/conan-el9-gcc115/.gitlab-ci.yml b/conan-el9-gcc115/.gitlab-ci.yml
index a6d53da470b5d15e7c4c5fed6d153e205bac1c6e..72a43637b3023e829b98820b410c4aed2b2a5706 100644
--- a/conan-el9-gcc115/.gitlab-ci.yml
+++ b/conan-el9-gcc115/.gitlab-ci.yml
@@ -19,7 +19,7 @@ stages:
     - release
 
 before_script:
-    - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY_EXT} -u ${CI_REGISTRY_USER} --password-stdin
+    - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} --password-stdin
 
 build:
     stage: build