diff --git a/.editorconfig b/.editorconfig
index 86d08b79b..397bbd2a5 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -7,12 +7,19 @@
 # Top-most EditorConfig file.
 root = true
 
-[{**.{md,ini,sh,rules,nft},**/APKBUILD,CODEOWNERS}]
+[{**.{ini,sh,rules,nft},**/APKBUILD,CODEOWNERS}]
 indent_style = tab
 end_of_line = lf
 trim_trailing_whitespace = true
 insert_final_newline = true
 
+[**.md]
+# No indent_size since space size has meaning in markdown
+indent_style = space
+end_of_line = lf
+trim_trailing_whitespace = true
+insert_final_newline = true
+
 # Forked from Alpine
 [extra-repos/systemd/networkmanager/networkmanager.rules]
 indent_style = space
diff --git a/COMMITSTYLE.md b/COMMITSTYLE.md
index 5dd4ac0e1..db78fec5a 100644
--- a/COMMITSTYLE.md
+++ b/COMMITSTYLE.md
@@ -31,16 +31,16 @@ subfolders of the device directory. As such, commits changing
 packages inside of the device directory should omit the directory
 prefix, for example:
 
-	device-pine64-pinephone: description of change
+    device-pine64-pinephone: description of change
 
 Or:
 
-	soc-qcom-msm8996: description of change
+    soc-qcom-msm8996: description of change
 
 If the commit only makes device-specific changes, the
 commit title can opt to use the following format:
 
-	manufacturer-codename: description of change
+    manufacturer-codename: description of change
 
 ### Changes to packages inside of the systemd directory
 
@@ -48,12 +48,12 @@ We also shorten the prefixes for packages in `extra-repos/systemd`.
 When the `systemd` package itself gets changed, use `systemd: ` as
 prefix. For example:
 
-	systemd: add triggers for reloading/restarting services
+    systemd: add triggers for reloading/restarting services
 
 When another package inside the systemd directory gets changed, use
 `systemd/$pkgname: ` as prefix. For example:
 
-	systemd/cups: restart on upgrade
+    systemd/cups: restart on upgrade
 
 ### Moving devices between categories
 
@@ -61,11 +61,11 @@ As we do not include directory prefixes in device-related commits,
 Alpine's commit style for moving packages does not apply. Instead,
 we do the following:
 
-	manufacturer-codename: move from category to category
+    manufacturer-codename: move from category to category
 
 For example:
 
-	samsung-m0: move from testing to community
+    samsung-m0: move from testing to community
 
 ## Additions