diff --git a/pom.xml b/pom.xml
index 1946ac9..f114a8c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
     <maven.compiler.target>17</maven.compiler.target>
     <maven.compiler.release>17</maven.compiler.release>
     <spotless.version>2.43.0</spotless.version>
-    <spring-boot.version>3.3.6</spring-boot.version>
+    <spring-boot.version>3.4.0</spring-boot.version>
     <josdk.version>5.0.0-beta1</josdk.version>
     <surefire.version>3.5.2</surefire.version>
     <fabric8-client.version>7.0.0</fabric8-client.version>
diff --git a/starter/src/main/java/io/javaoperatorsdk/operator/springboot/starter/OperatorHealthIndicatorAutoConfiguration.java b/starter/src/main/java/io/javaoperatorsdk/operator/springboot/starter/OperatorHealthIndicatorAutoConfiguration.java
index adbb672..16c0722 100644
--- a/starter/src/main/java/io/javaoperatorsdk/operator/springboot/starter/OperatorHealthIndicatorAutoConfiguration.java
+++ b/starter/src/main/java/io/javaoperatorsdk/operator/springboot/starter/OperatorHealthIndicatorAutoConfiguration.java
@@ -2,14 +2,14 @@
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 
 import io.javaoperatorsdk.operator.Operator;
 
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnBean(Operator.class)
-@ComponentScan("io.javaoperatorsdk.operator.springboot.starter")
+@Import(OperatorAutoConfiguration.class)
 public class OperatorHealthIndicatorAutoConfiguration {
 
   @Bean
diff --git a/starter/src/test/java/io/javaoperatorsdk/operator/springboot/starter/AutoConfigurationTest.java b/starter/src/test/java/io/javaoperatorsdk/operator/springboot/starter/AutoConfigurationTest.java
index d24baed..30e57a9 100644
--- a/starter/src/test/java/io/javaoperatorsdk/operator/springboot/starter/AutoConfigurationTest.java
+++ b/starter/src/test/java/io/javaoperatorsdk/operator/springboot/starter/AutoConfigurationTest.java
@@ -10,9 +10,9 @@
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.TestConfiguration;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.context.annotation.Bean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.javaoperatorsdk.operator.Operator;
@@ -41,7 +41,7 @@ public class AutoConfigurationTest {
   @Autowired
   private OperatorConfigurationProperties config;
 
-  @SpyBean
+  @MockitoSpyBean
   private Operator operator;
 
   @Autowired
@@ -53,7 +53,7 @@ public class AutoConfigurationTest {
   @Autowired
   private Consumer<ConfigurationServiceOverrider> compositeConfigurationServiceOverrider;
 
-  @MockBean
+  @MockitoBean
   private Cloner cloner;
 
   @Test