diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 29bf2c3476b3b49c15a5d551358ccdfdd65227e8..d4753b8eaa23855dca1b22c7a8c7c8e997e1914e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,10 +2,8 @@ stages:
   - preparation
   - build
   - check
-  - gui
   - package
 
-
 variables:
   # Docker image names
   CONTAINER_GCC_IMAGE: $CI_REGISTRY/ogs/$CI_PROJECT_NAME/gcc
diff --git a/scripts/ci/jobs/build-gui-linux.yml b/scripts/ci/jobs/build-gui-linux.yml
index be06bc9f3208a90b73578d6385d3b5418c64c35c..cec5e39f7a7ee6ad9d42364817da3ae32f6285f2 100644
--- a/scripts/ci/jobs/build-gui-linux.yml
+++ b/scripts/ci/jobs/build-gui-linux.yml
@@ -1,6 +1,6 @@
 build gui linux:
   extends: .template-build-linux
-  stage: gui
+  stage: build
   image:
     name: $CONTAINER_GCC_GUI_IMAGE
   tags:
diff --git a/scripts/ci/jobs/build-gui-mac.yml b/scripts/ci/jobs/build-gui-mac.yml
index 6d519473c7c176b0fdb57a572578070ab10c93ae..1a6de27afbb3e38f6f65270cb89d17ceaabf81fb 100644
--- a/scripts/ci/jobs/build-gui-mac.yml
+++ b/scripts/ci/jobs/build-gui-mac.yml
@@ -1,15 +1,13 @@
 build gui mac:
   extends: .template-build-linux
-  stage: gui
-  tags:
-    - mac
+  stage: build
+  tags: [mac]
   rules:
     - if: '$CI_COMMIT_BRANCH == "master"'
     - changes:
       - Applications/DataExplorer/**/*
     - when: manual
       allow_failure: true
-
   variables:
     BUILD_DIR: "build-gui-mac"
     BUILD_CTEST: "false"
diff --git a/scripts/ci/jobs/build-gui-win.yml b/scripts/ci/jobs/build-gui-win.yml
index 13d94a8b8de84f274f2174d67873fdbb0c75b61e..9c69d72cb078bbb7097ee56598832eacb5cba015 100644
--- a/scripts/ci/jobs/build-gui-win.yml
+++ b/scripts/ci/jobs/build-gui-win.yml
@@ -1,13 +1,12 @@
 build gui win:
   extends: .template-build-win
-  stage: gui
+  stage: build
   rules:
     - if: '$CI_COMMIT_BRANCH == "master"'
     - changes:
       - Applications/DataExplorer/**/*
     - when: manual
       allow_failure: true
-
   variables:
     BUILD_DIR: build-gui-win
     BUILD_CTEST: "false"
diff --git a/scripts/ci/jobs/meta.yml b/scripts/ci/jobs/meta.yml
index 0abac260b9357ae4e88346f3658f741b763d2924..8c92c2c4623f271c87f70a1cc09847d7b9e306ed 100644
--- a/scripts/ci/jobs/meta.yml
+++ b/scripts/ci/jobs/meta.yml
@@ -1,7 +1,6 @@
 meta:
   stage: .pre
   tags: [shell]
-    - shell
   script:
     - git fetch --depth 500
     - echo "OGS_VERSION=${CI_COMMIT_TAG:-`git describe --tags --long --dirty --always`}" >> build.env
@@ -12,7 +11,6 @@ meta:
 
 meta_container:
   stage: .pre
-  tags: [shell]
   rules:
     - changes:
       - ThirdParty/container-maker