diff --git a/src/main/resources/META-INF/build-server-plugin-buildscans.xml b/src/main/resources/META-INF/build-server-plugin-buildscans.xml
index d592f292..2bbc4211 100644
--- a/src/main/resources/META-INF/build-server-plugin-buildscans.xml
+++ b/src/main/resources/META-INF/build-server-plugin-buildscans.xml
@@ -5,17 +5,21 @@
        default-autowire="constructor">
 
     <bean id="buildScanViewBuildTab"
-          class="nu.studer.teamcity.buildscan.BuildScanViewBuildTab">
+          class="nu.studer.teamcity.buildscan.BuildScanViewBuildTab"
+          destroy-method="unregister">
     </bean>
 
     <bean id="buildScanBuildServerListener"
           class="nu.studer.teamcity.buildscan.BuildScanBuildServerListener"
-          init-method="register">
+          init-method="register"
+          destroy-method="unregister">
     </bean>
 
     <bean id="buildScanCrumbSummaryExtension"
           class="nu.studer.teamcity.buildscan.BuildScanCrumbSummaryExtension"
-          init-method="register"/>
+          init-method="register"
+          destroy-method="unregister">
+    </bean>
 
     <bean id="cachedBuildScanLookup" primary="true"
           class="nu.studer.teamcity.buildscan.internal.CachedBuildScanLookup"
@@ -46,7 +50,8 @@
 
     <bean id="buildScanAdminPage"
           class="nu.studer.teamcity.buildscan.internal.cleanup.BuildScanAdminPage"
-          init-method="register">
+          init-method="register"
+          destroy-method="unregister">
     </bean>
 
     <bean id="buildScanCleanupController"