diff --git a/wls-admin-service/src/main/resources/application-test.yml b/wls-admin-service/src/test/resources/application-test.yml
similarity index 100%
rename from wls-admin-service/src/main/resources/application-test.yml
rename to wls-admin-service/src/test/resources/application-test.yml
diff --git a/wls-basisdaten-service/src/test/resources/application-test.yml b/wls-basisdaten-service/src/test/resources/application-test.yml
index 25c10c3a6..caece4596 100644
--- a/wls-basisdaten-service/src/test/resources/application-test.yml
+++ b/wls-basisdaten-service/src/test/resources/application-test.yml
@@ -12,10 +12,6 @@ spring:
   jpa:
     database: H2
     hibernate:
-      # always drop and create the db should be the best
-      # configuration for local (development) mode. this
-      # is also the default, that spring offers by convention.
-      # but here explicite:
       ddl-auto: validate
       naming.physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
     # Logging for database operation
diff --git a/wls-briefwahl-service/src/test/resources/application-test.yml b/wls-briefwahl-service/src/test/resources/application-test.yml
index 19918fccd..4aa61f68c 100644
--- a/wls-briefwahl-service/src/test/resources/application-test.yml
+++ b/wls-briefwahl-service/src/test/resources/application-test.yml
@@ -5,10 +5,6 @@ spring:
   jpa:
     database: H2
     hibernate:
-      # always drop and create the db should be the best
-      # configuration for local (development) mode. this
-      # is also the default, that spring offers by convention.
-      # but here explicite:
       ddl-auto: validate
       naming.physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
     # Logging for database operation
diff --git a/wls-broadcast-service/src/main/resources/application-dev.yml b/wls-broadcast-service/src/main/resources/application-dev.yml
deleted file mode 100644
index 7b63b4453..000000000
--- a/wls-broadcast-service/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-spring:
-
-  # Spring JPA
-  h2.console.enabled: true
-  jpa:
-    database: H2
-    hibernate:
-      # always drop and create the db should be the best
-      # configuration for local (development) mode. this
-      # is also the default, that spring offers by convention.
-      # but here explicite:
-      ddl-auto: create-drop
-      naming.physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
-    # Logging for database operation
-    show-sql: true
-    properties:
-      hibernate:
-        format_sql: true
-  security:
-    oauth2:
-      resourceserver:
-        jwt:
-          jwk-set-uri:
-
-security:
-  # possible values: none, all, changing (With changing, only changing requests such as POST, PUT, DELETE are logged)
-  logging.requests: all
-  oauth2:
-    resource.user-info-uri:
diff --git a/wls-broadcast-service/src/main/resources/application-kon.yml b/wls-broadcast-service/src/main/resources/application-kon.yml
deleted file mode 100644
index 7b63b4453..000000000
--- a/wls-broadcast-service/src/main/resources/application-kon.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-spring:
-
-  # Spring JPA
-  h2.console.enabled: true
-  jpa:
-    database: H2
-    hibernate:
-      # always drop and create the db should be the best
-      # configuration for local (development) mode. this
-      # is also the default, that spring offers by convention.
-      # but here explicite:
-      ddl-auto: create-drop
-      naming.physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
-    # Logging for database operation
-    show-sql: true
-    properties:
-      hibernate:
-        format_sql: true
-  security:
-    oauth2:
-      resourceserver:
-        jwt:
-          jwk-set-uri:
-
-security:
-  # possible values: none, all, changing (With changing, only changing requests such as POST, PUT, DELETE are logged)
-  logging.requests: all
-  oauth2:
-    resource.user-info-uri:
diff --git a/wls-broadcast-service/src/main/resources/application-prod.yml b/wls-broadcast-service/src/main/resources/application-prod.yml
deleted file mode 100644
index 7b63b4453..000000000
--- a/wls-broadcast-service/src/main/resources/application-prod.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-spring:
-
-  # Spring JPA
-  h2.console.enabled: true
-  jpa:
-    database: H2
-    hibernate:
-      # always drop and create the db should be the best
-      # configuration for local (development) mode. this
-      # is also the default, that spring offers by convention.
-      # but here explicite:
-      ddl-auto: create-drop
-      naming.physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
-    # Logging for database operation
-    show-sql: true
-    properties:
-      hibernate:
-        format_sql: true
-  security:
-    oauth2:
-      resourceserver:
-        jwt:
-          jwk-set-uri:
-
-security:
-  # possible values: none, all, changing (With changing, only changing requests such as POST, PUT, DELETE are logged)
-  logging.requests: all
-  oauth2:
-    resource.user-info-uri:
diff --git a/wls-briefwahl-service/src/main/resources/application-test.yml b/wls-eai-service/src/test/resources/application-test.yml
similarity index 100%
rename from wls-briefwahl-service/src/main/resources/application-test.yml
rename to wls-eai-service/src/test/resources/application-test.yml
diff --git a/wls-infomanagement-service/src/main/resources/application-test.yml b/wls-infomanagement-service/src/main/resources/application-test.yml
deleted file mode 100644
index 562b25f44..000000000
--- a/wls-infomanagement-service/src/main/resources/application-test.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-spring:
-
-  # Spring JPA
-  h2.console.enabled: true
-  jpa:
-    database: H2
-    hibernate:
-      # always drop and create the db should be the best
-      # configuration for local (development) mode. this
-      # is also the default, that spring offers by convention.
-      # but here explicite:
-      ddl-auto: create-drop
-      naming.physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
-    # Logging for database operation
-    show-sql: true
-    properties:
-      hibernate:
-        format_sql: true
diff --git a/wls-broadcast-service/src/main/resources/application-test.yml b/wls-infomanagement-service/src/test/resources/application-test.yml
similarity index 100%
rename from wls-broadcast-service/src/main/resources/application-test.yml
rename to wls-infomanagement-service/src/test/resources/application-test.yml
diff --git a/wls-monitoring-service/src/main/resources/application-test.yml b/wls-monitoring-service/src/main/resources/application-test.yml
deleted file mode 100644
index 562b25f44..000000000
--- a/wls-monitoring-service/src/main/resources/application-test.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-spring:
-
-  # Spring JPA
-  h2.console.enabled: true
-  jpa:
-    database: H2
-    hibernate:
-      # always drop and create the db should be the best
-      # configuration for local (development) mode. this
-      # is also the default, that spring offers by convention.
-      # but here explicite:
-      ddl-auto: create-drop
-      naming.physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
-    # Logging for database operation
-    show-sql: true
-    properties:
-      hibernate:
-        format_sql: true
diff --git a/wls-monitoring-service/src/test/resources/application-test.yml b/wls-monitoring-service/src/test/resources/application-test.yml
index 7b6942275..8b833f367 100644
--- a/wls-monitoring-service/src/test/resources/application-test.yml
+++ b/wls-monitoring-service/src/test/resources/application-test.yml
@@ -9,10 +9,6 @@ spring:
   jpa:
     database: H2
     hibernate:
