diff --git a/.editorconfig b/.editorconfig
index a05d4393c0..8af779a4c2 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -272,15 +272,8 @@ dotnet_diagnostic.SYSLIB0006.severity = none
 # S5145: Log injection - SanitizeForLog() is used but not recognized by analyzer
 dotnet_diagnostic.S5145.severity = none
 
-[*.{js,html,hbs,less,css,ts,tsx}]
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-indent_style = space
-indent_size = 2
-
-# They have troubles with TABS. Use 2 spaces
-[{package.json,.travis.yml}]
+# Web files and config files - 2 space indentation
+[*.{js,html,hbs,less,css,ts,tsx,json,yml,yaml}]
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 2662796200..f7367a9d16 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -29,7 +29,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v3