diff --git a/control/src/test/kotlin/integration/LiveBreakpointTest.kt b/control/src/test/kotlin/integration/LiveBreakpointTest.kt
index 4025718d..630fd1d2 100644
--- a/control/src/test/kotlin/integration/LiveBreakpointTest.kt
+++ b/control/src/test/kotlin/integration/LiveBreakpointTest.kt
@@ -25,12 +25,12 @@ class LiveBreakpointTest : ProbeIntegrationTest() {
         val testContext = VertxTestContext()
         val consumer = vertx.eventBus().localConsumer<JsonObject>("local." + Provide.LIVE_INSTRUMENT_SUBSCRIBER)
         consumer.handler {
-            val event = Json.decodeValue(it.body().toString(), LiveInstrumentEvent::class.java)
-            log.trace("Received event: $event")
+            testContext.verify {
+                val event = Json.decodeValue(it.body().toString(), LiveInstrumentEvent::class.java)
+                log.trace("Received event: $event")
 
-            if (event.eventType == LiveInstrumentEventType.BREAKPOINT_HIT) {
-                val item = Json.decodeValue(event.data, LiveBreakpointHit::class.java)
-                testContext.verify {
+                if (event.eventType == LiveInstrumentEventType.BREAKPOINT_HIT) {
+                    val item = Json.decodeValue(event.data, LiveBreakpointHit::class.java)
                     val vars = item.stackTrace.first().variables
                     assertEquals(9, vars.size)
                 }
diff --git a/control/src/test/kotlin/integration/LiveLogTest.kt b/control/src/test/kotlin/integration/LiveLogTest.kt
index 2bb7fcf4..223d8ecf 100644
--- a/control/src/test/kotlin/integration/LiveLogTest.kt
+++ b/control/src/test/kotlin/integration/LiveLogTest.kt
@@ -25,12 +25,12 @@ class LiveLogTest : ProbeIntegrationTest() {
         val testContext = VertxTestContext()
         val consumer = vertx.eventBus().localConsumer<JsonObject>("local." + Provide.LIVE_INSTRUMENT_SUBSCRIBER)
         consumer.handler {
-            val event = Json.decodeValue(it.body().toString(), LiveInstrumentEvent::class.java)
-            log.trace("Received event: $event")
+            testContext.verify {
+                val event = Json.decodeValue(it.body().toString(), LiveInstrumentEvent::class.java)
+                log.trace("Received event: $event")
 
-            if (event.eventType == LiveInstrumentEventType.LOG_HIT) {
-                val item = Json.decodeValue(event.data, LiveLogHit::class.java)
-                testContext.verify {
+                if (event.eventType == LiveInstrumentEventType.LOG_HIT) {
+                    val item = Json.decodeValue(event.data, LiveLogHit::class.java)
                     assertEquals("1 a a", item.logResult.logs.first().getFormattedMessage())
                 }
                 consumer.unregister()
diff --git a/e2e/config/logback.xml b/e2e/config/logback.xml
deleted file mode 100644
index 1b4f2985..00000000
--- a/e2e/config/logback.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-    <statusListener class="ch.qos.logback.core.status.NopStatusListener"/>
-
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>%black(%d{ISO8601}) %highlight(%-5level) %yellow(%logger{15}): %msg%n%throwable</pattern>
-        </encoder>
-    </appender>
-
-    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>logs/spp-platform.log</file>
-        <append>true</append>
-        <encoder>
-            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
-        </encoder>
-
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>logs/archived/spp-platform-%d{"yyyy-MM-dd"}.%i.log</fileNamePattern>
-
-            <!-- Rollover daily and when the file reaches 10 MegaBytes, keep the last 14 days  -->
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>10MB</maxFileSize>
-                <maxHistory>14</maxHistory>
-            </timeBasedFileNamingAndTriggeringPolicy>
-        </rollingPolicy>
-    </appender>
-
-    <root level="TRACE">
-        <appender-ref ref="STDOUT"/>
-        <appender-ref ref="FILE"/>
-    </root>
-    <logger name="spp.platform" level="TRACE"/>
-    <logger name="spp.service" level="TRACE"/>
-    <logger name="spp.processor" level="TRACE"/>
-
-    <logger name="io.netty" level="WARN"/>
-    <logger name="io.vertx" level="WARN"/>
-    <logger name="graphql.GraphQL" level="WARN"/>
-    <logger name="graphql" level="WARN"/>
-    <logger name="graphql.execution" level="WARN"/>
-    <logger name="notprivacysafe.graphql" level="WARN"/>
-    <logger name="notprivacysafe.graphql.execution" level="WARN"/>
-    <logger name="org.zeroturnaround" level="WARN"/>
-</configuration>
\ No newline at end of file
diff --git a/e2e/config/spp-platform.yml b/e2e/config/spp-platform.yml
deleted file mode 100644
index 4c56a8cb..00000000
--- a/e2e/config/spp-platform.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-spp-platform:
-  host: ${SPP_PLATFORM_HOST:-0.0.0.0}
-  port: ${SPP_PLATFORM_PORT:-5445}
-  access_token: ${SPP_SYSTEM_ACCESS_TOKEN:-change-me}
-  logging:
-    level: ${SPP_LOGGING_LEVEL:-trace}
-  probe:
-    bridge_port: ${SPP_PROBE_BRIDGE_PORT:-5450}
-  marker:
-    bridge_port: ${SPP_MARKER_BRIDGE_PORT:-5455}
-  processor:
-    bridge_port: ${SPP_PROCESSOR_BRIDGE_PORT:-5460}
-
-storage:
-  selector: ${SPP_STORAGE:-memory}
-
-skywalking-oap:
-  host: ${SPP_OAP_HOST:-skywalking-oap}
-  port: ${SPP_OAP_PORT:-12800}
diff --git a/e2e/docker-compose.yml b/e2e/docker-compose.yml
index 5af4bc7f..18ffbf15 100644
--- a/e2e/docker-compose.yml
+++ b/e2e/docker-compose.yml
@@ -23,11 +23,12 @@ services:
       - "5445:5445"
       - "5450:5450"
       - "5455:5455"
+    environment:
+      - SPP_LOGGING_LEVEL=trace
+      - SPP_OAP_HOST=skywalking-oap
     volumes:
-      - ./config/logback.xml:/opt/sourceplusplus/config/logback.xml
       - ./config/spp-platform.crt:/opt/sourceplusplus/config/spp-platform.crt
       - ./config/spp-platform.key:/opt/sourceplusplus/config/spp-platform.key
-      - ./config/spp-platform.yml:/opt/sourceplusplus/config/spp-platform.yml
   skywalking-oap:
     image: sourceplusplus/spp-oap-server:latest
     container_name: skywalking-oap