diff --git a/etc/spotbugs/.exclude.xml.swp b/etc/spotbugs/.exclude.xml.swp
deleted file mode 100644
index 3de4f29..0000000
Binary files a/etc/spotbugs/.exclude.xml.swp and /dev/null differ
diff --git a/etc/spotbugs/exclude.xml b/etc/spotbugs/exclude.xml
index 39ccc26..1e06a72 100644
--- a/etc/spotbugs/exclude.xml
+++ b/etc/spotbugs/exclude.xml
@@ -22,17 +22,5 @@
         xmlns="/~https://github.com/spotbugs/filter/3.0.0"
         xsi:schemaLocation="/~https://github.com/spotbugs/filter/3.0.0 https://raw.githubusercontent.com/spotbugs/spotbugs/3.1.0/spotbugs/etc/findbugsfilter.xsd">
 
-    <Match>
-        <Class name="io.helidon.samples.petclinic.model.Owner"/>
-        <Bug pattern="DLS_DEAD_LOCAL_STORE"/>
-    </Match>
-    <Match>
-        <Class name="io.helidon.samples.petclinic.model.Pet"/>
-        <Bug pattern="DLS_DEAD_LOCAL_STORE"/>
-    </Match>
-    <Match>
-        <Class name="io.helidon.samples.petclinic.model.Vet"/>
-        <Bug pattern="DLS_DEAD_LOCAL_STORE"/>
-    </Match>
 
 </FindBugsFilter>
diff --git a/pom.xml b/pom.xml
index 29dc078..655589f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
         <version.plugin.helidon-build-tools>4.0.6</version.plugin.helidon-build-tools>
         <version.plugin.jandex-maven-plugin>3.1.7</version.plugin.jandex-maven-plugin>
         <version.plugin.openapi-generator>6.2.1</version.plugin.openapi-generator>
-        <version.plugin.spotbugs>4.7.3.4</version.plugin.spotbugs>
+        <version.plugin.spotbugs>4.8.5.0</version.plugin.spotbugs>
         <version.plugin.findsecbugs>1.12.0</version.plugin.findsecbugs>
     </properties>