diff --git a/.editorconfig b/.editorconfig
index 0d028a6f..102bd7ae 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -10,3 +10,6 @@ insert_final_newline = true
 charset = utf-8
 indent_style = space
 indent_size = 4
+
+[*.{yml,yaml}]
+indent_size = 2
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bcc31e19..2f8819e8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,20 @@
+before_script:
+  - npm ci --ignore-scripts --force
+
+build:
+  stage: build
+  script: npm run build
+  only:
+    - merge_requests
+
+lint:
+  stage: test
+  script: npm run lint
+  only:
+    - merge_requests
+
 test:
   stage: test
-  script: npm ci --ignore-scripts --force && npm run test
+  script: npm run test
   only:
     - merge_requests