diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 56dd0d2ac197f7ab05e5ae9d232bb83c8313bb89..c1a96564db28163d10f7bc9e435d799cbcc56f98 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -97,8 +97,8 @@ reuse:
       paths:
         - $CI_ONIRO_MANIFEST_MIRROR_REPO_DIR
   before_script:
+    # Define helper functions to generate GitLab fold markers.
     - |
-      # Define helper functions to generate GitLab fold markers.
 
       function gl_section_open() {
         printf '\e[0K''section_start'':%s:%s\r\e[0K%s\n' "$(date +%s)" "$1" "$2"
@@ -112,9 +112,9 @@ reuse:
         printf '\e[0K''section_end'':%s:%s\r\e[0K\n' "$(date +%s)" "$1"
       }
 
-      # Query system information. This is mostly useful for forensics, when
-      # something goes wrong and access to basic information of this type can
-      # help to uncover the problem.
+    # Query system information. This is mostly useful for forensics, when
+    # something goes wrong and access to basic information of this type can
+    # help to uncover the problem.
     - gl_section_open_collapsed system_info "Querying system information"
     - id
     - uname -a
@@ -160,9 +160,9 @@ reuse:
     - repo sync --force-sync || ( rm -rf .repo && repo init --mirror --manifest-url "$CI_ONIRO_MANIFEST_MIRROR_REPO_URL" --manifest-branch "$CI_ONIRO_MANIFEST_MIRROR_REPO_REV" --no-clone-bundle && repo sync)
     - gl_section_close repo_mirror_setup
 
-      # Create a repo workspace using the mirror as reference. This is fairly
-      # efficient, as repo will hardlink files (assuming they live on the same
-      # filesystem) and avoid bulk of the network traffic.
+    # Create a repo workspace using the mirror as reference. This is fairly
+    # efficient, as repo will hardlink files (assuming they live on the same
+    # filesystem) and avoid bulk of the network traffic.
     - gl_section_open_collapsed repo_workspace_setup "Setting up repo workspace"
     - rm -rf "$CI_ONIRO_REPO_WORKSPACE_DIR" && mkdir -p "$CI_ONIRO_REPO_WORKSPACE_DIR"
     - pushd "$CI_ONIRO_REPO_WORKSPACE_DIR"