diff --git a/module-server/src/main/resources/application.yaml b/module-server/src/main/resources/application.yaml
index 4f218ef..fc6265e 100644
--- a/module-server/src/main/resources/application.yaml
+++ b/module-server/src/main/resources/application.yaml
@@ -23,6 +23,10 @@ management:
     http.server.requests: true
 
 spring:
+  config:
+    import:
+      - "classpath:config/wahlrecht.yaml"
+      - "optional:configserver:http://configserver:8888/config"
   main:
     banner-mode: off
   profiles:
@@ -38,17 +42,6 @@ spring:
   application:
     name: wahlrecht
 
-
-# properties for application
-de.twomartens.wahlrecht:
-  defaultTimeZone: Europe/Berlin
-  greeting: "Hello %s"
-  statusprobe:
-    scheduleDuration: 60
-    maxKafkaFailureDuration: 5
-    maxBlobFailureCount: 5
-    maxFailurePercent: 50
-
 springdoc:
   swagger-ui:
     display-request-duration: true
diff --git a/module-server/src/main/resources/bootstrap.yaml b/module-server/src/main/resources/bootstrap.yaml
deleted file mode 100644
index d5d92bf..0000000
--- a/module-server/src/main/resources/bootstrap.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-spring:
-  config:
-    import: "optional:configserver:http://configserver:8888/config"
diff --git a/module-server/src/main/resources/config/wahlrecht.yaml b/module-server/src/main/resources/config/wahlrecht.yaml
new file mode 100644
index 0000000..739ed55
--- /dev/null
+++ b/module-server/src/main/resources/config/wahlrecht.yaml
@@ -0,0 +1,8 @@
+de.twomartens.wahlrecht:
+  defaultTimeZone: Europe/Berlin
+  greeting: "Hello %s"
+  statusprobe:
+    scheduleDuration: 60
+    maxKafkaFailureDuration: 5
+    maxBlobFailureCount: 5
+    maxFailurePercent: 50
\ No newline at end of file