diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index efc4ed59b47d5d4664edfa2b6cce3e294d7f082a..b393a6e389727f82463266d54465ef8a0abe45b4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,6 @@
 stages:
   - pre-checks
-  - test
+  - build
   - checks
   - gui
   - package
@@ -18,8 +18,8 @@ variables:
 include:
   # extends
   - local: '/scripts/ci/extends/defaults.yml'
-  - local: '/scripts/ci/extends/build.yml'
-  - local: '/scripts/ci/extends/build-win.yml'
+  - local: '/scripts/ci/extends/template-build-linux.yml'
+  - local: '/scripts/ci/extends/template-build-win.yml'
   - local: '/scripts/ci/extends/container-maker-setup.yml'
   - local: '/scripts/ci/extends/vs2019-environment.yml'
   - local: '/scripts/ci/extends/test-artifacts.yml'
diff --git a/scripts/ci/extends/build.yml b/scripts/ci/extends/template-build-linux.yml
similarity index 93%
rename from scripts/ci/extends/build.yml
rename to scripts/ci/extends/template-build-linux.yml
index 151b35da2a36c49c5b75bf2d97abf54e353cd9e7..858d43427e7e3f498268e1401c2f44a97d38e98d 100644
--- a/scripts/ci/extends/build.yml
+++ b/scripts/ci/extends/template-build-linux.yml
@@ -1,5 +1,5 @@
-.build_definition:
-  stage: test
+.template-build-linux:
+  stage: build
   extends:
     - .defaults
     - .test-artifacts
diff --git a/scripts/ci/extends/build-win.yml b/scripts/ci/extends/template-build-win.yml
similarity index 93%
rename from scripts/ci/extends/build-win.yml
rename to scripts/ci/extends/template-build-win.yml
index 1d92dfb277a542f73a224b4530a94c898a6ea69b..c552ba3ba638143a8bcb0cc1fe9b8ac8619c529c 100644
--- a/scripts/ci/extends/build-win.yml
+++ b/scripts/ci/extends/template-build-win.yml
@@ -1,5 +1,5 @@
-.build_win_definition:
-  stage: test
+.template-build-win:
+  stage: build
 
   tags:
     - windows
diff --git a/scripts/ci/jobs/build-docs.yml b/scripts/ci/jobs/build-docs.yml
index c5a01dca71adfba076e355592730cbde8bc1fb40..09dcb520e04a929ae67306e931849a24c3d1c999 100644
--- a/scripts/ci/jobs/build-docs.yml
+++ b/scripts/ci/jobs/build-docs.yml
@@ -1,5 +1,5 @@
 build docs:
-  stage: test
+  stage: build
   image:
     name: $CONTAINER_GCC_IMAGE
 
diff --git a/scripts/ci/jobs/build-gui-linux.yml b/scripts/ci/jobs/build-gui-linux.yml
index 5153bbbc05963638765e45e76e396b035ebea9ec..20ce567f430853f233ddc3d3901e08aee62bcb56 100644
--- a/scripts/ci/jobs/build-gui-linux.yml
+++ b/scripts/ci/jobs/build-gui-linux.yml
@@ -1,5 +1,5 @@
 build gui linux:
-  extends: .build_definition
+  extends: .template-build-linux
   stage: gui
   when: manual
 
diff --git a/scripts/ci/jobs/build-gui-mac.yml b/scripts/ci/jobs/build-gui-mac.yml
index fd7ab390bf1ed5d055c49583f43841ed98297837..97872a125f6692465679a38ffcb5676dc8b0df00 100644
--- a/scripts/ci/jobs/build-gui-mac.yml
+++ b/scripts/ci/jobs/build-gui-mac.yml
@@ -1,5 +1,5 @@
 build gui mac:
-  extends: .build_definition
+  extends: .template-build-linux
   stage: gui
   tags:
     - mac
diff --git a/scripts/ci/jobs/build-gui-win.yml b/scripts/ci/jobs/build-gui-win.yml
index c05fbc61187d6ff5acc9634100054887b5a18811..d2bdbb6712c5661d45ee957749cf268467d11130 100644
--- a/scripts/ci/jobs/build-gui-win.yml
+++ b/scripts/ci/jobs/build-gui-win.yml
@@ -1,6 +1,5 @@
 build gui win:
-  extends:
-    - .build_win_definition
+  extends: .template-build-win
   stage: gui
   when: manual
 
diff --git a/scripts/ci/jobs/build-linux.yml b/scripts/ci/jobs/build-linux.yml
index 085ca745324d2976c9b583411a6615a16e556476..0e3f476b4ad6ac73df946893d30c8f09c6f6d312 100644
--- a/scripts/ci/jobs/build-linux.yml
+++ b/scripts/ci/jobs/build-linux.yml
@@ -1,5 +1,5 @@
 build linux:
-  extends: .build_definition
+  extends: .template-build-linux
 
   variables:
     BUILD_DIR: "build"
diff --git a/scripts/ci/jobs/build-mac.yml b/scripts/ci/jobs/build-mac.yml
index a6b7c80c1549929c5fc10e6cd61a2dc1ec487b7c..9fb1c555d20e42470dffcc105b987a441fa58bbd 100644
--- a/scripts/ci/jobs/build-mac.yml
+++ b/scripts/ci/jobs/build-mac.yml
@@ -1,5 +1,5 @@
 build mac:
-  extends: .build_definition
+  extends: .template-build-linux
 
   tags:
     - mac
diff --git a/scripts/ci/jobs/build-win.yml b/scripts/ci/jobs/build-win.yml
index 1bf70acb8650c3bdfb2b1366c005817ec226494e..e80f7c49059af2afa48b32356354b127d47e9d70 100644
--- a/scripts/ci/jobs/build-win.yml
+++ b/scripts/ci/jobs/build-win.yml
@@ -1,6 +1,5 @@
 build win:
-  extends:
-    - .build_win_definition
+  extends: .template-build-win
 
   variables:
     BUILD_DIR: build-win