diff --git a/build-common.yml b/build-common.yml
index f926abfcf26d8644dc18da51d408b644486f77cd..4ac67aad41a6287e917cb74fbb81db580d7b80a8 100644
--- a/build-common.yml
+++ b/build-common.yml
@@ -5,6 +5,9 @@ workflow:
     # the parent job seem to be used and prevent the pipeline generation
     - if: $CI_PIPELINE_SOURCE == "parent_pipeline"
 
+# --------------------------------------------------------------------------------------
+# Scripts
+# --------------------------------------------------------------------------------------
 .docker_check:
   # Check if the build folder is empty. Sometimes the docker volume for the build is not
   # removed afterwards (e.g. in case of a timeout), then a follow-up build might fail.
@@ -40,7 +43,7 @@ workflow:
   - echo "$GITLAB_KNOWN_HOSTS" >> ~/.ssh/known_hosts
   - chmod 644 ~/.ssh/known_hosts
 
-.repo_checkout: &repo_checkout
+.repo_checkout:
   - echo "${LOGPREFIX} Perform repo checkout"
   - cd ${CI_PROJECT_DIR}
   - repo init --submodules -u ${CI_REPOSITORY_URL}
@@ -48,6 +51,9 @@ workflow:
   - repo sync --detach --current-branch --force-remove-dirty
       --optimized-fetch --force-sync
 
+# --------------------------------------------------------------------------------------
+# Stage: build
+# --------------------------------------------------------------------------------------
 .buildbase:
   tags:
     - builds
@@ -67,6 +73,9 @@ workflow:
   artifacts:
     expire_in: 4 weeks
 
+# --------------------------------------------------------------------------------------
+# Stage: test
+# --------------------------------------------------------------------------------------
 .test:
   extends:
     - .infrastructure