diff --git a/.oniro-ci/build-generic.yaml b/.oniro-ci/build-generic.yaml
index 75f800197932417e6ea770dd5a0cebd180fdb8dd..de889c963aa4a8124c96afb0e00ca58d21683420 100644
--- a/.oniro-ci/build-generic.yaml
+++ b/.oniro-ci/build-generic.yaml
@@ -5,7 +5,7 @@
 .workspace:
   interruptible: true
   image:
-    name: registry.ostc-eu.org/ostc/containers/ostc-builder:latest
+    name: registry.booting.oniroproject.org/distro/oniro/bitbake-builder:latest
   tags: [large-disk, $CI_ONIRO_RUNNER_TAG, $CI_ONIRO_INSTANCE_SIZE]
   variables:
     CI_ONIRO_RUNNER_TAG : ""
@@ -292,7 +292,7 @@
 .build-docs:
   interruptible: true
   image:
-    name: registry.ostc-eu.org/ostc/containers/ostc-docs-builder
+    name: registry.booting.oniroproject.org/distro/oniro/docs-builder:latest
   stage: build
   script:
     - make -C docs