diff --git a/renovate.json b/renovate.json
index f9a7dff..7f576e0 100644
--- a/renovate.json
+++ b/renovate.json
@@ -3,6 +3,17 @@
     "config:base",
     ":disableDependencyDashboard"
   ],
+  "customManagers": [
+    {
+      "customType": "regex",
+      "managerFilePatterns": [
+        "/^\\{\\{ cookiecutter\\.slug \\}\\}/Makefile\\.vars\\.mk$/"
+      ],
+      "matchStrings": [
+        "# renovate: datasource=(?<datasource>\\S+) depName=(?<depName>\\S+)\\n[a-zA-Z0-9_]+ \\?= (?<currentValue>\\S+)"
+      ]
+    }
+  ],
   "poetry": {
     "enabled": true
   },
diff --git a/{{ cookiecutter.slug }}/.github/changelog-configuration.json b/{{ cookiecutter.slug }}/.github/changelog-configuration.json
index c63308d..9f7ebf4 100644
--- a/{{ cookiecutter.slug }}/.github/changelog-configuration.json	
+++ b/{{ cookiecutter.slug }}/.github/changelog-configuration.json	
@@ -29,4 +29,4 @@
     ],
     "template": "${{CATEGORIZED_COUNT}} changes since ${{FROM_TAG}}\n\n${{CHANGELOG}}"
 }
-{% endraw %}
+{% endraw -%}
diff --git a/{{ cookiecutter.slug }}/.github/workflows/test.yaml b/{{ cookiecutter.slug }}/.github/workflows/test.yaml
index 10704d9..48ae2e0 100644
--- a/{{ cookiecutter.slug }}/.github/workflows/test.yaml	
+++ b/{{ cookiecutter.slug }}/.github/workflows/test.yaml	
@@ -25,9 +25,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
-      - uses: snow-actions/eclint@v1.0.1
-        with:
-          args: 'check'
+      - name: Check EditorConfig conformance
+        run: |
+          make format_editorconfig
+          git diff --exit-code
   test:
     runs-on: ubuntu-latest
 {%- if cookiecutter.add_matrix == "y" %}
diff --git a/{{ cookiecutter.slug }}/Makefile b/{{ cookiecutter.slug }}/Makefile
index 95f84db..96c79b7 100644
--- a/{{ cookiecutter.slug }}/Makefile	
+++ b/{{ cookiecutter.slug }}/Makefile	
@@ -36,12 +36,16 @@ lint_kubent: ## Check for deprecated Kubernetes API versions
 {%- endif %}
 
 .PHONY: format
-format: format_jsonnet ## All-in-one formatting
+format: format_jsonnet format_editorconfig ## All-in-one formatting
 
 .PHONY: format_jsonnet
 format_jsonnet: $(JSONNET_FILES) ## Format jsonnet files
 	$(JSONNET_DOCKER) $(JSONNETFMT_ARGS) --in-place -- $?
 
+.PHONY: format_editorconfig
+format_editorconfig: ## Fix EditorConfig issues
+	npx --yes eclint@$(ECLINT_VERSION) fix .
+
 .PHONY: docs-serve
 docs-serve: ## Preview the documentation
 	$(ANTORA_PREVIEW_CMD)
diff --git a/{{ cookiecutter.slug }}/Makefile.vars.mk b/{{ cookiecutter.slug }}/Makefile.vars.mk
index 84aec7e..7c96b9b 100644
--- a/{{ cookiecutter.slug }}/Makefile.vars.mk	
+++ b/{{ cookiecutter.slug }}/Makefile.vars.mk	
@@ -38,6 +38,9 @@ YAMLLINT_DOCKER ?= $(DOCKER_CMD) $(DOCKER_ARGS) $(root_volume) $(YAMLLINT_IMAGE)
 VALE_CMD  ?= $(DOCKER_CMD) $(DOCKER_ARGS) $(root_volume) --volume "$${PWD}"/docs/modules:/pages ghcr.io/vshn/vale:2.15.5
 VALE_ARGS ?= --minAlertLevel=error --config=/pages/ROOT/pages/.vale.ini /pages
 
+# renovate: datasource=npm depName=eclint
+ECLINT_VERSION ?= 2.8.1
+
 ANTORA_PREVIEW_CMD ?= $(DOCKER_CMD) run --rm --publish 35729:35729 --publish 2020:2020 $(antora_git_volume) --volume "${PWD}/docs":/preview/antora/docs ghcr.io/vshn/antora-preview:3.1.2.3 --style=syn --antora=docs
 
 COMMODORE_CMD  ?= $(DOCKER_CMD) $(DOCKER_ARGS) $(git_volume) $(root_volume) docker.io/projectsyn/commodore:latest