diff --git a/ibex_core.core b/ibex_core.core
index 76596d37..3a0cf8a8 100644
--- a/ibex_core.core
+++ b/ibex_core.core
@@ -154,10 +154,6 @@ targets:
           # RAM primitives wider than 64bit (required for ECC) fail to build in
           # Verilator without increasing the unroll count (see Verilator#1266)
           - "--unroll-count 72"
-      veriblelint:
-        ruleset: default
-        rules:
-          - "-parameter-name-style"
   format:
     filesets:
       - files_rtl
diff --git a/ibex_core_tracing.core b/ibex_core_tracing.core
index 93744693..f568cb17 100644
--- a/ibex_core_tracing.core
+++ b/ibex_core_tracing.core
@@ -13,11 +13,6 @@ filesets:
       - rtl/ibex_core_tracing.sv
     file_type: systemVerilogSource
 
-
-  files_lint_verilator:
-    files:
-      - lint/verilator_waiver.vlt: {file_type: vlt}
-
 parameters:
   # The tracer uses the RISC-V Formal Interface (RVFI) to collect trace signals.
   RVFI:
@@ -100,19 +95,15 @@ parameters:
     description: "Number of PMP regions"
 
 targets:
-  default:
+  default: &default_target
     filesets:
       - files_rtl
     parameters:
       - RVFI=true
+    toplevel: ibex_core_tracing
 
   lint:
-    filesets:
-      # Note on Verilator waivers:
-      # You *must* include the waiver file first, otherwise only global waivers
-      # are applied, but not file-specific waivers.
-      - tool_verilator ? (files_lint_verilator)
-      - files_rtl
+    <<: *default_target
     parameters:
       - RVFI=true
       - SYNTHESIS=true
@@ -127,7 +118,6 @@ targets:
       - PMPGranularity
       - PMPNumRegions
     default_tool: verilator
-    toplevel: ibex_core_tracing
     tools:
       verilator:
         mode: lint-only
@@ -136,10 +126,6 @@ targets:
           # RAM primitives wider than 64bit (required for ECC) fail to build in
           # Verilator without increasing the unroll count (see Verilator#1266)
           - "--unroll-count 72"
-      veriblelint:
-        ruleset: default
-        rules:
-          - "-parameter-name-style"
   format:
     filesets:
       - files_rtl