diff --git a/.editorconfig b/.editorconfig
index 3491f2db7..942e0e739 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -688,7 +688,7 @@ ij_markdown_wrap_text_inside_blockquotes = true
 ij_toml_keep_indents_on_empty_lines = false
 
 [{*.yaml,*.yml}]
-indent_size = 4
+indent_size = 2
 ij_yaml_align_values_properties = do_not_align
 ij_yaml_autoinsert_sequence_marker = true
 ij_yaml_block_mapping_on_new_line = false
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cacc55c27..63f4a855f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,7 +18,7 @@ variables:
 .build_java:
   #image: eclipse-temurin:17
   cache:
-    key: "gradleCache"
+    key: "gradleCache_$CI_JOB_NAME_SLUG"
     policy: pull-push
     paths:
       - .gradle