diff --git a/.editorconfig b/.editorconfig
index 20e54864d4..9f0ac5e3d4 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -4,6 +4,10 @@
 # This is the terminal .editorconfig in this repository.
 root = true
 
-[*.yml]
+[*]
 insert_final_newline = true
 trim_trailing_whitespace = true
+
+[Makefile]
+indent_style = tab
+indent_size = 4
diff --git a/e2e/etc/test-data/alpha_dashboard.json b/e2e/etc/test-data/alpha_dashboard.json
index b78a216afa..39cdaed4a0 100644
--- a/e2e/etc/test-data/alpha_dashboard.json
+++ b/e2e/etc/test-data/alpha_dashboard.json
@@ -279,4 +279,4 @@
         ]
     },
     "labels": []
-}
\ No newline at end of file
+}
diff --git a/e2e/etc/test-data/hydro-test-template.json b/e2e/etc/test-data/hydro-test-template.json
index 4a835716f9..5b7f43ee25 100644
--- a/e2e/etc/test-data/hydro-test-template.json
+++ b/e2e/etc/test-data/hydro-test-template.json
@@ -173,4 +173,4 @@
         ]
     },
     "labels": []
-}
\ No newline at end of file
+}
diff --git a/e2e/etc/test-data/sine-test-template.json b/e2e/etc/test-data/sine-test-template.json
index cda4203d4d..645d8439bb 100644
--- a/e2e/etc/test-data/sine-test-template.json
+++ b/e2e/etc/test-data/sine-test-template.json
@@ -171,4 +171,4 @@
         ]
     },
     "labels": []
-}
\ No newline at end of file
+}
diff --git a/e2e/etc/test-data/tau_ceti_dashboard.json b/e2e/etc/test-data/tau_ceti_dashboard.json
index 30cddb2807..9d1812b499 100644
--- a/e2e/etc/test-data/tau_ceti_dashboard.json
+++ b/e2e/etc/test-data/tau_ceti_dashboard.json
@@ -279,4 +279,4 @@
         ]
     },
     "labels": []
-}
\ No newline at end of file
+}
diff --git a/pkger/testdata/dashboard.json b/pkger/testdata/dashboard.json
index ad030ab503..8b9f7ee256 100644
--- a/pkger/testdata/dashboard.json
+++ b/pkger/testdata/dashboard.json
@@ -54,4 +54,4 @@
       "description": "desc"
     }
   }
-]
\ No newline at end of file
+]
diff --git a/pkger/testdata/dashboard_single_stat_plus_line.json b/pkger/testdata/dashboard_single_stat_plus_line.json
index 660380ce41..8b1f28c55a 100644
--- a/pkger/testdata/dashboard_single_stat_plus_line.json
+++ b/pkger/testdata/dashboard_single_stat_plus_line.json
@@ -70,4 +70,4 @@
       ]
     }
   }
-]
\ No newline at end of file
+]
diff --git a/pkger/testdata/dashboard_xy.json b/pkger/testdata/dashboard_xy.json
index f2aa62ae4e..75ee399fbb 100644
--- a/pkger/testdata/dashboard_xy.json
+++ b/pkger/testdata/dashboard_xy.json
@@ -61,4 +61,4 @@
       ]
     }
   }
-]
\ No newline at end of file
+]
diff --git a/ui/cypress/fixtures/view.json b/ui/cypress/fixtures/view.json
index df2a385489..8d8a138b09 100644
--- a/ui/cypress/fixtures/view.json
+++ b/ui/cypress/fixtures/view.json
@@ -86,4 +86,4 @@
     "shadeBelow": false,
     "hoverDimension": "y"
   }
-}
\ No newline at end of file
+}