diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f9a604c988734976990738d150bca9c1744c6322..bab49b515eaeb31145d26471c9ea750bd270abc1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -61,7 +61,7 @@ reuse:
 .oniro-repo-workspace:
   interruptible: true
   image:
-    name: registry.ostc-eu.org/ostc/oniro/bitbake-builder:latest
+    name: docker.io/onirocore/bitbake-builder:latest
   variables:
     # URL and branch or revision of the oniro.git repository which contains a
     # repo manifest file.
@@ -197,7 +197,7 @@ build-docs:
   extends: [.oniro-repo-workspace]
   interruptible: true
   image:
-    name: registry.ostc-eu.org/ostc/oniro/docs-builder:latest
+    name: docker.io/onirocore/docs-builder:latest
   script:
     - make -C docs
     - mv docs/build "$CI_PROJECT_DIR"
@@ -245,7 +245,7 @@ build-docs:
 deploy:
   extends: .oniro-repo-workspace
   image:
-    name: registry.ostc-eu.org/ostc/oniro/docs-builder:latest
+    name: docker.io/onirocore/docs-builder:latest
   stage: deploy
   script:
     # We are in the root of the git-repo workspace. Because