diff --git a/theodolite-benchmarks/definitions/uc1-beam-flink/resources/input-topic.yaml b/theodolite-benchmarks/definitions/uc1-beam-flink/resources/input-topic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d16ed916b77141c5e485d88a602a5d78f3b63f50
--- /dev/null
+++ b/theodolite-benchmarks/definitions/uc1-beam-flink/resources/input-topic.yaml
@@ -0,0 +1,9 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: input
+  labels:
+    strimzi.io/cluster: theodolite-kafka
+spec:
+  partitions: 100
+  replicas: 1
diff --git a/theodolite-benchmarks/definitions/uc1-beam-flink/uc1-beam-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc1-beam-flink/uc1-beam-flink-benchmark-operator.yaml
index 6b21aa2ab11c10be93f4113ad19fc7212032880f..09dca3c59d83f563750cb58d96c0c04db2468b5c 100644
--- a/theodolite-benchmarks/definitions/uc1-beam-flink/uc1-beam-flink-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc1-beam-flink/uc1-beam-flink-benchmark-operator.yaml
@@ -12,6 +12,7 @@ spec:
       - configMap:
           name: "benchmark-resources-uc1-beam-flink"
           files:
+          - "input-topic.yaml"
           - "flink-configuration-configmap.yaml"
           - "taskmanager-deployment.yaml"
           - "taskmanager-service.yaml"
@@ -91,9 +92,3 @@ spec:
         threshold: 2000
         externalSloUrl: "http://localhost:80/evaluate-slope"
         warmup: 60 # in seconds
-  kafkaConfig:
-    bootstrapServer: "theodolite-kafka-kafka-bootstrap:9092"
-    topics:
-      - name: "input"
-        numPartitions: 100
-        replicationFactor: 1
diff --git a/theodolite-benchmarks/definitions/uc1-beam-samza/resources/input-topic.yaml b/theodolite-benchmarks/definitions/uc1-beam-samza/resources/input-topic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d16ed916b77141c5e485d88a602a5d78f3b63f50
--- /dev/null
+++ b/theodolite-benchmarks/definitions/uc1-beam-samza/resources/input-topic.yaml
@@ -0,0 +1,9 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: input
+  labels:
+    strimzi.io/cluster: theodolite-kafka
+spec:
+  partitions: 100
+  replicas: 1
diff --git a/theodolite-benchmarks/definitions/uc1-beam-samza/uc1-beam-samza-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc1-beam-samza/uc1-beam-samza-benchmark-operator.yaml
index 428f9928f8441d8dd81c15b1fcd5bc3032f7ad80..ff81feaac61c24e68613304aa5e9ee2a694498e0 100644
--- a/theodolite-benchmarks/definitions/uc1-beam-samza/uc1-beam-samza-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc1-beam-samza/uc1-beam-samza-benchmark-operator.yaml
@@ -12,6 +12,7 @@ spec:
       - configMap:
           name: "benchmark-resources-uc1-beam-samza"
           files:
+          - "input-topic.yaml"
           - "uc1-beam-samza-deployment.yaml"
           - "beam-samza-service.yaml"
           - "service-monitor.yaml"
@@ -83,9 +84,6 @@ spec:
   kafkaConfig:
     bootstrapServer: "theodolite-kafka-kafka-bootstrap:9092"
     topics:
-      - name: "input"
-        numPartitions: 100
-        replicationFactor: 1
       - name: ".*samza.*"
         removeOnly: true
       - name: ".*uc1-application.*"
diff --git a/theodolite-benchmarks/definitions/uc1-flink/resources/input-topic.yaml b/theodolite-benchmarks/definitions/uc1-flink/resources/input-topic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d16ed916b77141c5e485d88a602a5d78f3b63f50
--- /dev/null
+++ b/theodolite-benchmarks/definitions/uc1-flink/resources/input-topic.yaml
@@ -0,0 +1,9 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: input
+  labels:
+    strimzi.io/cluster: theodolite-kafka
+spec:
+  partitions: 100
+  replicas: 1
diff --git a/theodolite-benchmarks/definitions/uc1-flink/uc1-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc1-flink/uc1-flink-benchmark-operator.yaml
index ddd0d388aa33d36caa6ffb29c384346f379b2530..22001e6c8b01175596e6bdf9b6dffa61f9154086 100644
--- a/theodolite-benchmarks/definitions/uc1-flink/uc1-flink-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc1-flink/uc1-flink-benchmark-operator.yaml
@@ -12,6 +12,7 @@ spec:
       - configMap:
           name: "benchmark-resources-uc1-flink"
           files:
+          - "input-topic.yaml"
           - "flink-configuration-configmap.yaml"
           - "taskmanager-deployment.yaml"
           - "taskmanager-service.yaml"
@@ -91,9 +92,3 @@ spec:
         threshold: 2000
         externalSloUrl: "http://localhost:80/evaluate-slope"
         warmup: 60 # in seconds
-  kafkaConfig:
-    bootstrapServer: "theodolite-kafka-kafka-bootstrap:9092"
-    topics:
-      - name: "input"
-        numPartitions: 100
-        replicationFactor: 1
diff --git a/theodolite-benchmarks/definitions/uc1-hazelcastjet/resources/input-topic.yaml b/theodolite-benchmarks/definitions/uc1-hazelcastjet/resources/input-topic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d16ed916b77141c5e485d88a602a5d78f3b63f50
--- /dev/null
+++ b/theodolite-benchmarks/definitions/uc1-hazelcastjet/resources/input-topic.yaml
@@ -0,0 +1,9 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: input
+  labels:
+    strimzi.io/cluster: theodolite-kafka
+spec:
+  partitions: 100
+  replicas: 1
diff --git a/theodolite-benchmarks/definitions/uc1-hazelcastjet/uc1-hazelcastjet-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc1-hazelcastjet/uc1-hazelcastjet-benchmark-operator.yaml
index b3933ff355f2320da4bcf632cb41cacb18aa70c4..a77b2172722751355f65371ba8c0ddb593008ef7 100644
--- a/theodolite-benchmarks/definitions/uc1-hazelcastjet/uc1-hazelcastjet-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc1-hazelcastjet/uc1-hazelcastjet-benchmark-operator.yaml
@@ -12,6 +12,7 @@ spec:
       - configMap:
           name: "benchmark-resources-uc1-hazelcastjet"
           files:
+          - "input-topic.yaml"
           - "uc1-hazelcastjet-deployment.yaml"
           - "uc1-hazelcastjet-service.yaml"
           - "uc1-jmx-configmap.yaml"
@@ -66,9 +67,3 @@ spec:
         threshold: 2000
         externalSloUrl: "http://localhost:80/evaluate-slope"
         warmup: 60 # in seconds
-  kafkaConfig:
-    bootstrapServer: "theodolite-kafka-kafka-bootstrap:9092"
-    topics:
-      - name: "input"
-        numPartitions: 100
-        replicationFactor: 1
diff --git a/theodolite-benchmarks/definitions/uc1-kstreams/resources/input-topic.yaml b/theodolite-benchmarks/definitions/uc1-kstreams/resources/input-topic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d16ed916b77141c5e485d88a602a5d78f3b63f50
--- /dev/null
+++ b/theodolite-benchmarks/definitions/uc1-kstreams/resources/input-topic.yaml
@@ -0,0 +1,9 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: input
+  labels:
+    strimzi.io/cluster: theodolite-kafka
+spec:
+  partitions: 100
+  replicas: 1
diff --git a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-kstreams-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc1-kstreams/uc1-kstreams-benchmark-operator.yaml
index 530fed41ebe59b43c7f1edc91cb243f6f2fbe921..b416ece8fe20f70fb5da699b3366aac861208f81 100644
--- a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-kstreams-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc1-kstreams/uc1-kstreams-benchmark-operator.yaml
@@ -12,6 +12,7 @@ spec:
       - configMap:
           name: "benchmark-resources-uc1-kstreams"
           files:
+          - "input-topic.yaml"
           - "uc1-kstreams-deployment.yaml"
           - "uc1-kstreams-service.yaml"
           - "uc1-jmx-configmap.yaml"
@@ -71,9 +72,3 @@ spec:
         threshold: 2000
         externalSloUrl: "http://localhost:80/evaluate-slope"
         warmup: 60 # in seconds
-  kafkaConfig:
-    bootstrapServer: "theodolite-kafka-kafka-bootstrap:9092"
-    topics:
-      - name: "input"
-        numPartitions: 100
-        replicationFactor: 1
diff --git a/theodolite-benchmarks/definitions/uc2-beam-flink/resources/input-topic.yaml b/theodolite-benchmarks/definitions/uc2-beam-flink/resources/input-topic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d16ed916b77141c5e485d88a602a5d78f3b63f50
--- /dev/null
+++ b/theodolite-benchmarks/definitions/uc2-beam-flink/resources/input-topic.yaml
@@ -0,0 +1,9 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: input
+  labels:
+    strimzi.io/cluster: theodolite-kafka
+spec:
+  partitions: 100
+  replicas: 1
diff --git a/theodolite-benchmarks/definitions/uc2-beam-flink/resources/output-topic.yaml b/theodolite-benchmarks/definitions/uc2-beam-flink/resources/output-topic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..81ba735f3596afc225f1b61a8593a9d11118802e
--- /dev/null
+++ b/theodolite-benchmarks/definitions/uc2-beam-flink/resources/output-topic.yaml
@@ -0,0 +1,9 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: output
+  labels:
+    strimzi.io/cluster: theodolite-kafka
+spec:
+  partitions: 100
+  replicas: 1
diff --git a/theodolite-benchmarks/definitions/uc2-beam-flink/uc2-beam-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc2-beam-flink/uc2-beam-flink-benchmark-operator.yaml
index 20ebf1e0f1b18f9719465c358c5354ceb8f41c8d..a55b9df05db3323e3561c4457d72bfaab02463b1 100644
--- a/theodolite-benchmarks/definitions/uc2-beam-flink/uc2-beam-flink-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc2-beam-flink/uc2-beam-flink-benchmark-operator.yaml
@@ -12,6 +12,8 @@ spec:
       - configMap:
           name: "benchmark-resources-uc2-beam-flink"
           files:
+          - "input-topic.yaml"
+          - "output-topic.yaml"
           - "flink-configuration-configmap.yaml"
           - "taskmanager-deployment.yaml"
           - "taskmanager-service.yaml"
@@ -106,11 +108,5 @@ spec:
   kafkaConfig:
     bootstrapServer: "theodolite-kafka-kafka-bootstrap:9092"
     topics:
-      - name: "input"
-        numPartitions: 100
-        replicationFactor: 1
-      - name: "output"
-        numPartitions: 100
-        replicationFactor: 1
       - name: "theodolite-.*"
         removeOnly: True
diff --git a/theodolite-benchmarks/definitions/uc2-beam-samza/resources/input-topic.yaml b/theodolite-benchmarks/definitions/uc2-beam-samza/resources/input-topic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d16ed916b77141c5e485d88a602a5d78f3b63f50
--- /dev/null
+++ b/theodolite-benchmarks/definitions/uc2-beam-samza/resources/input-topic.yaml
@@ -0,0 +1,9 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: input
+  labels:
+    strimzi.io/cluster: theodolite-kafka
+spec:
+  partitions: 100
+  replicas: 1
diff --git a/theodolite-benchmarks/definitions/uc2-beam-samza/resources/output-topic.yaml b/theodolite-benchmarks/definitions/uc2-beam-samza/resources/output-topic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..81ba735f3596afc225f1b61a8593a9d11118802e
--- /dev/null
+++ b/theodolite-benchmarks/definitions/uc2-beam-samza/resources/output-topic.yaml
@@ -0,0 +1,9 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: output
+  labels:
+    strimzi.io/cluster: theodolite-kafka
+spec:
+  partitions: 100
+  replicas: 1
diff --git a/theodolite-benchmarks/definitions/uc2-beam-samza/uc2-beam-samza-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc2-beam-samza/uc2-beam-samza-benchmark-operator.yaml
index 20abcca66c2efb4fedc5e092f464622b27d5ca18..6e92cb3f1a71e0109e81b5632815f61e9819b955 100644
--- a/theodolite-benchmarks/definitions/uc2-beam-samza/uc2-beam-samza-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc2-beam-samza/uc2-beam-samza-benchmark-operator.yaml
@@ -12,6 +12,8 @@ spec:
       - configMap:
           name: "benchmark-resources-uc2-beam-samza"
           files:
+          - "input-topic.yaml"
+          - "output-topic.yaml"
           - "uc2-beam-samza-deployment.yaml"
           - "beam-samza-service.yaml"
           - "service-monitor.yaml"
@@ -83,12 +85,6 @@ spec:
   kafkaConfig:
     bootstrapServer: "theodolite-kafka-kafka-bootstrap:9092"
     topics:
-      - name: "input"
-        numPartitions: 100
-        replicationFactor: 1
-      - name: "output"
-        numPartitions: 100
-        replicationFactor: 1
       - name: ".*samza.*"
         removeOnly: true
       - name: ".*uc2-application.*"
diff --git a/theodolite-benchmarks/definitions/uc2-flink/resources/input-topic.yaml b/theodolite-benchmarks/definitions/uc2-flink/resources/input-topic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d16ed916b77141c5e485d88a602a5d78f3b63f50
--- /dev/null
+++ b/theodolite-benchmarks/definitions/uc2-flink/resources/input-topic.yaml
@@ -0,0 +1,9 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: input
+  labels:
+    strimzi.io/cluster: theodolite-kafka
+spec:
+  partitions: 100
+  replicas: 1
diff --git a/theodolite-benchmarks/definitions/uc2-flink/resources/output-topic.yaml b/theodolite-benchmarks/definitions/uc2-flink/resources/output-topic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..81ba735f3596afc225f1b61a8593a9d11118802e
--- /dev/null
+++ b/theodolite-benchmarks/definitions/uc2-flink/resources/output-topic.yaml
@@ -0,0 +1,9 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: output
+  labels:
+    strimzi.io/cluster: theodolite-kafka
+spec:
+  partitions: 100
+  replicas: 1
diff --git a/theodolite-benchmarks/definitions/uc2-flink/uc2-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc2-flink/uc2-flink-benchmark-operator.yaml
index 0c30c88ffde9cc7de7c4aec33d769edc560ae6c4..e3b27eb55b8adc977f71fb9815b3fbe2283d9e27 100644
--- a/theodolite-benchmarks/definitions/uc2-flink/uc2-flink-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc2-flink/uc2-flink-benchmark-operator.yaml
@@ -12,6 +12,8 @@ spec:
       - configMap:
           name: "benchmark-resources-uc2-flink"
           files:
+          - "input-topic.yaml"
+          - "output-topic.yaml"
           - "flink-configuration-configmap.yaml"
           - "taskmanager-deployment.yaml"
           - "taskmanager-service.yaml"
@@ -106,11 +108,5 @@ spec:
   kafkaConfig:
     bootstrapServer: "theodolite-kafka-kafka-bootstrap:9092"
     topics:
-      - name: "input"
-        numPartitions: 100
-        replicationFactor: 1
-      - name: "output"
-        numPartitions: 100
-        replicationFactor: 1
       - name: "theodolite-.*"
         removeOnly: True
diff --git a/theodolite-benchmarks/definitions/uc2-hazelcastjet/resources/input-topic.yaml b/theodolite-benchmarks/definitions/uc2-hazelcastjet/resources/input-topic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d16ed916b77141c5e485d88a602a5d78f3b63f50
--- /dev/null
+++ b/theodolite-benchmarks/definitions/uc2-hazelcastjet/resources/input-topic.yaml
@@ -0,0 +1,9 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: input
+  labels:
+    strimzi.io/cluster: theodolite-kafka
+spec:
+  partitions: 100
+  replicas: 1
diff --git a/theodolite-benchmarks/definitions/uc2-hazelcastjet/resources/output-topic.yaml b/theodolite-benchmarks/definitions/uc2-hazelcastjet/resources/output-topic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..81ba735f3596afc225f1b61a8593a9d11118802e
--- /dev/null
+++ b/theodolite-benchmarks/definitions/uc2-hazelcastjet/resources/output-topic.yaml
@@ -0,0 +1,9 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: output
+  labels:
+    strimzi.io/cluster: theodolite-kafka
+spec:
+  partitions: 100
+  replicas: 1
diff --git a/theodolite-benchmarks/definitions/uc2-hazelcastjet/uc2-hazelcastjet-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc2-hazelcastjet/uc2-hazelcastjet-benchmark-operator.yaml
index 419326787e942a0fb69b7e9c9dca48b11903218d..3f2412d8a1036d0e0b8497e8d5093584a40c8d8b 100644
--- a/theodolite-benchmarks/definitions/uc2-hazelcastjet/uc2-hazelcastjet-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc2-hazelcastjet/uc2-hazelcastjet-benchmark-operator.yaml
@@ -12,6 +12,8 @@ spec:
       - configMap:
           name: "benchmark-resources-uc2-hazelcastjet"
           files:
+            - "input-topic.yaml"
+            - "output-topic.yaml"
             - "uc2-hazelcastjet-deployment.yaml"
             - "uc2-hazelcastjet-service.yaml"
             - "uc2-jmx-configmap.yaml"
@@ -81,11 +83,5 @@ spec:
   kafkaConfig:
     bootstrapServer: "theodolite-kafka-kafka-bootstrap:9092"
     topics:
-      - name: "input"
-        numPartitions: 100
-        replicationFactor: 1
-      - name: "output"
-        numPartitions: 100
-        replicationFactor: 1
       - name: "theodolite-.*"
         removeOnly: True
diff --git a/theodolite-benchmarks/definitions/uc2-kstreams/resources/input-topic.yaml b/theodolite-benchmarks/definitions/uc2-kstreams/resources/input-topic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d16ed916b77141c5e485d88a602a5d78f3b63f50
--- /dev/null
+++ b/theodolite-benchmarks/definitions/uc2-kstreams/resources/input-topic.yaml
@@ -0,0 +1,9 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: input
+  labels:
+    strimzi.io/cluster: theodolite-kafka
+spec:
+  partitions: 100
+  replicas: 1
diff --git a/theodolite-benchmarks/definitions/uc2-kstreams/resources/output-topic.yaml b/theodolite-benchmarks/definitions/uc2-kstreams/resources/output-topic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..81ba735f3596afc225f1b61a8593a9d11118802e
--- /dev/null
+++ b/theodolite-benchmarks/definitions/uc2-kstreams/resources/output-topic.yaml
@@ -0,0 +1,9 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: output
+  labels:
+    strimzi.io/cluster: theodolite-kafka
+spec:
+  partitions: 100
+  replicas: 1
diff --git a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-kstreams-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc2-kstreams/uc2-kstreams-benchmark-operator.yaml
index 3e82c08f33530fc390aeb82cf5e1f7aad0c3090b..73f4297cd49445f5c1ac7f84baef59b06a184e3d 100644
--- a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-kstreams-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc2-kstreams/uc2-kstreams-benchmark-operator.yaml
@@ -12,6 +12,8 @@ spec:
       - configMap:
           name: "benchmark-resources-uc2-kstreams"
           files:
+            - "input-topic.yaml"
+            - "output-topic.yaml"
             - "uc2-kstreams-deployment.yaml"
             - "uc2-kstreams-service.yaml"
             - "uc2-jmx-configmap.yaml"
@@ -86,11 +88,11 @@ spec:
   kafkaConfig:
     bootstrapServer: "theodolite-kafka-kafka-bootstrap:9092"
     topics:
-      - name: "input"
-        numPartitions: 100
-        replicationFactor: 1
-      - name: "output"
-        numPartitions: 100
-        replicationFactor: 1
+      # - name: "input"
+      #   numPartitions: 100
+      #   replicationFactor: 1
+      # - name: "output"
+      #   numPartitions: 100
+      #   replicationFactor: 1
       - name: "theodolite-.*"
         removeOnly: True
diff --git a/theodolite-benchmarks/definitions/uc3-beam-flink/resources/input-topic.yaml b/theodolite-benchmarks/definitions/uc3-beam-flink/resources/input-topic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d16ed916b77141c5e485d88a602a5d78f3b63f50
--- /dev/null
+++ b/theodolite-benchmarks/definitions/uc3-beam-flink/resources/input-topic.yaml
@@ -0,0 +1,9 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: input
+  labels:
+    strimzi.io/cluster: theodolite-kafka
+spec:
+  partitions: 100
+  replicas: 1
diff --git a/theodolite-benchmarks/definitions/uc3-beam-flink/resources/output-topic.yaml b/theodolite-benchmarks/definitions/uc3-beam-flink/resources/output-topic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..81ba735f3596afc225f1b61a8593a9d11118802e
--- /dev/null
+++ b/theodolite-benchmarks/definitions/uc3-beam-flink/resources/output-topic.yaml
@@ -0,0 +1,9 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: output
+  labels:
+    strimzi.io/cluster: theodolite-kafka
+spec:
+  partitions: 100
+  replicas: 1
diff --git a/theodolite-benchmarks/definitions/uc3-beam-flink/uc3-beam-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc3-beam-flink/uc3-beam-flink-benchmark-operator.yaml
index f0f96ac8943063b4161593ec4c84717d73d2c848..64a286d1ba9500f83a4b79e735aba6efc4cfa997 100644
--- a/theodolite-benchmarks/definitions/uc3-beam-flink/uc3-beam-flink-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc3-beam-flink/uc3-beam-flink-benchmark-operator.yaml
@@ -12,6 +12,8 @@ spec:
       - configMap:
           name: "benchmark-resources-uc3-beam-flink"
           files:
+          - "input-topic.yaml"
+          - "output-topic.yaml"
           - "flink-configuration-configmap.yaml"
           - "taskmanager-deployment.yaml"
           - "taskmanager-service.yaml"
@@ -101,11 +103,5 @@ spec:
   kafkaConfig:
     bootstrapServer: "theodolite-kafka-kafka-bootstrap:9092"
     topics:
-      - name: "input"
-        numPartitions: 100
-        replicationFactor: 1
-      - name: "output"
-        numPartitions: 100
-        replicationFactor: 1
       - name: "theodolite-.*"
         removeOnly: True
diff --git a/theodolite-benchmarks/definitions/uc3-beam-samza/resources/input-topic.yaml b/theodolite-benchmarks/definitions/uc3-beam-samza/resources/input-topic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d16ed916b77141c5e485d88a602a5d78f3b63f50
--- /dev/null
+++ b/theodolite-benchmarks/definitions/uc3-beam-samza/resources/input-topic.yaml
@@ -0,0 +1,9 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: input
+  labels:
+    strimzi.io/cluster: theodolite-kafka
+spec:
+  partitions: 100
+  replicas: 1
diff --git a/theodolite-benchmarks/definitions/uc3-beam-samza/resources/output-topic.yaml b/theodolite-benchmarks/definitions/uc3-beam-samza/resources/output-topic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..81ba735f3596afc225f1b61a8593a9d11118802e
--- /dev/null
+++ b/theodolite-benchmarks/definitions/uc3-beam-samza/resources/output-topic.yaml
@@ -0,0 +1,9 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: output
+  labels:
+    strimzi.io/cluster: theodolite-kafka
+spec:
+  partitions: 100
+  replicas: 1
diff --git a/theodolite-benchmarks/definitions/uc3-beam-samza/uc3-beam-samza-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc3-beam-samza/uc3-beam-samza-benchmark-operator.yaml
index f5f6e7222370d18897b4964de6ff941d53b3e98a..e800b5d193ddbc76dd5a4fbc384fffa9a7001d83 100644
--- a/theodolite-benchmarks/definitions/uc3-beam-samza/uc3-beam-samza-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc3-beam-samza/uc3-beam-samza-benchmark-operator.yaml
@@ -12,6 +12,8 @@ spec:
       - configMap:
           name: "benchmark-resources-uc3-beam-samza"
           files:
+          - "input-topic.yaml"
+          - "output-topic.yaml"
           - "uc3-beam-samza-deployment.yaml"
           - "beam-samza-service.yaml"
           - "service-monitor.yaml"
@@ -90,12 +92,6 @@ spec:
   kafkaConfig:
     bootstrapServer: "theodolite-kafka-kafka-bootstrap:9092"
     topics:
-      - name: "input"
-        numPartitions: 100
-        replicationFactor: 1
-      - name: "output"
-        numPartitions: 100
-        replicationFactor: 1
       - name: ".*samza.*"
         removeOnly: true
       - name: ".*uc3-application.*"
diff --git a/theodolite-benchmarks/definitions/uc3-flink/resources/input-topic.yaml b/theodolite-benchmarks/definitions/uc3-flink/resources/input-topic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d16ed916b77141c5e485d88a602a5d78f3b63f50
--- /dev/null
+++ b/theodolite-benchmarks/definitions/uc3-flink/resources/input-topic.yaml
@@ -0,0 +1,9 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: input
+  labels:
+    strimzi.io/cluster: theodolite-kafka
+spec:
+  partitions: 100
+  replicas: 1
diff --git a/theodolite-benchmarks/definitions/uc3-flink/resources/output-topic.yaml b/theodolite-benchmarks/definitions/uc3-flink/resources/output-topic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..81ba735f3596afc225f1b61a8593a9d11118802e
--- /dev/null
+++ b/theodolite-benchmarks/definitions/uc3-flink/resources/output-topic.yaml
@@ -0,0 +1,9 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: output
+  labels:
+    strimzi.io/cluster: theodolite-kafka
+spec:
+  partitions: 100
+  replicas: 1
diff --git a/theodolite-benchmarks/definitions/uc3-flink/uc3-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc3-flink/uc3-flink-benchmark-operator.yaml
index 87b5c9dc62c8e695b0cc8646cd3e2c0636e58653..d5717734f87c6ad8438e91a938260df5866a03ce 100644
--- a/theodolite-benchmarks/definitions/uc3-flink/uc3-flink-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc3-flink/uc3-flink-benchmark-operator.yaml
@@ -12,6 +12,8 @@ spec:
       - configMap:
           name: "benchmark-resources-uc3-flink"
           files:
+            - "input-topic.yaml"
+            - "output-topic.yaml"
             - "flink-configuration-configmap.yaml"
             - "taskmanager-deployment.yaml"
             - "taskmanager-service.yaml"
@@ -101,11 +103,5 @@ spec:
   kafkaConfig:
     bootstrapServer: "theodolite-kafka-kafka-bootstrap:9092"
     topics:
-      - name: "input"
-        numPartitions: 100
-        replicationFactor: 1
-      - name: "output"
-        numPartitions: 100
-        replicationFactor: 1
       - name: "theodolite-.*"
         removeOnly: True
diff --git a/theodolite-benchmarks/definitions/uc3-hazelcastjet/resources/input-topic.yaml b/theodolite-benchmarks/definitions/uc3-hazelcastjet/resources/input-topic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d16ed916b77141c5e485d88a602a5d78f3b63f50
--- /dev/null
+++ b/theodolite-benchmarks/definitions/uc3-hazelcastjet/resources/input-topic.yaml
@@ -0,0 +1,9 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: input
+  labels:
+    strimzi.io/cluster: theodolite-kafka
+spec:
+  partitions: 100
+  replicas: 1
diff --git a/theodolite-benchmarks/definitions/uc3-hazelcastjet/resources/output-topic.yaml b/theodolite-benchmarks/definitions/uc3-hazelcastjet/resources/output-topic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..81ba735f3596afc225f1b61a8593a9d11118802e
--- /dev/null
+++ b/theodolite-benchmarks/definitions/uc3-hazelcastjet/resources/output-topic.yaml
@@ -0,0 +1,9 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: output
+  labels:
+    strimzi.io/cluster: theodolite-kafka
+spec:
+  partitions: 100
+  replicas: 1
diff --git a/theodolite-benchmarks/definitions/uc3-hazelcastjet/uc3-hazelcastjet-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc3-hazelcastjet/uc3-hazelcastjet-benchmark-operator.yaml
index 2c04bbbe62622fd9220a1f13ff2511757c770fc3..62086b68a9f2af6b26442b45ddbde39dd348e3be 100644
--- a/theodolite-benchmarks/definitions/uc3-hazelcastjet/uc3-hazelcastjet-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc3-hazelcastjet/uc3-hazelcastjet-benchmark-operator.yaml
@@ -12,6 +12,8 @@ spec:
       - configMap:
           name: "benchmark-resources-uc3-hazelcastjet"
           files:
+            - "input-topic.yaml"
+            - "output-topic.yaml"
             - "uc3-hazelcastjet-deployment.yaml"
             - "uc3-hazelcastjet-service.yaml"
             - "uc3-jmx-configmap.yaml"
@@ -76,11 +78,5 @@ spec:
   kafkaConfig:
     bootstrapServer: "theodolite-kafka-kafka-bootstrap:9092"
     topics:
-      - name: "input"
-        numPartitions: 100
-        replicationFactor: 1
-      - name: "output"
-        numPartitions: 100
-        replicationFactor: 1
       - name: "theodolite-.*"
         removeOnly: True
diff --git a/theodolite-benchmarks/definitions/uc3-kstreams/resources/input-topic.yaml b/theodolite-benchmarks/definitions/uc3-kstreams/resources/input-topic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d16ed916b77141c5e485d88a602a5d78f3b63f50
--- /dev/null
+++ b/theodolite-benchmarks/definitions/uc3-kstreams/resources/input-topic.yaml
@@ -0,0 +1,9 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: input
+  labels:
+    strimzi.io/cluster: theodolite-kafka
+spec:
+  partitions: 100
+  replicas: 1
diff --git a/theodolite-benchmarks/definitions/uc3-kstreams/resources/output-topic.yaml b/theodolite-benchmarks/definitions/uc3-kstreams/resources/output-topic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..81ba735f3596afc225f1b61a8593a9d11118802e
--- /dev/null
+++ b/theodolite-benchmarks/definitions/uc3-kstreams/resources/output-topic.yaml
@@ -0,0 +1,9 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: output
+  labels:
+    strimzi.io/cluster: theodolite-kafka
+spec:
+  partitions: 100
+  replicas: 1
diff --git a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-kstreams-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc3-kstreams/uc3-kstreams-benchmark-operator.yaml
index 821316847f24144275b166209e735a87216cb9a4..6917380a229dbb1ee8b69dcd227babb9ad7db2c7 100644
--- a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-kstreams-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc3-kstreams/uc3-kstreams-benchmark-operator.yaml
@@ -12,6 +12,8 @@ spec:
       - configMap:
           name: "benchmark-resources-uc3-kstreams"
           files:
+          - "input-topic.yaml"
+          - "output-topic.yaml"
           - "uc3-kstreams-deployment.yaml"
           - "uc3-kstreams-service.yaml"
           - "uc3-jmx-configmap.yaml"
@@ -81,11 +83,5 @@ spec:
   kafkaConfig:
     bootstrapServer: "theodolite-kafka-kafka-bootstrap:9092"
     topics:
-      - name: "input"
-        numPartitions: 100
-        replicationFactor: 1
-      - name: "output"
-        numPartitions: 100
-        replicationFactor: 1
       - name: "theodolite-.*"
         removeOnly: True
diff --git a/theodolite-benchmarks/definitions/uc4-beam-flink/resources/aggregation-feedback-topic.yaml b/theodolite-benchmarks/definitions/uc4-beam-flink/resources/aggregation-feedback-topic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..5d7c646575561a14404fd733ee166dd7ebaa64ec
--- /dev/null
+++ b/theodolite-benchmarks/definitions/uc4-beam-flink/resources/aggregation-feedback-topic.yaml
@@ -0,0 +1,9 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: aggregation-feedback
+  labels:
+    strimzi.io/cluster: theodolite-kafka
+spec:
+  partitions: 100
+  replicas: 1
diff --git a/theodolite-benchmarks/definitions/uc4-beam-flink/resources/configuration-topic.yaml b/theodolite-benchmarks/definitions/uc4-beam-flink/resources/configuration-topic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..fb42eb355c36b2d01ba8dbe7823fe25b67d32ded
--- /dev/null
+++ b/theodolite-benchmarks/definitions/uc4-beam-flink/resources/configuration-topic.yaml
@@ -0,0 +1,9 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: configuration
+  labels:
+    strimzi.io/cluster: theodolite-kafka
+spec:
+  partitions: 100
+  replicas: 1
diff --git a/theodolite-benchmarks/definitions/uc4-beam-flink/resources/input-topic.yaml b/theodolite-benchmarks/definitions/uc4-beam-flink/resources/input-topic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d16ed916b77141c5e485d88a602a5d78f3b63f50
--- /dev/null
+++ b/theodolite-benchmarks/definitions/uc4-beam-flink/resources/input-topic.yaml
@@ -0,0 +1,9 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: input
+  labels:
+    strimzi.io/cluster: theodolite-kafka
+spec:
+  partitions: 100
+  replicas: 1
diff --git a/theodolite-benchmarks/definitions/uc4-beam-flink/resources/output-topic.yaml b/theodolite-benchmarks/definitions/uc4-beam-flink/resources/output-topic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..81ba735f3596afc225f1b61a8593a9d11118802e
--- /dev/null
+++ b/theodolite-benchmarks/definitions/uc4-beam-flink/resources/output-topic.yaml
@@ -0,0 +1,9 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: output
+  labels:
+    strimzi.io/cluster: theodolite-kafka
+spec:
+  partitions: 100
+  replicas: 1
diff --git a/theodolite-benchmarks/definitions/uc4-beam-flink/uc4-beam-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc4-beam-flink/uc4-beam-flink-benchmark-operator.yaml
index 36701522bb2ab671e1873d4c1053851673dab619..b7f9314578f4d9d280a6d157a0f422a24fdfa1d3 100644
--- a/theodolite-benchmarks/definitions/uc4-beam-flink/uc4-beam-flink-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc4-beam-flink/uc4-beam-flink-benchmark-operator.yaml
@@ -12,6 +12,10 @@ spec:
       - configMap:
           name: "benchmark-resources-uc4-beam-flink"
           files:
+          - "input-topic.yaml"
+          - "output-topic.yaml"
+          - "aggregation-feedback-topic.yaml"
+          - "configuration-topic.yaml"
           - "flink-configuration-configmap.yaml"
           - "taskmanager-deployment.yaml"
           - "taskmanager-service.yaml"
@@ -107,17 +111,5 @@ spec:
   kafkaConfig:
     bootstrapServer: "theodolite-kafka-kafka-bootstrap:9092"
     topics:
-      - name: "input"
-        numPartitions: 100
-        replicationFactor: 1
-      - name: "output"
-        numPartitions: 100
-        replicationFactor: 1
-      - name: "configuration"
-        numPartitions: 100
-        replicationFactor: 1
-      - name: "aggregation-feedback"
-        numPartitions: 100
-        replicationFactor: 1
       - name: "theodolite-.*"
         removeOnly: True
diff --git a/theodolite-benchmarks/definitions/uc4-beam-samza/resources/aggregation-feedback-topic.yaml b/theodolite-benchmarks/definitions/uc4-beam-samza/resources/aggregation-feedback-topic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..5d7c646575561a14404fd733ee166dd7ebaa64ec
--- /dev/null
+++ b/theodolite-benchmarks/definitions/uc4-beam-samza/resources/aggregation-feedback-topic.yaml
@@ -0,0 +1,9 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: aggregation-feedback
+  labels:
+    strimzi.io/cluster: theodolite-kafka
+spec:
+  partitions: 100
+  replicas: 1
diff --git a/theodolite-benchmarks/definitions/uc4-beam-samza/resources/configuration-topic.yaml b/theodolite-benchmarks/definitions/uc4-beam-samza/resources/configuration-topic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..fb42eb355c36b2d01ba8dbe7823fe25b67d32ded
--- /dev/null
+++ b/theodolite-benchmarks/definitions/uc4-beam-samza/resources/configuration-topic.yaml
@@ -0,0 +1,9 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: configuration
+  labels:
+    strimzi.io/cluster: theodolite-kafka
+spec:
+  partitions: 100
+  replicas: 1
diff --git a/theodolite-benchmarks/definitions/uc4-beam-samza/resources/input-topic.yaml b/theodolite-benchmarks/definitions/uc4-beam-samza/resources/input-topic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d16ed916b77141c5e485d88a602a5d78f3b63f50
--- /dev/null
+++ b/theodolite-benchmarks/definitions/uc4-beam-samza/resources/input-topic.yaml
@@ -0,0 +1,9 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: input
+  labels:
+    strimzi.io/cluster: theodolite-kafka
+spec:
+  partitions: 100
+  replicas: 1
diff --git a/theodolite-benchmarks/definitions/uc4-beam-samza/resources/output-topic.yaml b/theodolite-benchmarks/definitions/uc4-beam-samza/resources/output-topic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..81ba735f3596afc225f1b61a8593a9d11118802e
--- /dev/null
+++ b/theodolite-benchmarks/definitions/uc4-beam-samza/resources/output-topic.yaml
@@ -0,0 +1,9 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: output
+  labels:
+    strimzi.io/cluster: theodolite-kafka
+spec:
+  partitions: 100
+  replicas: 1
diff --git a/theodolite-benchmarks/definitions/uc4-beam-samza/uc4-beam-samza-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc4-beam-samza/uc4-beam-samza-benchmark-operator.yaml
index 776b0aeaffcd54437ca5164b8b1f38f0cb60282f..ceae2c32682447accb948e73f87e5c513438be7d 100644
--- a/theodolite-benchmarks/definitions/uc4-beam-samza/uc4-beam-samza-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc4-beam-samza/uc4-beam-samza-benchmark-operator.yaml
@@ -12,6 +12,10 @@ spec:
       - configMap:
           name: "benchmark-resources-uc4-beam-samza"
           files:
+          - "input-topic.yaml"
+          - "output-topic.yaml"
+          - "aggregation-feedback-topic.yaml"
+          - "configuration-topic.yaml"
           - "uc4-beam-samza-deployment.yaml"
           - "beam-samza-service.yaml"
           - "service-monitor.yaml"
@@ -84,18 +88,6 @@ spec:
   kafkaConfig:
     bootstrapServer: "theodolite-kafka-kafka-bootstrap:9092"
     topics:
-      - name: "input"
-        numPartitions: 100
-        replicationFactor: 1
-      - name: "output"
-        numPartitions: 100
-        replicationFactor: 1
-      - name: "configuration"
-        numPartitions: 100
-        replicationFactor: 1
-      - name: "aggregation-feedback"
-        numPartitions: 100
-        replicationFactor: 1
       - name: "theodolite-.*"
         removeOnly: True
       - name: ".*samza.*"
diff --git a/theodolite-benchmarks/definitions/uc4-flink/resources/aggregation-feedback-topic.yaml b/theodolite-benchmarks/definitions/uc4-flink/resources/aggregation-feedback-topic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..5d7c646575561a14404fd733ee166dd7ebaa64ec
--- /dev/null
+++ b/theodolite-benchmarks/definitions/uc4-flink/resources/aggregation-feedback-topic.yaml
@@ -0,0 +1,9 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: aggregation-feedback
+  labels:
+    strimzi.io/cluster: theodolite-kafka
+spec:
+  partitions: 100
+  replicas: 1
diff --git a/theodolite-benchmarks/definitions/uc4-flink/resources/configuration-topic.yaml b/theodolite-benchmarks/definitions/uc4-flink/resources/configuration-topic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..fb42eb355c36b2d01ba8dbe7823fe25b67d32ded
--- /dev/null
+++ b/theodolite-benchmarks/definitions/uc4-flink/resources/configuration-topic.yaml
@@ -0,0 +1,9 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: configuration
+  labels:
+    strimzi.io/cluster: theodolite-kafka
+spec:
+  partitions: 100
+  replicas: 1
diff --git a/theodolite-benchmarks/definitions/uc4-flink/resources/input-topic.yaml b/theodolite-benchmarks/definitions/uc4-flink/resources/input-topic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d16ed916b77141c5e485d88a602a5d78f3b63f50
--- /dev/null
+++ b/theodolite-benchmarks/definitions/uc4-flink/resources/input-topic.yaml
@@ -0,0 +1,9 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: input
+  labels:
+    strimzi.io/cluster: theodolite-kafka
+spec:
+  partitions: 100
+  replicas: 1
diff --git a/theodolite-benchmarks/definitions/uc4-flink/resources/output-topic.yaml b/theodolite-benchmarks/definitions/uc4-flink/resources/output-topic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..81ba735f3596afc225f1b61a8593a9d11118802e
--- /dev/null
+++ b/theodolite-benchmarks/definitions/uc4-flink/resources/output-topic.yaml
@@ -0,0 +1,9 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: output
+  labels:
+    strimzi.io/cluster: theodolite-kafka
+spec:
+  partitions: 100
+  replicas: 1
diff --git a/theodolite-benchmarks/definitions/uc4-flink/uc4-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc4-flink/uc4-flink-benchmark-operator.yaml
index 4eddd777128b4c1eb7a20ad9013a41d410bf5fe1..02bf7a3b83ee69403781ffc5a37a34bff1ffb76d 100644
--- a/theodolite-benchmarks/definitions/uc4-flink/uc4-flink-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc4-flink/uc4-flink-benchmark-operator.yaml
@@ -12,6 +12,10 @@ spec:
       - configMap:
           name: "benchmark-resources-uc4-flink"
           files:
+            - "input-topic.yaml"
+            - "output-topic.yaml"
+            - "aggregation-feedback-topic.yaml"
+            - "configuration-topic.yaml"
             - "flink-configuration-configmap.yaml"
             - "taskmanager-deployment.yaml"
             - "taskmanager-service.yaml"
@@ -107,17 +111,5 @@ spec:
   kafkaConfig:
     bootstrapServer: "theodolite-kafka-kafka-bootstrap:9092"
     topics:
-      - name: "input"
-        numPartitions: 100
-        replicationFactor: 1
-      - name: "output"
-        numPartitions: 100
-        replicationFactor: 1
-      - name: "configuration"
-        numPartitions: 100
-        replicationFactor: 1
-      - name: "aggregation-feedback"
-        numPartitions: 100
-        replicationFactor: 1
       - name: "theodolite-.*"
         removeOnly: True
diff --git a/theodolite-benchmarks/definitions/uc4-hazelcastjet/resources/aggregation-feedback-topic.yaml b/theodolite-benchmarks/definitions/uc4-hazelcastjet/resources/aggregation-feedback-topic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..5d7c646575561a14404fd733ee166dd7ebaa64ec
--- /dev/null
+++ b/theodolite-benchmarks/definitions/uc4-hazelcastjet/resources/aggregation-feedback-topic.yaml
@@ -0,0 +1,9 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: aggregation-feedback
+  labels:
+    strimzi.io/cluster: theodolite-kafka
+spec:
+  partitions: 100
+  replicas: 1
diff --git a/theodolite-benchmarks/definitions/uc4-hazelcastjet/resources/configuration-topic.yaml b/theodolite-benchmarks/definitions/uc4-hazelcastjet/resources/configuration-topic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..fb42eb355c36b2d01ba8dbe7823fe25b67d32ded
--- /dev/null
+++ b/theodolite-benchmarks/definitions/uc4-hazelcastjet/resources/configuration-topic.yaml
@@ -0,0 +1,9 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: configuration
+  labels:
+    strimzi.io/cluster: theodolite-kafka
+spec:
+  partitions: 100
+  replicas: 1
diff --git a/theodolite-benchmarks/definitions/uc4-hazelcastjet/resources/input-topic.yaml b/theodolite-benchmarks/definitions/uc4-hazelcastjet/resources/input-topic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d16ed916b77141c5e485d88a602a5d78f3b63f50
--- /dev/null
+++ b/theodolite-benchmarks/definitions/uc4-hazelcastjet/resources/input-topic.yaml
@@ -0,0 +1,9 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: input
+  labels:
+    strimzi.io/cluster: theodolite-kafka
+spec:
+  partitions: 100
+  replicas: 1
diff --git a/theodolite-benchmarks/definitions/uc4-hazelcastjet/resources/output-topic.yaml b/theodolite-benchmarks/definitions/uc4-hazelcastjet/resources/output-topic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..81ba735f3596afc225f1b61a8593a9d11118802e
--- /dev/null
+++ b/theodolite-benchmarks/definitions/uc4-hazelcastjet/resources/output-topic.yaml
@@ -0,0 +1,9 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: output
+  labels:
+    strimzi.io/cluster: theodolite-kafka
+spec:
+  partitions: 100
+  replicas: 1
diff --git a/theodolite-benchmarks/definitions/uc4-hazelcastjet/uc4-hazelcastjet-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc4-hazelcastjet/uc4-hazelcastjet-benchmark-operator.yaml
index 2370bbbadbb955a542e3a8171c7beafd6e9b0c75..7b0d4bfc262b2db852005fbd8b7ae5e9e7bd255e 100644
--- a/theodolite-benchmarks/definitions/uc4-hazelcastjet/uc4-hazelcastjet-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc4-hazelcastjet/uc4-hazelcastjet-benchmark-operator.yaml
@@ -12,6 +12,10 @@ spec:
       - configMap:
           name: "benchmark-resources-uc4-hazelcastjet"
           files:
+            - "input-topic.yaml"
+            - "output-topic.yaml"
+            - "aggregation-feedback-topic.yaml"
+            - "configuration-topic.yaml"
             - "uc4-hazelcastjet-deployment.yaml"
             - "uc4-hazelcastjet-service.yaml"
             - "uc4-jmx-configmap.yaml"
@@ -82,17 +86,5 @@ spec:
   kafkaConfig:
     bootstrapServer: "theodolite-kafka-kafka-bootstrap:9092"
     topics:
-      - name: "input"
-        numPartitions: 100
-        replicationFactor: 1
-      - name: "output"
-        numPartitions: 100
-        replicationFactor: 1
-      - name: "configuration"
-        numPartitions: 100
-        replicationFactor: 1
-      - name: "aggregation-feedback"
-        numPartitions: 100
-        replicationFactor: 1
       - name: "theodolite-.*"
         removeOnly: True
diff --git a/theodolite-benchmarks/definitions/uc4-kstreams/resources/aggregation-feedback-topic.yaml b/theodolite-benchmarks/definitions/uc4-kstreams/resources/aggregation-feedback-topic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..5d7c646575561a14404fd733ee166dd7ebaa64ec
--- /dev/null
+++ b/theodolite-benchmarks/definitions/uc4-kstreams/resources/aggregation-feedback-topic.yaml
@@ -0,0 +1,9 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: aggregation-feedback
+  labels:
+    strimzi.io/cluster: theodolite-kafka
+spec:
+  partitions: 100
+  replicas: 1
diff --git a/theodolite-benchmarks/definitions/uc4-kstreams/resources/configuration-topic.yaml b/theodolite-benchmarks/definitions/uc4-kstreams/resources/configuration-topic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..fb42eb355c36b2d01ba8dbe7823fe25b67d32ded
--- /dev/null
+++ b/theodolite-benchmarks/definitions/uc4-kstreams/resources/configuration-topic.yaml
@@ -0,0 +1,9 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: configuration
+  labels:
+    strimzi.io/cluster: theodolite-kafka
+spec:
+  partitions: 100
+  replicas: 1
diff --git a/theodolite-benchmarks/definitions/uc4-kstreams/resources/input-topic.yaml b/theodolite-benchmarks/definitions/uc4-kstreams/resources/input-topic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d16ed916b77141c5e485d88a602a5d78f3b63f50
--- /dev/null
+++ b/theodolite-benchmarks/definitions/uc4-kstreams/resources/input-topic.yaml
@@ -0,0 +1,9 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: input
+  labels:
+    strimzi.io/cluster: theodolite-kafka
+spec:
+  partitions: 100
+  replicas: 1
diff --git a/theodolite-benchmarks/definitions/uc4-kstreams/resources/output-topic.yaml b/theodolite-benchmarks/definitions/uc4-kstreams/resources/output-topic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..81ba735f3596afc225f1b61a8593a9d11118802e
--- /dev/null
+++ b/theodolite-benchmarks/definitions/uc4-kstreams/resources/output-topic.yaml
@@ -0,0 +1,9 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: output
+  labels:
+    strimzi.io/cluster: theodolite-kafka
+spec:
+  partitions: 100
+  replicas: 1
diff --git a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-kstreams-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc4-kstreams/uc4-kstreams-benchmark-operator.yaml
index e43f210f69facf7e3b404f5c1e00592a5e7f549d..99dadc3e512c190ce512d1d53aa8a78d691e4196 100644
--- a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-kstreams-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc4-kstreams/uc4-kstreams-benchmark-operator.yaml
@@ -12,6 +12,10 @@ spec:
       - configMap:
           name: "benchmark-resources-uc4-kstreams"
           files:
+            - "input-topic.yaml"
+            - "output-topic.yaml"
+            - "aggregation-feedback-topic.yaml"
+            - "configuration-topic.yaml"
             - "uc4-kstreams-deployment.yaml"
             - "uc4-kstreams-service.yaml"
             - "uc4-jmx-configmap.yaml"
@@ -87,17 +91,5 @@ spec:
   kafkaConfig:
     bootstrapServer: "theodolite-kafka-kafka-bootstrap:9092"
     topics:
-      - name: "input"
-        numPartitions: 100
-        replicationFactor: 1
-      - name: "output"
-        numPartitions: 100
-        replicationFactor: 1
-      - name: "configuration"
-        numPartitions: 100
-        replicationFactor: 1
-      - name: "aggregation-feedback"
-        numPartitions: 100
-        replicationFactor: 1
       - name: "theodolite-.*"
         removeOnly: True