diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5d78a8821bfc4941834e23722cf62fde0c4ee7ca..a19d1ef1119cc81c5fb4b22f812dcd04eef3ce41 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -55,6 +55,11 @@ workflow:
 include:
  - local: '.gitlab-ci/container.yml'
 
+default:
+  tags:
+    - origin:eclipse
+    - ctx:oniro-group
+
 variables:
   # Force the use of git clone to avoid odd git and repo problems
   GIT_STRATEGY: "clone"
@@ -90,6 +95,9 @@ stages:
 
 # Common job definition for bitbake driven jobs, such as fetch and build
 .bitbake:
+  tags:
+    - origin:eclipse
+    - tool:bitbake
   image:
     name: $BITBAKE_BUILDER:$BITBAKE_CONTAINER_VERSION
   variables:
@@ -218,8 +226,6 @@ fetch:
     - job: bitbake-builder
       artifacts: false
       optional: true
-  tags:
-    - cpu.light
   script:
     # Fetching is io-bound, not cpu-bound, so we should be able to ignore the
     # runner configured max on build jobs without eating up too much cpu time.
@@ -318,8 +324,6 @@ build:
   after_script:
     - !reference [.bitbake, after_script]
     - time repo/oe-core/scripts/pybootchartgui/pybootchartgui.py build/tmp-*/buildstats/* -o build/tmp-*/buildstats
-  tags:
-    - cpu.heavy
   parallel:
     matrix:
       - DISTRO: [oniro-openharmony-linux]
@@ -347,8 +351,6 @@ ptest:
       when: never
     - when: on_success
   extends: .bitbake
-  tags:
-    - cpu.heavy
   parallel:
     matrix:
       - DISTRO: [oniro-openharmony-linux]
@@ -373,8 +375,6 @@ build_ch:
       artifacts: false
   rules:
     - if: $CHINA_CI != null
-  tags:
-    - region.china
   variables:
     MANIFEST_FILE: manifests/gitee/ci.xml
     SOURCE_MIRROR_URL: $SOURCE_MIRROR_URL_CH
@@ -417,8 +417,6 @@ ohos_fetch:
   image:
     name: $OPENHARMONY_BUILDER:$OPENHARMONY_CONTAINER_VERSION
   extends: .openharmony_tarball
-  tags:
-    - cpu.light
   parallel:
     matrix:
       - OPENHARMONY_VERSION: ["3.0"]
@@ -475,7 +473,8 @@ ohos:
     name: $OPENHARMONY_BUILDER:$OPENHARMONY_CONTAINER_VERSION
   extends: .openharmony_tarball
   tags:
-    - cpu.heavy
+    - origin:eclipse
+    - tool:bitbake
   script:
     - tar xfz $TARBALL_FILE
     - cd $(basename $TARBALL_FILE .tar.gz)/OpenHarmony