diff --git a/build.gradle.kts b/build.gradle.kts
index 005ea12..78ec800 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     java
-    id("org.springframework.boot") version "3.2.5"
+    id("org.springframework.boot") version "4.0.6"
     id("io.spring.dependency-management") version "1.1.7"
     `maven-publish`
     checkstyle
@@ -30,7 +30,6 @@ dependencies {
 
     implementation("org.flywaydb:flyway-core")
     implementation("com.fasterxml.jackson.core:jackson-databind")
-    implementation("dev.samstevens.totp:totp-spring-boot-starter:1.7.1")
 
     runtimeOnly("com.h2database:h2")
     runtimeOnly("org.postgresql:postgresql")
@@ -39,6 +38,7 @@ dependencies {
     annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
 
     testImplementation("org.springframework.boot:spring-boot-starter-test")
+    testImplementation("org.springframework.boot:spring-boot-starter-webmvc-test")
     testImplementation("org.springframework.security:spring-security-test")
 }
 
diff --git a/docker/host-app/build.gradle.kts b/docker/host-app/build.gradle.kts
index 5940855..b227531 100644
--- a/docker/host-app/build.gradle.kts
+++ b/docker/host-app/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     java
-    id("org.springframework.boot") version "3.2.5"
+    id("org.springframework.boot") version "4.0.6"
     id("io.spring.dependency-management") version "1.1.7"
 }
 
@@ -23,7 +23,6 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-data-jpa")
     implementation("org.springframework.boot:spring-boot-starter-security")
     implementation("org.springframework.boot:spring-boot-starter-thymeleaf")
-    implementation("dev.samstevens.totp:totp-spring-boot-starter:1.7.1")
     implementation("org.flywaydb:flyway-core")
     runtimeOnly("org.postgresql:postgresql")
     implementation(rootProject)
diff --git a/src/main/java/dev/escalated/config/EscalatedAutoConfiguration.java b/src/main/java/dev/escalated/config/EscalatedAutoConfiguration.java
index deb8a77..0c616a3 100644
--- a/src/main/java/dev/escalated/config/EscalatedAutoConfiguration.java
+++ b/src/main/java/dev/escalated/config/EscalatedAutoConfiguration.java
@@ -2,7 +2,7 @@
 
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
diff --git a/src/test/java/dev/escalated/controllers/AdminPublicTicketsSettingsControllerTest.java b/src/test/java/dev/escalated/controllers/AdminPublicTicketsSettingsControllerTest.java
index 8593cd4..e684f7d 100644
--- a/src/test/java/dev/escalated/controllers/AdminPublicTicketsSettingsControllerTest.java
+++ b/src/test/java/dev/escalated/controllers/AdminPublicTicketsSettingsControllerTest.java
@@ -7,9 +7,9 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
-import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
+import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 
@@ -38,10 +38,10 @@ class AdminPublicTicketsSettingsControllerTest {
     @Autowired
     private MockMvc mockMvc;
 
-    @MockBean
+    @MockitoBean
     private ApiTokenAuthenticationFilter apiTokenFilter;
 
-    @MockBean
+    @MockitoBean
     private SettingsService settingsService;
 
     private Map<String, String> store;
diff --git a/src/test/java/dev/escalated/controllers/AdminTicketControllerTest.java b/src/test/java/dev/escalated/controllers/AdminTicketControllerTest.java
index fd0616a..3e96656 100644
--- a/src/test/java/dev/escalated/controllers/AdminTicketControllerTest.java
+++ b/src/test/java/dev/escalated/controllers/AdminTicketControllerTest.java
@@ -8,9 +8,9 @@
 import dev.escalated.security.ApiTokenAuthenticationFilter;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
-import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
+import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
@@ -34,10 +34,10 @@ class AdminTicketControllerTest {
     @Autowired
     private MockMvc mockMvc;
 
-    @MockBean
+    @MockitoBean
     private ApiTokenAuthenticationFilter apiTokenFilter;
 
-    @MockBean
+    @MockitoBean
     private TicketService ticketService;
 
     @Test
diff --git a/src/test/java/dev/escalated/controllers/InboundEmailControllerTest.java b/src/test/java/dev/escalated/controllers/InboundEmailControllerTest.java
index 22ab81e..7f1d411 100644
--- a/src/test/java/dev/escalated/controllers/InboundEmailControllerTest.java
+++ b/src/test/java/dev/escalated/controllers/InboundEmailControllerTest.java
@@ -22,9 +22,9 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
-import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
+import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.context.annotation.Import;
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
@@ -50,13 +50,13 @@ class InboundEmailControllerTest {
     @Autowired
     private MockMvc mockMvc;
 
-    @MockBean
+    @MockitoBean
     private ApiTokenAuthenticationFilter apiTokenFilter;
 
-    @MockBean
+    @MockitoBean
     private InboundEmailService inboundService;
 
-    @MockBean
+    @MockitoBean
     private EscalatedProperties properties;
 
     @BeforeEach
diff --git a/src/test/java/dev/escalated/controllers/WidgetControllerTest.java b/src/test/java/dev/escalated/controllers/WidgetControllerTest.java
index 9e53680..a07dcea 100644
--- a/src/test/java/dev/escalated/controllers/WidgetControllerTest.java
+++ b/src/test/java/dev/escalated/controllers/WidgetControllerTest.java
@@ -10,9 +10,9 @@
 import dev.escalated.security.ApiTokenAuthenticationFilter;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
-import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
+import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 
@@ -30,14 +30,14 @@ class WidgetControllerTest {
     @Autowired
     private MockMvc mockMvc;
 
-    @MockBean
+    @MockitoBean
     private ApiTokenAuthenticationFilter apiTokenFilter;
 
-    @MockBean
+    @MockitoBean
     private TicketService ticketService;
-    @MockBean
+    @MockitoBean
     private KnowledgeBaseService knowledgeBaseService;
-    @MockBean
+    @MockitoBean
     private SatisfactionRatingService ratingService;
 
     @Test