diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..83be1d5a0
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,6 @@
+# https://editorconfig.org/
+# This configuration is used by ktlint when spotless invokes it
+
+[*.{kt,kts}]
+ij_kotlin_allow_trailing_comma=true
+ij_kotlin_allow_trailing_comma_on_call_site=true
diff --git a/gradle/init.gradle.kts b/gradle/init.gradle.kts
index bd5658fc0..57f91da08 100644
--- a/gradle/init.gradle.kts
+++ b/gradle/init.gradle.kts
@@ -14,10 +14,10 @@
  *   limitations under the License.
  */
 
-val ktlintVersion = "0.43.0"
+val ktlintVersion = "0.48.1"
 
 initscript {
-    val spotlessVersion = "6.11.0"
+    val spotlessVersion = "6.13.0"
 
     repositories {
         mavenCentral()