diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index f2262600..45ad067a 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [8, 11, 15]
+        java: [8, 11, 17]
     steps:
       - uses: actions/checkout@v3
         with:
diff --git a/build.gradle b/build.gradle
index 05d33e00..12fca768 100755
--- a/build.gradle
+++ b/build.gradle
@@ -92,7 +92,7 @@ subprojects {
   }
 
   spotbugs {
-    toolVersion = '4.2.0'
+    toolVersion = '4.7.3'
     excludeFilter = rootProject.file('codequality/findbugs-exclude.xml')
     ignoreFailures = false
     spotbugsMain.enabled = true
diff --git a/codequality/findbugs-exclude.xml b/codequality/findbugs-exclude.xml
index a52f8849..101d268f 100644
--- a/codequality/findbugs-exclude.xml
+++ b/codequality/findbugs-exclude.xml
@@ -7,40 +7,13 @@
     </And>
   </Match>
   <Match>
-    <And>
-      <Class name="com.netflix.spectator.sandbox.HttpResponse"/>
-      <Bug pattern="EI_EXPOSE_REP"/>
-    </And>
-  </Match>
-  <Match>
-    <And>
-      <Class name="com.netflix.spectator.sandbox.HttpResponse"/>
-      <Bug pattern="EI_EXPOSE_REP2"/>
-    </And>
-  </Match>
-  <Match>
-    <And>
-      <Class name="com.netflix.spectator.sandbox.HttpRequestBuilder"/>
-      <Bug pattern="EI_EXPOSE_REP2"/>
-    </And>
+    <Bug pattern="EI_EXPOSE_REP"/>
   </Match>
   <Match>
-    <And>
-      <Class name="com.netflix.spectator.ipc.http.HttpResponse"/>
-      <Bug pattern="EI_EXPOSE_REP"/>
-    </And>
+    <Bug pattern="EI_EXPOSE_REP2"/>
   </Match>
   <Match>
-    <And>
-      <Class name="com.netflix.spectator.ipc.http.HttpResponse"/>
-      <Bug pattern="EI_EXPOSE_REP2"/>
-    </And>
-  </Match>
-  <Match>
-    <And>
-      <Class name="com.netflix.spectator.ipc.http.HttpRequestBuilder"/>
-      <Bug pattern="EI_EXPOSE_REP2"/>
-    </And>
+    <Bug pattern="MS_EXPOSE_REP"/>
   </Match>
   <Match>
     <And>