diff --git a/.editorconfig b/.editorconfig
index 1b4230f..5a61fac 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -9,7 +9,7 @@ insert_final_newline = true
 max_line_length = 120
 tab_width = 4
 
-[*.{md,sh,sql,yaml,yml}]
+[*.{md,sh,sql,xml,xsd,yaml,yml}]
 max_line_length = 1024
 indent_size = 2
 tab_width = 2
diff --git a/build.gradle.kts b/build.gradle.kts
index 03da0b8..ff9bd06 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -39,7 +39,6 @@ dependencies {
     testIntegrationImplementation(hlaeja.projectreactor.reactor.test)
     testIntegrationImplementation(hlaeja.kotlin.test.junit5)
     testIntegrationImplementation(hlaeja.kotlinx.coroutines.test)
-    testIntegrationImplementation(hlaeja.springboot.kafka.test)
     testIntegrationImplementation(hlaeja.springboot.starter.test)
 
     testIntegrationRuntimeOnly(hlaeja.junit.platform.launcher)
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index a11bbe7..cb0270f 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -7,7 +7,10 @@
   <root level="INFO">
     <appender-ref ref="STDOUT"/>
   </root>
-  <springProfile name="develop|docker">
+  <springProfile name="development">
+    <logger level="TRACE" name="ltd.hlaeja"/>
+  </springProfile>
+  <springProfile name="docker">
     <logger level="DEBUG" name="ltd.hlaeja"/>
   </springProfile>
 </configuration>
diff --git a/src/test-integration/kotlin/ltd/hlaeja/controller/AccountEndpoint.kt b/src/test-integration/kotlin/ltd/hlaeja/controller/AccountEndpoint.kt
index f689abf..3fffc10 100644
--- a/src/test-integration/kotlin/ltd/hlaeja/controller/AccountEndpoint.kt
+++ b/src/test-integration/kotlin/ltd/hlaeja/controller/AccountEndpoint.kt
@@ -2,7 +2,7 @@ package ltd.hlaeja.controller
 
 import java.util.UUID
 import ltd.hlaeja.library.accountRegistry.Account
-import ltd.hlaeja.test.container.PostgresContainer
+import ltd.hlaeja.test.container.KafkaPostgresTestContainer
 import org.assertj.core.api.SoftAssertions
 import org.assertj.core.api.junit.jupiter.InjectSoftAssertions
 import org.assertj.core.api.junit.jupiter.SoftAssertionsExtension
@@ -20,7 +20,7 @@ import org.springframework.http.HttpStatus.CONFLICT
 import org.springframework.test.web.reactive.server.WebTestClient
 import org.springframework.test.web.reactive.server.expectBody
 
-@PostgresContainer
+@KafkaPostgresTestContainer
 @SpringBootTest(webEnvironment = RANDOM_PORT)
 @ExtendWith(SoftAssertionsExtension::class)
 class AccountEndpoint {
diff --git a/src/test-integration/kotlin/ltd/hlaeja/controller/AccountsEndpoint.kt b/src/test-integration/kotlin/ltd/hlaeja/controller/AccountsEndpoint.kt
index 89ea12a..a349c12 100644
--- a/src/test-integration/kotlin/ltd/hlaeja/controller/AccountsEndpoint.kt
+++ b/src/test-integration/kotlin/ltd/hlaeja/controller/AccountsEndpoint.kt
@@ -1,7 +1,7 @@
 package ltd.hlaeja.controller
 
 import ltd.hlaeja.library.accountRegistry.Account
-import ltd.hlaeja.test.container.PostgresContainer
+import ltd.hlaeja.test.container.PostgresTestContainer
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
@@ -13,7 +13,7 @@ import org.springframework.boot.test.web.server.LocalServerPort
 import org.springframework.test.web.reactive.server.WebTestClient
 import org.springframework.test.web.reactive.server.expectBody
 
-@PostgresContainer
+@PostgresTestContainer
 @SpringBootTest(webEnvironment = RANDOM_PORT)
 class AccountsEndpoint {
 
diff --git a/src/test-integration/kotlin/ltd/hlaeja/controller/AuthenticationEndpoint.kt b/src/test-integration/kotlin/ltd/hlaeja/controller/AuthenticationEndpoint.kt
index 6d834f1..de10928 100644
--- a/src/test-integration/kotlin/ltd/hlaeja/controller/AuthenticationEndpoint.kt
+++ b/src/test-integration/kotlin/ltd/hlaeja/controller/AuthenticationEndpoint.kt
@@ -1,9 +1,9 @@
 package ltd.hlaeja.controller
 
-import org.assertj.core.api.Assertions.assertThat
 import ltd.hlaeja.library.accountRegistry.Authentication
 import ltd.hlaeja.test.compareToFile
-import ltd.hlaeja.test.container.PostgresContainer
+import ltd.hlaeja.test.container.PostgresTestContainer
+import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.SoftAssertions
 import org.assertj.core.api.junit.jupiter.InjectSoftAssertions
 import org.assertj.core.api.junit.jupiter.SoftAssertionsExtension
@@ -17,7 +17,7 @@ import org.springframework.http.HttpStatus
 import org.springframework.test.web.reactive.server.WebTestClient
 import org.springframework.test.web.reactive.server.expectBody
 
-@PostgresContainer
+@PostgresTestContainer
 @SpringBootTest(webEnvironment = RANDOM_PORT)
 @ExtendWith(SoftAssertionsExtension::class)
 class AuthenticationEndpoint {
diff --git a/src/test-integration/resources/application.yml b/src/test-integration/resources/application.yml
index 7ce3f7d..9587ed5 100644
--- a/src/test-integration/resources/application.yml
+++ b/src/test-integration/resources/application.yml
@@ -6,10 +6,14 @@ spring:
     url: r2dbc:postgresql://placeholder
     username: placeholder
     password: placeholder
-
-container:
-  postgres:
-    version: postgres:17
-    init: postgres/schema.sql
-    before: postgres/data.sql
-    after: postgres/reset.sql
+  kafka:
+    consumer:
+      group-id: test-group
+      auto-offset-reset: earliest
+      key-deserializer: org.apache.kafka.common.serialization.StringDeserializer
+      value-deserializer: org.springframework.kafka.support.serializer.JsonDeserializer
+      properties:
+        spring.json.trusted.packages: "*"
+    producer:
+      key-serializer: org.apache.kafka.common.serialization.StringSerializer
+      value-serializer: org.springframework.kafka.support.serializer.JsonSerializer