diff --git a/.ecrc b/.ecrc
new file mode 100644
index 0000000..243da02
--- /dev/null
+++ b/.ecrc
@@ -0,0 +1,16 @@
+{
+  "Verbose": false,
+  "Debug": false,
+  "IgnoreDefaults": false,
+  "NoColor": false,
+  "Exclude": ["LICENSES", "\\.asc$"],
+  "SpacesAfterTabs": false,
+  "Disable": {
+    "EndOfLine": false,
+    "Indentation": false,
+    "IndentSize": false,
+    "InsertFinalNewline": false,
+    "TrimTrailingWhitespace": false,
+    "MaxLineLength": false
+  }
+}
diff --git a/.editorconfig b/.editorconfig
index 236a12d..b4026e9 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -18,3 +18,6 @@ indent_size = 8
 
 [*.{md,sh,yaml,yml,toml}]
 indent_size = 2
+
+[.reuse/dep5]
+indent_size = 1
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index da6d4ce..364e2f8 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -34,12 +34,12 @@ jobs:
         run: sudo apt-get -y update
       - name: Install OS packages
         # yamllint disable-line rule:line-length
-        run: sudo apt-get install -y $(cat dev-deps-debian.txt)
+        run: sudo apt-get install -y $(cat dependencies/debian.txt)
       - name: Remove externally managed python environment flag
         # yamllint disable-line rule:line-length
         run: sudo dpkg-divert --rename --add /usr/lib/$(py3versions -d)/EXTERNALLY-MANAGED
       - name: Install pip packages
-        run: pip3 install $(cat dev-deps-pip.txt)
+        run: pip3 install $(cat dependencies/pip.txt)
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
@@ -48,6 +48,9 @@ jobs:
         env:
           SPEC_VENDOR: Github Actions
           SPEC_PACKAGER: Github Actions
+      - uses: editorconfig-checker/action-editorconfig-checker@main
+      - name: Run Editorconfig Checker
+        run: editorconfig-checker
       - name: Lint commits
         # yamllint disable-line rule:line-length
         run: |
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 9b9c15e..250928c 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -27,6 +27,10 @@ repos:
         entry: scripts/shell-lint.sh
         language: script
         pass_filenames: true
+        # yamllint disable rule:line-length
+        files: (\.sh|/rc\.local\.d/.*\.rc|/bin/.*|/rpc/.*|/network-hooks\.d/.*|/qubes-firewall\.d/.*|/(lib-)?qubes-bind-dirs\.d/.*|/\.config/(sh|bash|zsh|less|x11|git/shell|git/template/hooks)/.*|/autostart-scripts/.*|/qvm-copy-dotfiles|/git-core/.*)
+        # yamllint disable rule:line-length
+        exclude: \.(policy|asc|txt|top|sls|jinja|toml|vim|py|muttrc|nft|md|spec|list|sources|repo|socket|timer|service|y(a)?ml)$
         description: Lint Shellscripts
 
       - id: markdown-lint
@@ -67,6 +71,7 @@ repos:
         args: [test]
         language: script
         pass_filenames: false
+        files: salt/\S+/README.md
         description: Check if .qubesbuilder is up to date
 
       - id: spec-gen
diff --git a/.reuse/dep5 b/.reuse/dep5
index a6402b4..74e80d8 100644
--- a/.reuse/dep5
+++ b/.reuse/dep5
@@ -7,14 +7,10 @@ Files: README.md */README.md docs/* .github/*_TEMPLATE/* .github/*.md
 Copyright: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 License: CC-BY-SA-4.0
 
-Files: version salt/*/version
+Files: version salt/*/version dependencies/* .ecrc
 Copyright: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 License: CC0-1.0
 
-Files: dependencies/*
-Copyright: 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
-License: CC0-1.0
-
 Files: salt/electrum/files/client/keys/*
 Copyright: SomberNight/ghost43 <somber.night@protonmail.com>
            Stephan Oeste <stephan@oeste.de>