-      # always drop and create the db should be the best
-      # configuration for local (development) mode. this
-      # is also the default, that spring offers by convention.
-      # but here explicite:
       ddl-auto: validate
       naming.physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
     # Logging for database operation
diff --git a/wls-vorfaelleundvorkommnisse-service/src/main/resources/application-test.yml b/wls-vorfaelleundvorkommnisse-service/src/main/resources/application-test.yml
deleted file mode 100644
index 19918fccd..000000000
--- a/wls-vorfaelleundvorkommnisse-service/src/main/resources/application-test.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-spring:
-
-  # Spring JPA
-  h2.console.enabled: true
-  jpa:
-    database: H2
-    hibernate:
-      # always drop and create the db should be the best
-      # configuration for local (development) mode. this
-      # is also the default, that spring offers by convention.
-      # but here explicite:
-      ddl-auto: validate
-      naming.physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
-    # Logging for database operation
-    show-sql: true
-    properties:
-      hibernate:
-        format_sql: true
diff --git a/wls-wahlvorbereitung-service/src/main/resources/application-test.yml b/wls-wahlvorbereitung-service/src/main/resources/application-test.yml
deleted file mode 100644
index 562b25f44..000000000
--- a/wls-wahlvorbereitung-service/src/main/resources/application-test.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-spring:
-
-  # Spring JPA
-  h2.console.enabled: true
-  jpa:
-    database: H2
-    hibernate:
-      # always drop and create the db should be the best
-      # configuration for local (development) mode. this
-      # is also the default, that spring offers by convention.
-      # but here explicite:
-      ddl-auto: create-drop
-      naming.physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
-    # Logging for database operation
-    show-sql: true
-    properties:
-      hibernate:
-        format_sql: true
diff --git a/wls-eai-service/src/main/resources/application-test.yml b/wls-wahlvorbereitung-service/src/test/resources/application-test.yml
similarity index 100%
rename from wls-eai-service/src/main/resources/application-test.yml
rename to wls-wahlvorbereitung-service/src/test/resources/application-test.yml