diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..41e907f68
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,22 @@
+# EditorConfig is awesome: https://editorconfig.org/
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+insert_final_newline = true
+indent_style = space
+indent_size = tab
+tab_width = 4
+charset = utf-8
+trim_trailing_whitespace = true
+
+[*.yml]
+tab_width = 2
+
+[*.md]
+tab_width = 2
+
+[*.json]
+indent_size = 2
diff --git a/.github/workflows/editorconfig-checker.yml b/.github/workflows/editorconfig-checker.yml
new file mode 100644
index 000000000..f917ba28a
--- /dev/null
+++ b/.github/workflows/editorconfig-checker.yml
@@ -0,0 +1,14 @@
+name: editorconfig-checker
+
+on:
+  pull_request:
+  push:
+
+jobs:
+  build:
+    name: editorconfig-checker
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3.2.0
+      - uses: editorconfig-checker/action-editorconfig-checker@main
+      - run: editorconfig-checker
diff --git a/mkdocs.yml b/mkdocs.yml
index 1bcc3f510..9369719c9 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -2,7 +2,7 @@ site_name: 'Pi-hole documentation'
 site_url: 'https://docs.pi-hole.net/'
 repo_url: 'https://github.com/pi-hole/pi-hole'
 edit_uri: '../docs/blob/master/docs/'
-copyright: 
+copyright:
 remote_branch: gh-pages
 theme:
   name: 'material'
diff --git a/runtime.txt b/runtime.txt
index 98fccd6d0..cc1923a40 100644
--- a/runtime.txt
+++ b/runtime.txt
@@ -1 +1 @@
-3.8
\ No newline at end of file
+3.8