diff --git a/scripts/ci/extends/template-build-dockerfile.yml b/scripts/ci/extends/template-build-dockerfile.yml
index 7bbc61f4bb3632ce854fab116119ce83659d7091..8a8404325f98f0db99965b6b84d043cf3658a8b3 100644
--- a/scripts/ci/extends/template-build-dockerfile.yml
+++ b/scripts/ci/extends/template-build-dockerfile.yml
@@ -15,7 +15,6 @@
       - scripts/ci/extends/template-build-dockerfile.yml
   tags:
     - docker-shell
-    - ogs
   variables:
     GIT_LFS_SKIP_SMUDGE: "1"
   script:
diff --git a/scripts/ci/extends/template-build-linux.yml b/scripts/ci/extends/template-build-linux.yml
index 65f30af4592ec7fc96bf80c13d1274a87ddc187a..51c5f2c52e1482d82aff1f6b99f73a143d915eb9 100644
--- a/scripts/ci/extends/template-build-linux.yml
+++ b/scripts/ci/extends/template-build-linux.yml
@@ -1,7 +1,7 @@
 .template-build-linux:
   stage: build
   tags:
-    - ogs
+    - docker
   extends:
     - .defaults
     - .test-artifacts
diff --git a/scripts/ci/extends/template-build-win.yml b/scripts/ci/extends/template-build-win.yml
index 9bf3730e69159ae7be7e77cbe753eb742614b0dd..8d0b4b68c3748328faf6f0c11e78700316602456 100644
--- a/scripts/ci/extends/template-build-win.yml
+++ b/scripts/ci/extends/template-build-win.yml
@@ -1,10 +1,7 @@
 .template-build-win:
   stage: build
-
   tags:
     - windows
-    - ogs
-
   extends:
     - .defaults
     - .vs2019-environment
diff --git a/scripts/ci/jobs/build-gui-mac.yml b/scripts/ci/jobs/build-gui-mac.yml
index ed69271f91b1661e9e8c04a04bb6afba64985832..5ef942411a70a7fa94a150103e53cf87d1c20541 100644
--- a/scripts/ci/jobs/build-gui-mac.yml
+++ b/scripts/ci/jobs/build-gui-mac.yml
@@ -6,7 +6,6 @@ build gui mac:
       artifacts: false
   tags:
     - mac
-    - ogs
   rules:
     - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"'
     - changes:
diff --git a/scripts/ci/jobs/build-mac.yml b/scripts/ci/jobs/build-mac.yml
index 41d5edd9a1bbdf9440135f5046b1529ab92aa091..9fb1c555d20e42470dffcc105b987a441fa58bbd 100644
--- a/scripts/ci/jobs/build-mac.yml
+++ b/scripts/ci/jobs/build-mac.yml
@@ -3,7 +3,6 @@ build mac:
 
   tags:
     - mac
-    - ogs
 
   variables:
     BUILD_DIR: "build-mac"
diff --git a/scripts/ci/jobs/build_image.yml b/scripts/ci/jobs/build_image.yml
index 364f741219f039db6646d3090a0c1fa3a7f6a8f8..aa17fe50c23cf7de6bd084cdff2ae637d8fd0e14 100644
--- a/scripts/ci/jobs/build_image.yml
+++ b/scripts/ci/jobs/build_image.yml
@@ -8,7 +8,7 @@ build gcc images:
       when: always
   tags:
     - docker-shell
-    - ogs
+
   variables:
     GIT_LFS_SKIP_SMUDGE: "1"
   extends: .container-maker-setup
@@ -33,7 +33,7 @@ build xunit-to-junit image:
       - scripts/ci/jobs/build_image.yml
   tags:
     - docker-shell
-    - ogs
+
   variables:
     GIT_LFS_SKIP_SMUDGE: "1"
   script:
@@ -52,7 +52,6 @@ build pre-commit image:
       - scripts/ci/jobs/build_image.yml
   tags:
     - docker-shell
-    - ogs
   variables:
     GIT_LFS_SKIP_SMUDGE: "1"
   script:
diff --git a/scripts/ci/jobs/check-header.yml b/scripts/ci/jobs/check-header.yml
index 81563fafea5be063ab534c806ea4cb39e132d376..35722b153d3b06ee4f0dc5770df1669b5c08cd88 100644
--- a/scripts/ci/jobs/check-header.yml
+++ b/scripts/ci/jobs/check-header.yml
@@ -1,7 +1,7 @@
 check header:
   stage: checks
   tags:
-    - ogs
+    - docker
   extends:
     - .defaults
     - .rules-master-manual
diff --git a/scripts/ci/jobs/checks.yml b/scripts/ci/jobs/checks.yml
index 83feb040d935c43c1a64c00db4bbc8ff4c691372..206ae5879545bc7096954ebc19a860702c56db21 100644
--- a/scripts/ci/jobs/checks.yml
+++ b/scripts/ci/jobs/checks.yml
@@ -24,7 +24,6 @@ ctest results:
     GIT_STRATEGY: none
   tags:
     - docker-shell
-    - ogs
   needs:
     - job: build linux
     - job: build win