diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 46cd656..e4b09f1 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -5,6 +5,9 @@ on: [push, pull_request]
 jobs:
   lint:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        width: [1, 4]
     name: Linter
     env:
       REPO : serv
@@ -17,6 +20,6 @@ jobs:
       - run: sudo apt install verilator
       - run: pip3 install fusesoc
       - run: fusesoc library add $REPO $GITHUB_WORKSPACE/$REPO
-      - run: fusesoc run --target=lint $VLNV
-      - run: fusesoc run --target=lint servant
+      - run: fusesoc run --target=lint $VLNV --W=${{ matrix.width }}
+      - run: fusesoc run --target=lint servant --width=${{ matrix.width }}
       - run: fusesoc run --target=lint serving
diff --git a/data/verilator_waiver.vlt b/data/verilator_waiver.vlt
index 34fc1b5..20b6a3c 100644
--- a/data/verilator_waiver.vlt
+++ b/data/verilator_waiver.vlt
@@ -12,3 +12,8 @@ lint_off -rule UNUSED -file "*/serv_top.v" -lines 70
 //Some bufreg signals are not used in 1-bit mode
 lint_off -rule UNUSED -file "*/serv_bufreg.v" -lines 10
 lint_off -rule UNUSED -file "*/serv_bufreg.v" -lines 19-21
+
+//Some signals not used in 4-bit mode
+lint_off -rule UNUSED -file "*/serv_immdec.v" -lines 12
+lint_off -rule UNUSED -file "*/serv_bufreg.v" -lines 9
+lint_off -rule UNUSED -file "*/serv_ctrl.v" -lines 17
diff --git a/serv.core b/serv.core
index 269a6be..3746a12 100644
--- a/serv.core
+++ b/serv.core
@@ -49,6 +49,7 @@ targets:
     default_tool : verilator
     description: Run static code checks (linting)
     filesets : [core]
+    parameters: [W]
     tools:
       verilator:
         mode : lint-only
diff --git a/servant.core b/servant.core
index 901250f..fa641b3 100644
--- a/servant.core
+++ b/servant.core
@@ -470,6 +470,7 @@ targets:
     flow: lint
     flow_options:
       tool : verilator
+    parameters : [width]
     toplevel : servant
 
   lx9_microboard: