diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e64ddbe152296fcd9cfc59d9fcf4defeaf406e29..ac694c3ff28d0e9bc206a71a0d297e9e8026d358 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,12 +1,12 @@
 shellcheck:
-  image: tecnalia-docker-dev.artifact.tecnalia.com/koalaman/shellcheck-alpine
+  image: tecnalia-docker-dev.artifact.tecnalia.dev/koalaman/shellcheck-alpine
   script: shellcheck scripts/*sh
   tags:
     - docker
 
 
 yamllint:
-  image: tecnalia-docker-dev.artifact.tecnalia.com/sdesbure/yamllint
+  image: tecnalia-docker-dev.artifact.tecnalia.dev/sdesbure/yamllint
   script: yamllint $(find . -name '*.yml' -o -name '*.yaml')
   tags:
     - docker
diff --git a/ci-templates/README.adoc b/ci-templates/README.adoc
index a6b92fbb5ca18b731e1b1766fe11e2634922ade4..37954807f369fd0491b02e84f30eff087b8dc478 100644
--- a/ci-templates/README.adoc
+++ b/ci-templates/README.adoc
@@ -18,7 +18,7 @@ The Core pipeline, defined in link:ci-templates/core.yml[], has the following st
     ** Uses `flexbotics-base-devel:${ROS_DISTRO}` as a starting image
     ** Runs link:scripts/ci_run_entry_points.sh[] in the `AFTER_SETUP_TARGET_WORKSPACE` stage, which in turn finds and runs every `ci_entry_script.bash` script found in the target repo.
 - Stage: `deploy`
-  * `.ddeploy` template (see https://git.code.tecnalia.com/tecnalia_robotics/flexbotics/flexbotics_utils/ddeploy[the ddeploy repo]), which:
+  * `.ddeploy` template (see https://git.code.tecnalia.dev/tecnalia_robotics/flexbotics/flexbotics_utils/ddeploy[the ddeploy repo]), which:
     ** Is run automatically for tags, but can also be run manually on normal commits
     ** Calls `ddeploy` to generate the docker image
     ** Renames the image created by ddeploy with different tags and pushes them to the registry.
diff --git a/ci-templates/core.yml b/ci-templates/core.yml
index e29f46b4ed543a8e7ebd2757bf0c474cd19f7978..0ec07ab0c332ea08c79eaaa4fac7e784bda9f5b5 100644
--- a/ci-templates/core.yml
+++ b/ci-templates/core.yml
@@ -1,4 +1,4 @@
-image: tecnalia-docker-dev.artifact.tecnalia.com/docker:git
+image: tecnalia-docker-dev.artifact.tecnalia.dev/docker:git
 
 
 workflow:
diff --git a/ci-templates/industrial-ci-templates.yml b/ci-templates/industrial-ci-templates.yml
index a2b546f5129524bf7ab5aea36b4f7d28c06dd2d3..724da0cef86a5cb4f2a2bef53ea283e8b230b11b 100644
--- a/ci-templates/industrial-ci-templates.yml
+++ b/ci-templates/industrial-ci-templates.yml
@@ -4,26 +4,26 @@ variables:
 .industrial_ci:
   stage: build
   services:
-    - name: tecnalia-docker-dev.artifact.tecnalia.com/docker:dind
+    - name: tecnalia-docker-dev.artifact.tecnalia.dev/docker:dind
       alias: docker
   before_script:
     - apk add --update bash coreutils tar
     - git clone --quiet --depth 1 https://github.com/ros-industrial/industrial_ci.git .ci_config
     - docker login ${ARTIFACT_DOCKER_URL} -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN}
-    - docker login tecnalia-docker-dev.artifact.tecnalia.com -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN}
+    - docker login tecnalia-docker-dev.artifact.tecnalia.dev -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN}
   script: .ci_config/gitlab.sh
   variables:
     DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
     ADDITIONAL_DEBS: curl
     PARALLEL_BUILDS: 2 # keep this for now, since there seems to be memory limit issues in the ci VM
-    AFTER_SETUP_TARGET_WORKSPACE: "rosenv && bash <(curl -Ls https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/${GITLAB_TEMPLATES_BRANCH}/scripts/ci_run_entry_points.sh) $$current_ws"
+    AFTER_SETUP_TARGET_WORKSPACE: "rosenv && bash <(curl -Ls https://git.code.tecnalia.dev/tecnalia_robotics-public/gitlab_templates/raw/${GITLAB_TEMPLATES_BRANCH}/scripts/ci_run_entry_points.sh) $$current_ws"
     CMAKE_ARGS: -DCMAKE_CXX_FLAGS=-Wno-ignored-attributes -Wno-int-in-bool-context -Wno-dev
 
 
 .ddeploy:
   stage: deploy
   services:
-  - name: tecnalia-docker-dev.artifact.tecnalia.com/docker:dind
+  - name: tecnalia-docker-dev.artifact.tecnalia.dev/docker:dind
     alias: docker
   variables:
     DOCKER_PUSH_REGISTRY: ${ARTIFACT_DOCKER_URL}
@@ -44,11 +44,11 @@ variables:
     # setup LFS authentication
     - git lfs install
     - git config --global credential.helper store
-    - echo https://$ARTIFACT_CI_USER:$ARTIFACT_CI_TOKEN@artifact.tecnalia.com > ~/.git-credentials
+    - echo https://$ARTIFACT_CI_USER:$ARTIFACT_CI_TOKEN@artifact.tecnalia.dev > ~/.git-credentials
     - find . -type f -name .lfsconfig -exec sh -c 'cd "$(dirname "{}")" && git lfs pull' \;
     - find . -type f -name .lfsconfig -exec sh -c 'cd "$(dirname "{}")" && git lfs ls-files' \;
     # install ddeploy
-    - pip install --break-system-packages git+ssh://git@git.code.tecnalia.com/tecnalia_robotics/flexbotics/flexbotics_utils/ddeploy.git@v0.2.0
+    - pip install --break-system-packages git+ssh://git@git.code.tecnalia.dev/tecnalia_robotics/flexbotics/flexbotics_utils/ddeploy.git@v0.2.0
     - echo "Logging into docker registry ${ARTIFACT_DOCKER_URL} for user ${ARTIFACT_CI_USER}"
     - docker login ${ARTIFACT_DOCKER_URL} -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN}
     - echo "Logging into docker registry ${DOCKER_PUSH_REGISTRY} for user ${DOCKER_PUSH_USER}"
@@ -58,7 +58,7 @@ variables:
     - GIT_LFS_SKIP_SMUDGE=0 ddeploy --yaml ${DDEPLOY_YAML}
     # Get the full name of the most recently built image
     - 'DDEPLOY_IMAGE_NAME=$(docker images --format="{{.Repository}}:{{.Tag}}" | head -1)'
-    - curl -Ls https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/${GITLAB_TEMPLATES_BRANCH}/scripts/enforce_labels.bash | bash -s -- ${DDEPLOY_IMAGE_NAME}
+    - curl -Ls https://git.code.tecnalia.dev/tecnalia_robotics-public/gitlab_templates/raw/${GITLAB_TEMPLATES_BRANCH}/scripts/enforce_labels.bash | bash -s -- ${DDEPLOY_IMAGE_NAME}
     # Tag and push with the branch or tag name.
     - echo "Pushing to ${DOCKER_PUSH_REGISTRY}/${DOCKER_PUSH_NAME}:${DOCKER_PUSH_TAG}"
     - docker tag ${DDEPLOY_IMAGE_NAME} ${DOCKER_PUSH_REGISTRY}/${DOCKER_PUSH_NAME}:${DOCKER_PUSH_TAG}
diff --git a/ci-templates/lfs-pull.yml b/ci-templates/lfs-pull.yml
index e93ea4143d186c29bcbf118bd1af4c7b554b73ad..338a22b283c476342f84e033ca54a001daba6ee3 100644
--- a/ci-templates/lfs-pull.yml
+++ b/ci-templates/lfs-pull.yml
@@ -7,7 +7,7 @@
     AFTER_INIT: "bash <(curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh);\
                 apt install -qq -y git-lfs; \
                 git config --global credential.helper store; \
-                echo https://$ARTIFACT_CI_USER:$ARTIFACT_CI_TOKEN@artifact.tecnalia.com > ~/.git-credentials ;"
+                echo https://$ARTIFACT_CI_USER:$ARTIFACT_CI_TOKEN@artifact.tecnalia.dev > ~/.git-credentials ;"
     BEFORE_INSTALL_UPSTREAM_DEPENDENCIES: *lfs-pull-script
     BEFORE_INSTALL_TARGET_DEPENDENCIES: *lfs-pull-script
     BEFORE_INSTALL_DOWNSTREAM_DEPENDENCIES: *lfs-pull-script
diff --git a/ci-templates/syntax-check.yml b/ci-templates/syntax-check.yml
index 6b5e30ba3ee3a7d99d3d4c156b1e2933f6b640fc..bb23ea0e59131591141c9124b03c7870b956ede2 100644
--- a/ci-templates/syntax-check.yml
+++ b/ci-templates/syntax-check.yml
@@ -7,12 +7,12 @@ variables:
 clang_format:
   stage: .post
   services:
-    - name: tecnalia-docker-dev.artifact.tecnalia.com/docker:dind
+    - name: tecnalia-docker-dev.artifact.tecnalia.dev/docker:dind
       alias: docker
   before_script:
     - apk add --update bash coreutils tar wget
     - git clone --quiet --depth 1 https://github.com/ros-industrial/industrial_ci.git .ci_config
-    - wget https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/${GITLAB_TEMPLATES_BRANCH}/clang-format -O .clang-format
+    - wget https://git.code.tecnalia.dev/tecnalia_robotics-public/gitlab_templates/raw/${GITLAB_TEMPLATES_BRANCH}/clang-format -O .clang-format
   script: .ci_config/gitlab.sh
   variables:
     ROS_DISTRO: noetic
@@ -44,7 +44,7 @@ bash_syntax:
 ##########################################################
 markdown_syntax:
   stage: .post
-  image: tecnalia-docker-dev.artifact.tecnalia.com/cytopia/awesome-ci
+  image: tecnalia-docker-dev.artifact.tecnalia.dev/cytopia/awesome-ci
   script:
     - syntax-markdown --path=${PWD} --extension=md --ignore=.ci_config --custom="-r ~MD013,~MD014"
   when: always
@@ -57,7 +57,7 @@ markdown_syntax:
 ##########################################################
 file_syntax:
   stage: .post
-  image: tecnalia-docker-dev.artifact.tecnalia.com/cytopia/awesome-ci
+  image: tecnalia-docker-dev.artifact.tecnalia.dev/cytopia/awesome-ci
   script:
     - RET=0
     - file-trailing-space --path=${PWD} --extension=py,txt,cpp,h,md,sh,bash,xml,launch --ignore=.ci_config || RET=1
@@ -72,9 +72,9 @@ file_syntax:
 ##########################################################
 adoc_syntax:
   stage: .post
-  image: tecnalia-docker-dev.artifact.tecnalia.com/alpine
+  image: tecnalia-docker-dev.artifact.tecnalia.dev/alpine
   before_script:
     - apk add --update curl asciidoctor bash
   script:
-    - curl -Ls https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/${GITLAB_TEMPLATES_BRANCH}/scripts/asciidoctor_syntax_check.bash | bash -s -- .
+    - curl -Ls https://git.code.tecnalia.dev/tecnalia_robotics-public/gitlab_templates/raw/${GITLAB_TEMPLATES_BRANCH}/scripts/asciidoctor_syntax_check.bash | bash -s -- .
   when: always
diff --git a/vscode_devcontainer/.devcontainer/Dockerfile b/vscode_devcontainer/.devcontainer/Dockerfile
index f2930991fab02856326f9075dc2e6269a3507a2f..6e3d61b97ae6f754754c296f2c689bab1e80dcb2 100644
--- a/vscode_devcontainer/.devcontainer/Dockerfile
+++ b/vscode_devcontainer/.devcontainer/Dockerfile
@@ -3,7 +3,7 @@
 # Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
 #-------------------------------------------------------------------------------------------------------------
 
-FROM tecnalia-robotics-docker.artifact.tecnalia.com/flexbotics-base-devel:kinetic
+FROM tecnalia-robotics-docker.artifact.tecnalia.dev/flexbotics-base-devel:kinetic
 
 # Avoid warnings by switching to noninteractive
 ENV DEBIAN_FRONTEND=noninteractive