diff --git a/ci.jsonnet b/ci.jsonnet
index 29b0b1579fd..3651cf2ea42 100644
--- a/ci.jsonnet
+++ b/ci.jsonnet
@@ -537,8 +537,7 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
 
   test_builds:
     {
-      # Lint runs on JDK stable because some lint tools do not work on JDK latest
-      "ruby-lint": $.platform.linux + $.cap.tier2 + $.jdk.stable + $.use.common + $.env.jvm + $.use.build + $.run.lint + { timelimit: "45:00" },
+      "ruby-lint": $.platform.linux + $.cap.tier1 + $.jdk.latest + $.use.common + $.env.jvm + $.use.build + $.run.lint + { timelimit: "45:00" },
       # Run specs on CRuby to make sure new specs are compatible and have the needed version guards
       "ruby-test-specs-on-cruby": $.platform.linux + $.cap.tier2 + $.use.skip_ci + $.use.common + $.run.test_specs_mri + { timelimit: "45:00" },
     } +
@@ -765,6 +764,7 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
   specVersion: "7",
   overlay: overlay,
   tierConfig: {
+    "tier1": "gate",
     "tier2": "gate",
     "tier3": "gate",
   },
diff --git a/mx.truffleruby/mx_truffleruby.py b/mx.truffleruby/mx_truffleruby.py
index 12c805fd980..3749b18c464 100644
--- a/mx.truffleruby/mx_truffleruby.py
+++ b/mx.truffleruby/mx_truffleruby.py
@@ -303,7 +303,7 @@ def ruby_spotbugs(args):
     spotbugsArgs = ['-textui', '-low', '-longBugCodes', '-include', filters]
     if mx.is_interactive():
         spotbugsArgs.append('-progress')
-    sys.exit(mx_spotbugs.spotbugs(args, spotbugsArgs))
+    sys.exit(mx_spotbugs.spotbugs(['--primary', *args], spotbugsArgs))
 
 def verify_ci(args):
     """Verify CI configuration"""