diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5bca2ca7812ab7625594980f45e5d75925ac9581..dea5b4d0c7ede0eef756738db75bcc8f26920f94 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 shellcheck:
-  image: all-docker-dev.artifact.tecnalia.com/koalaman/shellcheck-alpine
+  image: tecnalia-docker-dev.artifact.tecnalia.com/koalaman/shellcheck-alpine
   script: shellcheck deploy/base/ros_entrypoint.bash scripts/*sh
   tags:
     - docker
@@ -12,7 +12,7 @@ shellcheck:
 # DL3008 Pin versions in apt-get install
 #   A bit overkill
 dockerfiles:
-  image: all-docker-dev.artifact.tecnalia.com/hadolint/hadolint:latest-debian
+  image: tecnalia-docker-dev.artifact.tecnalia.com/hadolint/hadolint:latest-debian
   script:
     - RET=0
     - hadolint --ignore DL3006 --ignore DL3008 deploy/base/Dockerfile || RET=1
@@ -22,7 +22,7 @@ dockerfiles:
     - docker
 
 yamllint:
-  image: all-docker-dev.artifact.tecnalia.com/sdesbure/yamllint
+  image: tecnalia-docker-dev.artifact.tecnalia.com/sdesbure/yamllint
   script: yamllint $(find . -name '*.yml' -o -name '*.yaml')
   tags:
     - docker
diff --git a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
index 0082a50a8d4d153b79e0d7e6c2075e38a1c820c9..62146e17067bbc3656c6561bafa5bfe1260ba185 100644
--- a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
@@ -1,11 +1,11 @@
-image: all-docker-dev.artifact.tecnalia.com/docker:git
+image: tecnalia-docker-dev.artifact.tecnalia.com/docker:git
 
 variables:
   TMPDIR: /builds/${CI_PROJECT_NAMESPACE}
   GIT_LFS_SKIP_SMUDGE: 1 # Avoid fetching the files from LFS when doing git fetch
 
 services:
-  - name: all-docker-dev.artifact.tecnalia.com/docker:dind
+  - name: tecnalia-docker-dev.artifact.tecnalia.com/docker:dind
     alias: docker
 
 stages:
@@ -131,7 +131,7 @@ bash_syntax:
 ##########################################################
 markdown_syntax:
   stage: postcheck
-  script: docker run -v ${PWD}:/ac all-docker-dev.artifact.tecnalia.com/cytopia/awesome-ci syntax-markdown --path=/ac --extension=md --ignore=.ci_config --custom="-r ~MD013,~MD014"
+  script: docker run -v ${PWD}:/ac tecnalia-docker-dev.artifact.tecnalia.com/cytopia/awesome-ci syntax-markdown --path=/ac --extension=md --ignore=.ci_config --custom="-r ~MD013,~MD014"
   when: always
   tags:
     - docker
@@ -146,8 +146,8 @@ file_syntax:
   stage: postcheck
   script:
     - RET=0
-    - docker run -v ${PWD}:/ac all-docker-dev.artifact.tecnalia.com/cytopia/awesome-ci file-trailing-space --path=/ac --extension=py,txt,cpp,h,md,sh,bash,xml,launch --ignore=.ci_config || RET=1
-    - docker run -v ${PWD}:/ac all-docker-dev.artifact.tecnalia.com/cytopia/awesome-ci file-utf8 --path=/ac --extension=py,txt,cpp,h,md,sh,bash,xml,launch --ignore=.ci_config || RET=1
+    - docker run -v ${PWD}:/ac tecnalia-docker-dev.artifact.tecnalia.com/cytopia/awesome-ci file-trailing-space --path=/ac --extension=py,txt,cpp,h,md,sh,bash,xml,launch --ignore=.ci_config || RET=1
+    - docker run -v ${PWD}:/ac tecnalia-docker-dev.artifact.tecnalia.com/cytopia/awesome-ci file-utf8 --path=/ac --extension=py,txt,cpp,h,md,sh,bash,xml,launch --ignore=.ci_config || RET=1
     - exit $RET
   when: always
   tags:
@@ -160,7 +160,7 @@ file_syntax:
 ##########################################################
 adoc_syntax:
   stage: postcheck
-  image: all-docker-dev.artifact.tecnalia.com/alpine
+  image: tecnalia-docker-dev.artifact.tecnalia.com/alpine
   before_script:
     - apk add --update curl asciidoctor bash
   script:
diff --git a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
index e6b2bd0da818797aa7dc504f34564dc37b3d5c60..a48ee7467cf510df67ef254e3710ff150719c234 100644
--- a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
@@ -1,11 +1,11 @@
-image: all-docker-dev.artifact.tecnalia.com/docker:git
+image: tecnalia-docker-dev.artifact.tecnalia.com/docker:git
 
 variables:
   TMPDIR: /builds/${CI_PROJECT_NAMESPACE}
   GIT_LFS_SKIP_SMUDGE: 1 # Avoid fetching the files from LFS when doing git fetch
 
 services:
-  - name: all-docker-dev.artifact.tecnalia.com/docker:dind
+  - name: tecnalia-docker-dev.artifact.tecnalia.com/docker:dind
     alias: docker
 
 stages:
@@ -133,7 +133,7 @@ bash_syntax:
 ##########################################################
 markdown_syntax:
   stage: postcheck
-  script: docker run -v ${PWD}:/ac all-docker-dev.artifact.tecnalia.com/cytopia/awesome-ci syntax-markdown --path=/ac --extension=md --ignore=.ci_config --custom="-r ~MD013,~MD014"
+  script: docker run -v ${PWD}:/ac tecnalia-docker-dev.artifact.tecnalia.com/cytopia/awesome-ci syntax-markdown --path=/ac --extension=md --ignore=.ci_config --custom="-r ~MD013,~MD014"
   when: always
   tags:
     - docker
@@ -148,8 +148,8 @@ file_syntax:
   stage: postcheck
   script:
     - RET=0
-    - docker run -v ${PWD}:/ac all-docker-dev.artifact.tecnalia.com/cytopia/awesome-ci file-trailing-space --path=/ac --extension=py,txt,cpp,h,md,sh,bash,xml,launch --ignore=.ci_config || RET=1
-    - docker run -v ${PWD}:/ac all-docker-dev.artifact.tecnalia.com/cytopia/awesome-ci file-utf8 --path=/ac --extension=py,txt,cpp,h,md,sh,bash,xml,launch --ignore=.ci_config || RET=1
+    - docker run -v ${PWD}:/ac tecnalia-docker-dev.artifact.tecnalia.com/cytopia/awesome-ci file-trailing-space --path=/ac --extension=py,txt,cpp,h,md,sh,bash,xml,launch --ignore=.ci_config || RET=1
+    - docker run -v ${PWD}:/ac tecnalia-docker-dev.artifact.tecnalia.com/cytopia/awesome-ci file-utf8 --path=/ac --extension=py,txt,cpp,h,md,sh,bash,xml,launch --ignore=.ci_config || RET=1
     - exit $RET
   when: always
   tags:
@@ -162,7 +162,7 @@ file_syntax:
 ##########################################################
 adoc_syntax:
   stage: postcheck
-  image: all-docker-dev.artifact.tecnalia.com/alpine
+  image: tecnalia-docker-dev.artifact.tecnalia.com/alpine
   before_script:
     - apk add --update curl asciidoctor bash
   script: