diff --git a/module-server/src/main/kotlin/de/twomartens/wahlrecht/configuration/KafkaConfiguration.kt b/module-server/src/main/kotlin/de/twomartens/wahlrecht/configuration/KafkaConfiguration.kt
deleted file mode 100644
index 32463be..0000000
--- a/module-server/src/main/kotlin/de/twomartens/wahlrecht/configuration/KafkaConfiguration.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package de.twomartens.wahlrecht.configuration
-
-import org.apache.kafka.clients.admin.AdminClientConfig
-import org.springframework.beans.factory.annotation.Value
-import org.springframework.context.annotation.Bean
-import org.springframework.context.annotation.Configuration
-import org.springframework.kafka.core.KafkaAdmin
-
-@Configuration
-open class KafkaConfiguration {
-  @Value(value = "\${spring.kafka.bootstrap-servers[0]}")
-  private val bootstrapServers: List<String> = mutableListOf()
-
-  @Bean
-  open fun kafkaAdmin(): KafkaAdmin {
-    val configs: MutableMap<String, Any?> = HashMap()
-    configs[AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG] = bootstrapServers.first()
-    return KafkaAdmin(configs)
-  }
-}
\ No newline at end of file
diff --git a/module-server/src/main/resources/application-dev.yaml b/module-server/src/main/resources/application-dev.yaml
index 73cda04..d329a09 100644
--- a/module-server/src/main/resources/application-dev.yaml
+++ b/module-server/src/main/resources/application-dev.yaml
@@ -1,7 +1,3 @@
-server.port: 12000
-management.server.port: 12001
-
-
 spring:
   config:
     import:
diff --git a/module-server/src/main/resources/application.yaml b/module-server/src/main/resources/application.yaml
index c2cdb1f..f143fce 100644
--- a/module-server/src/main/resources/application.yaml
+++ b/module-server/src/main/resources/application.yaml
@@ -1,12 +1,12 @@
 server:
-  port: 12000
+  port: ${PORT:12000}
   shutdown: graceful
   forward-headers-strategy: framework
 
 ### technical configurations ###
 management:
   # for security, don't use same port as application
-  server.port: 12001
+  server.port: ${ACTUATOR_PORT:12001}
   health:
     livenessState.enabled: true
     readinessState.enabled: true