diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..7360833a3
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,4 @@
+[*.{kt,kts}]
+# Disabling rules that were added in the latest versions of ktlint
+# tracking here: https://github.com/mozilla-mobile/fenix/issues/4861
+disabled_rules=import-ordering
\ No newline at end of file
diff --git a/app/src/test/java/org/mozilla/fenix/components/metrics/PerformedSearchTest.kt b/app/src/test/java/org/mozilla/fenix/components/metrics/PerformedSearchTest.kt
index 238ea8197..6c75f3460 100644
--- a/app/src/test/java/org/mozilla/fenix/components/metrics/PerformedSearchTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/components/metrics/PerformedSearchTest.kt
@@ -209,4 +209,4 @@ class PerformedSearchTest {
             "yandex"
         )
     )
-}
\ No newline at end of file
+}
diff --git a/app/src/test/java/org/mozilla/fenix/components/toolbar/BrowserInteractorTest.kt b/app/src/test/java/org/mozilla/fenix/components/toolbar/BrowserInteractorTest.kt
index 34fa2b020..b68a67a07 100644
--- a/app/src/test/java/org/mozilla/fenix/components/toolbar/BrowserInteractorTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/components/toolbar/BrowserInteractorTest.kt
@@ -262,4 +262,4 @@ class BrowserInteractorTest {
             readerModeController.showControls()
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/test/java/org/mozilla/fenix/exceptions/ExceptionsInteractorTest.kt b/app/src/test/java/org/mozilla/fenix/exceptions/ExceptionsInteractorTest.kt
index 7f03f94bb..b59bfcf6d 100644
--- a/app/src/test/java/org/mozilla/fenix/exceptions/ExceptionsInteractorTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/exceptions/ExceptionsInteractorTest.kt
@@ -46,4 +46,4 @@ class ExceptionsInteractorTest {
         interactor.onDeleteOne(exceptionsItem)
         assertEquals(exceptionsItemReceived, exceptionsItem)
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/test/java/org/mozilla/fenix/library/history/HistoryStoreTest.kt b/app/src/test/java/org/mozilla/fenix/library/history/HistoryStoreTest.kt
index 1a534454e..e696eb484 100644
--- a/app/src/test/java/org/mozilla/fenix/library/history/HistoryStoreTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/library/history/HistoryStoreTest.kt
@@ -60,4 +60,4 @@ class HistoryStoreTest {
         items = listOf(),
         mode = HistoryState.Mode.Editing(setOf(historyItem, newHistoryItem))
     )
-}
\ No newline at end of file
+}
diff --git a/app/src/test/java/org/mozilla/fenix/quickactionsheet/DefaultQuickActionSheetControllerTest.kt b/app/src/test/java/org/mozilla/fenix/quickactionsheet/DefaultQuickActionSheetControllerTest.kt
index e39108e44..d6eac9a36 100644
--- a/app/src/test/java/org/mozilla/fenix/quickactionsheet/DefaultQuickActionSheetControllerTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/quickactionsheet/DefaultQuickActionSheetControllerTest.kt
@@ -77,4 +77,4 @@ class DefaultQuickActionSheetControllerTest {
         verify { metrics.track(Event.QuickActionSheetOpenInAppTapped) }
         verify { appLinksUseCases.appLinkRedirect.invoke(currentSession.url) }
     }
-}
\ No newline at end of file
+}
diff --git a/build.gradle b/build.gradle
index a64eaf315..29013a9ef 100644
--- a/build.gradle
+++ b/build.gradle
@@ -72,6 +72,6 @@ dependencies {
 task ktlint(type: JavaExec, group: "verification") {
     description = "Check Kotlin code style."
     classpath = configurations.ktlint
-    main = "com.github.shyiko.ktlint.Main"
+    main = "com.pinterest.ktlint.Main"
     args "app/src/**/*.kt", "architecture/src/**/*.kt"
 }