diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 2b05688..3337c63 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -25,7 +25,7 @@ jobs:
     - name: Install dependencies
       run: make deps
     - name: Test Directory
-      run: ansible-lint ${{ matrix.directory }} --exclude roles/sprat.mergerfs --exclude roles/docker_restore_container
+      run: make lint dir=${{ matrix.directory }}
 
   format:
     runs-on: ubuntu-latest
diff --git a/Makefile b/Makefile
index 72794e7..8d92319 100644
--- a/Makefile
+++ b/Makefile
@@ -29,11 +29,14 @@ deps:
 format:
 	scripts/format_all_yaml.sh
 
+lint-all:
+	make lint dir=host_vars
+	make lint dir=group_vars
+	make lint dir=roles
+	make lint dir=playbooks
+
 lint:
-	ansible-lint host_vars
-	ansible-lint group_vars
-	ansible-lint roles --exclude "roles/sprat.*" --exclude roles/docker_restore_container --exclude "roles/geerlingguy.*"
-	ansible-lint playbooks --exclude "roles/sprat.*" --exclude roles/docker_restore_container --exclude "roles/geerlingguy.*"
+	ansible-lint $(dir) --exclude "roles/sprat.*" --exclude roles/docker_restore_container --exclude "roles/geerlingguy.*"
 
 backup: deps
 	ansible-playbook playbooks/backup-docker-volumes.yml