diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
new file mode 100644
index 0000000..86b1a4d
--- /dev/null
+++ b/.github/workflows/lint.yml
@@ -0,0 +1,33 @@
+# This is a basic workflow that is manually triggered
+
+name: Lint CI
+
+on:
+  push:
+
+jobs:
+  shellcheck:
+    name: ShellCheck
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: dorny/paths-filter@v2
+      id: changes
+      with:
+        filters: |
+          scripts:
+            - 'bin/**'
+            - 'bootstrap'
+            - bashrc/**
+            - zshrc/**
+          manual:
+            - .github/workflows/lint.yml
+    - name: ShellCheck
+      if: steps.changes.outputs.scripts == 'true'
+      uses: ludeeus/action-shellcheck@1.1.0
+      with:
+        check_together: 'yes'
+        severity: error
+        format: tty
+      env:
+        SHELLCHECK_OPTS: -s bash
diff --git a/.github/workflows/script-linter.yml b/.github/workflows/script-linter.yml
deleted file mode 100644
index 98500e8..0000000
--- a/.github/workflows/script-linter.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-# This is a basic workflow that is manually triggered
-
-name: Scripts Linter
-
-# Controls when the action will run. Workflow runs when manually triggered using the UI
-# or API.
-on:
-  push:
-
-jobs:
-  shellcheck:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: ShellCheck
-      uses: ludeeus/action-shellcheck@1.1.0
-      with:
-        check_together: 'yes'