diff --git a/modules/apps/gb32960-ingest-app/src/main/resources/application.yml b/modules/apps/gb32960-ingest-app/src/main/resources/application.yml
index fbf2e405..ba28800a 100644
--- a/modules/apps/gb32960-ingest-app/src/main/resources/application.yml
+++ b/modules/apps/gb32960-ingest-app/src/main/resources/application.yml
@@ -125,10 +125,6 @@ lingniu:
         path: ${SINK_ARCHIVE_PATH:./archive/}
     event-history:
       enabled: false
-    vehicle-state:
-      enabled: false
-    vehicle-stat:
-      enabled: false
 
 management:
   endpoints:
diff --git a/modules/apps/gb32960-ingest-app/src/test/java/com/lingniu/ingest/gb32960app/Gb32960IngestAppCompositionTest.java b/modules/apps/gb32960-ingest-app/src/test/java/com/lingniu/ingest/gb32960app/Gb32960IngestAppCompositionTest.java
index aac52908..b47ca5e4 100644
--- a/modules/apps/gb32960-ingest-app/src/test/java/com/lingniu/ingest/gb32960app/Gb32960IngestAppCompositionTest.java
+++ b/modules/apps/gb32960-ingest-app/src/test/java/com/lingniu/ingest/gb32960app/Gb32960IngestAppCompositionTest.java
@@ -49,9 +49,7 @@ class Gb32960IngestAppCompositionTest {
                     "lingniu.ingest.sink.mq.consumer.enabled=false",
                     "lingniu.ingest.sink.archive.enabled=true",
                     "lingniu.ingest.sink.archive.path=target/test-archive-gb32960",
-                    "lingniu.ingest.event-history.enabled=false",
-                    "lingniu.ingest.vehicle-state.enabled=false",
-                    "lingniu.ingest.vehicle-stat.enabled=false");
+                    "lingniu.ingest.event-history.enabled=false");
 
     @Test
     void createsGb32960ListenerWithoutHistoryStorageBoundaries() {
diff --git a/modules/apps/gb32960-ingest-app/src/test/java/com/lingniu/ingest/gb32960app/Gb32960IngestAppDefaultsTest.java b/modules/apps/gb32960-ingest-app/src/test/java/com/lingniu/ingest/gb32960app/Gb32960IngestAppDefaultsTest.java
index e45d1670..8c4908b8 100644
--- a/modules/apps/gb32960-ingest-app/src/test/java/com/lingniu/ingest/gb32960app/Gb32960IngestAppDefaultsTest.java
+++ b/modules/apps/gb32960-ingest-app/src/test/java/com/lingniu/ingest/gb32960app/Gb32960IngestAppDefaultsTest.java
@@ -49,14 +49,17 @@ class Gb32960IngestAppDefaultsTest {
                 .containsEntry("lingniu.ingest.identity.mysql.table-name",
                         "${VEHICLE_IDENTITY_MYSQL_TABLE:vehicle_identity_bindings}")
                 .containsEntry("lingniu.ingest.event-history.enabled", false)
-                .containsEntry("lingniu.ingest.vehicle-state.enabled", false)
-                .containsEntry("lingniu.ingest.vehicle-stat.enabled", false)
                 .containsEntry("management.endpoints.web.exposure.include",
                         "health,info,metrics,prometheus,gb32960sessions");
 
         assertThat(properties.stringPropertyNames())
-                .noneMatch(name -> name.startsWith("lingniu.ingest.event-file-store."));
-        assertThat(applicationYaml()).doesNotContain("event-file-store:");
+                .noneMatch(name -> name.startsWith("lingniu.ingest.event-file-store."))
+                .noneMatch(name -> name.startsWith("lingniu.ingest.vehicle-state."))
+                .noneMatch(name -> name.startsWith("lingniu.ingest.vehicle-stat."));
+        assertThat(applicationYaml())
+                .doesNotContain("event-file-store:")
+                .doesNotContain("vehicle-state:")
+                .doesNotContain("vehicle-stat:");
         assertThat(applicationYaml())
                 .contains("password: ${GB32960_PLATFORM_PWD_HYUNDAI:}")
                 .contains("password: ${GB32960_PLATFORM_PWD_YUEJIN:}");
diff --git a/modules/apps/jt808-ingest-app/src/main/resources/application.yml b/modules/apps/jt808-ingest-app/src/main/resources/application.yml
index 8f26a472..bf4a2719 100644
--- a/modules/apps/jt808-ingest-app/src/main/resources/application.yml
+++ b/modules/apps/jt808-ingest-app/src/main/resources/application.yml
@@ -85,10 +85,6 @@ lingniu:
           enabled: false
     event-history:
       enabled: false
-    vehicle-state:
-      enabled: false
-    vehicle-stat:
-      enabled: false
 
 management:
   endpoints:
diff --git a/modules/apps/jt808-ingest-app/src/test/java/com/lingniu/ingest/jt808app/Jt808IngestAppCompositionTest.java b/modules/apps/jt808-ingest-app/src/test/java/com/lingniu/ingest/jt808app/Jt808IngestAppCompositionTest.java
index 849fdbd9..e00ee080 100644
--- a/modules/apps/jt808-ingest-app/src/test/java/com/lingniu/ingest/jt808app/Jt808IngestAppCompositionTest.java
+++ b/modules/apps/jt808-ingest-app/src/test/java/com/lingniu/ingest/jt808app/Jt808IngestAppCompositionTest.java
@@ -48,9 +48,7 @@ class Jt808IngestAppCompositionTest {
                     "lingniu.ingest.sink.mq.consumer.enabled=false",
                     "lingniu.ingest.sink.archive.enabled=true",
                     "lingniu.ingest.sink.archive.path=target/test-archive-jt808",
-                    "lingniu.ingest.event-history.enabled=false",
-                    "lingniu.ingest.vehicle-state.enabled=false",
-                    "lingniu.ingest.vehicle-stat.enabled=false");
+                    "lingniu.ingest.event-history.enabled=false");
 
     @Test
     void createsJt808ListenerWithoutHistoryStorageBoundaries() {
diff --git a/modules/apps/jt808-ingest-app/src/test/java/com/lingniu/ingest/jt808app/Jt808IngestAppDefaultsTest.java b/modules/apps/jt808-ingest-app/src/test/java/com/lingniu/ingest/jt808app/Jt808IngestAppDefaultsTest.java
index 6adbef27..c651403c 100644
--- a/modules/apps/jt808-ingest-app/src/test/java/com/lingniu/ingest/jt808app/Jt808IngestAppDefaultsTest.java
+++ b/modules/apps/jt808-ingest-app/src/test/java/com/lingniu/ingest/jt808app/Jt808IngestAppDefaultsTest.java
@@ -44,13 +44,16 @@ class Jt808IngestAppDefaultsTest {
                 .containsEntry("lingniu.ingest.identity.mysql.initialize-schema",
                         "${VEHICLE_IDENTITY_MYSQL_INITIALIZE_SCHEMA:true}")
                 .containsEntry("lingniu.ingest.event-history.enabled", false)
-                .containsEntry("lingniu.ingest.vehicle-state.enabled", false)
-                .containsEntry("lingniu.ingest.vehicle-stat.enabled", false)
                 .containsEntry("management.endpoints.web.exposure.include", "health,info,metrics,prometheus");
 
         assertThat(properties.stringPropertyNames())
-                .noneMatch(name -> name.startsWith("lingniu.ingest.event-file-store."));
-        assertThat(applicationYaml()).doesNotContain("event-file-store:");
+                .noneMatch(name -> name.startsWith("lingniu.ingest.event-file-store."))
+                .noneMatch(name -> name.startsWith("lingniu.ingest.vehicle-state."))
+                .noneMatch(name -> name.startsWith("lingniu.ingest.vehicle-stat."));
+        assertThat(applicationYaml())
+                .doesNotContain("event-file-store:")
+                .doesNotContain("vehicle-state:")
+                .doesNotContain("vehicle-stat:");
     }
 
     private static Properties applicationProperties() {
diff --git a/modules/apps/yutong-mqtt-app/src/main/resources/application.yml b/modules/apps/yutong-mqtt-app/src/main/resources/application.yml
index 39ee6660..f796ad74 100644
--- a/modules/apps/yutong-mqtt-app/src/main/resources/application.yml
+++ b/modules/apps/yutong-mqtt-app/src/main/resources/application.yml
@@ -95,10 +95,6 @@ lingniu:
         path: ${SINK_ARCHIVE_PATH:./archive/}
     event-history:
       enabled: false
-    vehicle-state:
-      enabled: false
-    vehicle-stat:
-      enabled: false
 
 management:
   endpoints:
diff --git a/modules/apps/yutong-mqtt-app/src/test/java/com/lingniu/ingest/yutongmqttapp/YutongMqttAppCompositionTest.java b/modules/apps/yutong-mqtt-app/src/test/java/com/lingniu/ingest/yutongmqttapp/YutongMqttAppCompositionTest.java
index d47aa351..33b8aba0 100644
--- a/modules/apps/yutong-mqtt-app/src/test/java/com/lingniu/ingest/yutongmqttapp/YutongMqttAppCompositionTest.java
+++ b/modules/apps/yutong-mqtt-app/src/test/java/com/lingniu/ingest/yutongmqttapp/YutongMqttAppCompositionTest.java
@@ -51,9 +51,7 @@ class YutongMqttAppCompositionTest {
                     "lingniu.ingest.sink.mq.consumer.enabled=false",
                     "lingniu.ingest.sink.archive.enabled=true",
                     "lingniu.ingest.sink.archive.path=target/test-archive-yutong",
-                    "lingniu.ingest.event-history.enabled=false",
-                    "lingniu.ingest.vehicle-state.enabled=false",
-                    "lingniu.ingest.vehicle-stat.enabled=false");
+                    "lingniu.ingest.event-history.enabled=false");
 
     @Test
     void createsMqttIngressAndKafkaSinksWithoutHistoryStorage(CapturedOutput output) {
diff --git a/modules/apps/yutong-mqtt-app/src/test/java/com/lingniu/ingest/yutongmqttapp/YutongMqttAppDefaultsTest.java b/modules/apps/yutong-mqtt-app/src/test/java/com/lingniu/ingest/yutongmqttapp/YutongMqttAppDefaultsTest.java
index d94f3a2d..58e0128f 100644
--- a/modules/apps/yutong-mqtt-app/src/test/java/com/lingniu/ingest/yutongmqttapp/YutongMqttAppDefaultsTest.java
+++ b/modules/apps/yutong-mqtt-app/src/test/java/com/lingniu/ingest/yutongmqttapp/YutongMqttAppDefaultsTest.java
@@ -38,13 +38,16 @@ class YutongMqttAppDefaultsTest {
                         "${VEHICLE_IDENTITY_MYSQL_TABLE:vehicle_identity_bindings}")
                 .containsEntry("lingniu.ingest.sink.archive.enabled", "${SINK_ARCHIVE_ENABLED:true}")
                 .containsEntry("lingniu.ingest.event-history.enabled", false)
-                .containsEntry("lingniu.ingest.vehicle-state.enabled", false)
-                .containsEntry("lingniu.ingest.vehicle-stat.enabled", false)
                 .containsEntry("management.endpoints.web.exposure.include", "health,info,metrics,prometheus");
 
         assertThat(properties.stringPropertyNames())
-                .noneMatch(name -> name.startsWith("lingniu.ingest.event-file-store."));
-        assertThat(applicationYaml()).doesNotContain("event-file-store:");
+                .noneMatch(name -> name.startsWith("lingniu.ingest.event-file-store."))
+                .noneMatch(name -> name.startsWith("lingniu.ingest.vehicle-state."))
+                .noneMatch(name -> name.startsWith("lingniu.ingest.vehicle-stat."));
+        assertThat(applicationYaml())
+                .doesNotContain("event-file-store:")
+                .doesNotContain("vehicle-state:")
+                .doesNotContain("vehicle-stat:");
     }
 
     private static Properties applicationProperties() {