diff --git a/theodolite-benchmarks/definitions/uc1-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc1-flink-benchmark-operator.yaml
index 684c93c29ce4a927e1a251c5bf923bc308f75602..30e2d6bcae0156d08aa71c428934f420b4085e38 100644
--- a/theodolite-benchmarks/definitions/uc1-flink-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc1-flink-benchmark-operator.yaml
@@ -1,43 +1,47 @@
-apiVersion: theodolite.com/v1alpha1
+apiVersion: theodolite.com/v1
 kind: benchmark
 metadata:
   name: uc1-flink
-appResource:
-  - "uc1-flink/flink-configuration-configmap.yaml"
-  - "uc1-flink/taskmanager-deployment.yaml"
-  - "uc1-flink/taskmanager-service.yaml"
-  - "uc1-flink/service-monitor.yaml"
-  - "uc1-flink/jobmanager-service.yaml"
-  - "uc1-flink/jobmanager-deployment.yaml"
-  #- "uc1-flink/jobmanager-rest-service.yaml"
-loadGenResource:
-  - "uc1-kstreams/uc1-load-generator-deployment.yaml"
-  - "uc1-kstreams/uc1-load-generator-service.yaml"
-resourceTypes:
-  - typeName: "Instances"
-    patchers:
-      - type: "ReplicaPatcher"
-        resource: "uc1-flink/taskmanager-deployment.yaml"
-      - type: "EnvVarPatcher"
-        resource: "uc1-flink/jobmanager-deployment.yaml"
-        container: "jobmanager"
-        variableName: "PARALLELISM"
-      - type: "EnvVarPatcher" # required?
-        resource: "uc1-flink/taskmanager-deployment.yaml"
-        container: "taskmanager"
-        variableName: "PARALLELISM"
-loadTypes:
-  - typeName: "NumSensors"
-    patchers:
-      - type: "EnvVarPatcher"
-        resource: "uc1-kstreams/uc1-load-generator-deployment.yaml"
-        container: "workload-generator"
-        variableName: "NUM_SENSORS"
-      - type: NumSensorsLoadGeneratorReplicaPatcher
-        resource: "uc1-kstreams/uc1-load-generator-deployment.yaml"
-kafkaConfig:
-  bootstrapServer: "theodolite-cp-kafka:9092"
-  topics:
-    - name: "input"
-      numPartitions: 40
-      replicationFactor: 1
\ No newline at end of file
+spec:
+  appResource:
+    - "uc1-flink/flink-configuration-configmap.yaml"
+    - "uc1-flink/taskmanager-deployment.yaml"
+    - "uc1-flink/taskmanager-service.yaml"
+    - "uc1-flink/service-monitor.yaml"
+    - "uc1-flink/jobmanager-service.yaml"
+    - "uc1-flink/jobmanager-deployment.yaml"
+    #- "uc1-flink/jobmanager-rest-service.yaml"
+  loadGenResource:
+    - "uc1-kstreams/uc1-load-generator-deployment.yaml"
+    - "uc1-kstreams/uc1-load-generator-service.yaml"
+  resourceTypes:
+    - typeName: "Instances"
+      patchers:
+        - type: "ReplicaPatcher"
+          resource: "uc1-flink/taskmanager-deployment.yaml"
+        - type: "EnvVarPatcher"
+          resource: "uc1-flink/jobmanager-deployment.yaml"
+          properties:
+            container: "jobmanager"
+            variableName: "PARALLELISM"
+        - type: "EnvVarPatcher" # required?
+          resource: "uc1-flink/taskmanager-deployment.yaml"
+          properties:
+            container: "taskmanager"
+            variableName: "PARALLELISM"
+  loadTypes:
+    - typeName: "NumSensors"
+      patchers:
+        - type: "EnvVarPatcher"
+          resource: "uc1-kstreams/uc1-load-generator-deployment.yaml"
+          properties:
+            container: "workload-generator"
+            variableName: "NUM_SENSORS"
+        - type: NumSensorsLoadGeneratorReplicaPatcher
+          resource: "uc1-kstreams/uc1-load-generator-deployment.yaml"
+  kafkaConfig:
+    bootstrapServer: "theodolite-cp-kafka:9092"
+    topics:
+      - name: "input"
+        numPartitions: 40
+        replicationFactor: 1
\ No newline at end of file
diff --git a/theodolite-benchmarks/definitions/uc2-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc2-benchmark-operator.yaml
index 3e52605d8fb4edb70508e22b0cb31046c72896de..aa25c53d793fd319ba16e15f8e8a152f177e799e 100644
--- a/theodolite-benchmarks/definitions/uc2-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc2-benchmark-operator.yaml
@@ -1,37 +1,41 @@
-apiVersion: theodolite.com/v1alpha1
+apiVersion: theodolite.com/v1
 kind: benchmark
 metadata:
   name: uc2-kstreams
-appResource:
-  - "uc2-kstreams/uc2-kstreams-deployment.yaml"
-  - "uc2-kstreams/uc2-kstreams-service.yaml"
-  - "uc2-kstreams/uc2-jmx-configmap.yaml"
-  - "uc2-kstreams/uc2-service-monitor.yaml"
-loadGenResource:
-  - "uc2-kstreams/uc2-load-generator-deployment.yaml"
-  - "uc2-kstreams/uc2-load-generator-service.yaml"
-resourceTypes:
-  - typeName: "Instances"
-    patchers:
-      - type: "ReplicaPatcher"
-        resource: "uc2-kstreams/uc2-kstreams-deployment.yaml"
-loadTypes:
-  - typeName: "NumSensors"
-    patchers:
-      - type: "EnvVarPatcher"
-        resource: "uc2-kstreams/uc2-load-generator-deployment.yaml"
-        container: "workload-generator"
-        variableName: "NUM_SENSORS"
-      - type: NumSensorsLoadGeneratorReplicaPatcher
-        resource: "uc2-kstreams/uc2-load-generator-deployment.yaml"
-kafkaConfig:
-  bootstrapServer: "theodolite-cp-kafka:9092"
-  topics:
-    - name: "input"
-      numPartitions: 40
-      replicationFactor: 1
-    - name: "output"
-      numPartitions: 40
-      replicationFactor: 1
-    - name: "theodolite-.*"
-      removeOnly: True
+spec:
+  appResource:
+    - "uc2-kstreams/uc2-kstreams-deployment.yaml"
+    - "uc2-kstreams/uc2-kstreams-service.yaml"
+    - "uc2-kstreams/uc2-jmx-configmap.yaml"
+    - "uc2-kstreams/uc2-service-monitor.yaml"
+  loadGenResource:
+    - "uc2-kstreams/uc2-load-generator-deployment.yaml"
+    - "uc2-kstreams/uc2-load-generator-service.yaml"
+  resourceTypes:
+    - typeName: "Instances"
+      patchers:
+        - type: "ReplicaPatcher"
+          resource: "uc2-kstreams/uc2-kstreams-deployment.yaml"
+  loadTypes:
+    - typeName: "NumSensors"
+      patchers:
+        - type: "EnvVarPatcher"
+          resource: "uc2-kstreams/uc2-load-generator-deployment.yaml"
+          properties:
+            container: "workload-generator"
+            variableName: "NUM_SENSORS"
+        - type: NumSensorsLoadGeneratorReplicaPatcher
+          resource: "uc2-kstreams/uc2-load-generator-deployment.yaml"
+          properties:
+            loadGenMaxRecords: "15000"
+  kafkaConfig:
+    bootstrapServer: "theodolite-cp-kafka:9092"
+    topics:
+      - name: "input"
+        numPartitions: 40
+        replicationFactor: 1
+      - name: "output"
+        numPartitions: 40
+        replicationFactor: 1
+      - name: "theodolite-.*"
+        removeOnly: True
diff --git a/theodolite-benchmarks/definitions/uc2-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc2-flink-benchmark-operator.yaml
index 438f02f90c21acf428127fb8305367c20b7b2134..4bc67808c5f4ba391650a2f9884444c2dca20cc6 100644
--- a/theodolite-benchmarks/definitions/uc2-flink-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc2-flink-benchmark-operator.yaml
@@ -1,48 +1,52 @@
-apiVersion: theodolite.com/v1alpha1
+apiVersion: theodolite.com/v1
 kind: benchmark
 metadata:
   name: uc2-flink
-appResource:
-  - "uc2-flink/flink-configuration-configmap.yaml"
-  - "uc2-flink/taskmanager-deployment.yaml"
-  - "uc2-flink/taskmanager-service.yaml"
-  - "uc2-flink/service-monitor.yaml"
-  - "uc2-flink/jobmanager-service.yaml"
-  - "uc2-flink/jobmanager-deployment.yaml"
-  #- "uc2-flink/jobmanager-rest-service.yaml"
-loadGenResource:
-  - "uc2-kstreams/uc2-load-generator-deployment.yaml"
-  - "uc2-kstreams/uc2-load-generator-service.yaml"
-resourceTypes:
-  - typeName: "Instances"
-    patchers:
-      - type: "ReplicaPatcher"
-        resource: "uc2-flink/taskmanager-deployment.yaml"
-      - type: "EnvVarPatcher"
-        resource: "uc2-flink/jobmanager-deployment.yaml"
-        container: "jobmanager"
-        variableName: "PARALLELISM"
-      - type: "EnvVarPatcher" # required?
-        resource: "uc2-flink/taskmanager-deployment.yaml"
-        container: "taskmanager"
-        variableName: "PARALLELISM"
-loadTypes:
-  - typeName: "NumSensors"
-    patchers:
-      - type: "EnvVarPatcher"
-        resource: "uc2-kstreams/uc2-load-generator-deployment.yaml"
-        container: "workload-generator"
-        variableName: "NUM_SENSORS"
-      - type: NumSensorsLoadGeneratorReplicaPatcher
-        resource: "uc2-kstreams/uc2-load-generator-deployment.yaml"
-kafkaConfig:
-  bootstrapServer: "theodolite-cp-kafka:9092"
-  topics:
-    - name: "input"
-      numPartitions: 40
-      replicationFactor: 1
-    - name: "output"
-      numPartitions: 40
-      replicationFactor: 1
-    - name: "theodolite-.*"
-      removeOnly: True
+spec:
+  appResource:
+    - "uc2-flink/flink-configuration-configmap.yaml"
+    - "uc2-flink/taskmanager-deployment.yaml"
+    - "uc2-flink/taskmanager-service.yaml"
+    - "uc2-flink/service-monitor.yaml"
+    - "uc2-flink/jobmanager-service.yaml"
+    - "uc2-flink/jobmanager-deployment.yaml"
+    #- "uc2-flink/jobmanager-rest-service.yaml"
+  loadGenResource:
+    - "uc2-kstreams/uc2-load-generator-deployment.yaml"
+    - "uc2-kstreams/uc2-load-generator-service.yaml"
+  resourceTypes:
+    - typeName: "Instances"
+      patchers:
+        - type: "ReplicaPatcher"
+          resource: "uc2-flink/taskmanager-deployment.yaml"
+        - type: "EnvVarPatcher"
+          resource: "uc2-flink/jobmanager-deployment.yaml"
+          properties:
+            container: "jobmanager"
+            variableName: "PARALLELISM"
+        - type: "EnvVarPatcher" # required?
+          resource: "uc2-flink/taskmanager-deployment.yaml"
+          properties:
+            container: "taskmanager"
+            variableName: "PARALLELISM"
+  loadTypes:
+    - typeName: "NumSensors"
+      patchers:
+        - type: "EnvVarPatcher"
+          resource: "uc2-kstreams/uc2-load-generator-deployment.yaml"
+          properties:
+            container: "workload-generator"
+            variableName: "NUM_SENSORS"
+        - type: NumSensorsLoadGeneratorReplicaPatcher
+          resource: "uc2-kstreams/uc2-load-generator-deployment.yaml"
+  kafkaConfig:
+    bootstrapServer: "theodolite-cp-kafka:9092"
+    topics:
+      - name: "input"
+        numPartitions: 40
+        replicationFactor: 1
+      - name: "output"
+        numPartitions: 40
+        replicationFactor: 1
+      - name: "theodolite-.*"
+        removeOnly: True
diff --git a/theodolite-benchmarks/definitions/uc3-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc3-benchmark-operator.yaml
index d543dc2e55c6a7d1258d833129d5bba963528e15..e2679ed864d4b8673bf0d44a96683ccb86f44090 100644
--- a/theodolite-benchmarks/definitions/uc3-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc3-benchmark-operator.yaml
@@ -1,37 +1,41 @@
-apiVersion: theodolite.com/v1alpha1
+apiVersion: theodolite.com/v1
 kind: benchmark
 metadata:
   name: uc3-kstreams
-appResource:
-  - "uc3-kstreams/uc3-kstreams-deployment.yaml"
-  - "uc3-kstreams/uc3-kstreams-service.yaml"
-  - "uc3-kstreams/uc3-jmx-configmap.yaml"
-  - "uc3-kstreams/uc3-service-monitor.yaml"
-loadGenResource:
-  - "uc3-kstreams/uc3-load-generator-deployment.yaml"
-  - "uc3-kstreams/uc3-load-generator-service.yaml"
-resourceTypes:
-  - typeName: "Instances"
-    patchers:
-      - type: "ReplicaPatcher"
-        resource: "uc3-kstreams/uc3-kstreams-deployment.yaml"
-loadTypes:
-  - typeName: "NumSensors"
-    patchers:
-      - type: "EnvVarPatcher"
-        resource: "uc3-kstreams/uc3-load-generator-deployment.yaml"
-        container: "workload-generator"
-        variableName: "NUM_SENSORS"
-      - type: NumSensorsLoadGeneratorReplicaPatcher
-        resource: "uc3-kstreams/uc3-load-generator-deployment.yaml"
-kafkaConfig:
-  bootstrapServer: "theodolite-cp-kafka:9092"
-  topics:
-    - name: "input"
-      numPartitions: 40
-      replicationFactor: 1
-    - name: "output"
-      numPartitions: 40
-      replicationFactor: 1
-    - name: "theodolite-.*"
-      removeOnly: True
+spec:
+  appResource:
+    - "uc3-kstreams/uc3-kstreams-deployment.yaml"
+    - "uc3-kstreams/uc3-kstreams-service.yaml"
+    - "uc3-kstreams/uc3-jmx-configmap.yaml"
+    - "uc3-kstreams/uc3-service-monitor.yaml"
+  loadGenResource:
+    - "uc3-kstreams/uc3-load-generator-deployment.yaml"
+    - "uc3-kstreams/uc3-load-generator-service.yaml"
+  resourceTypes:
+    - typeName: "Instances"
+      patchers:
+        - type: "ReplicaPatcher"
+          resource: "uc3-kstreams/uc3-kstreams-deployment.yaml"
+  loadTypes:
+    - typeName: "NumSensors"
+      patchers:
+        - type: "EnvVarPatcher"
+          resource: "uc3-kstreams/uc3-load-generator-deployment.yaml"
+          properties:
+            container: "workload-generator"
+            variableName: "NUM_SENSORS"
+        - type: NumSensorsLoadGeneratorReplicaPatcher
+          resource: "uc3-kstreams/uc3-load-generator-deployment.yaml"
+          properties:
+            loadGenMaxRecords: "15000"
+  kafkaConfig:
+    bootstrapServer: "theodolite-cp-kafka:9092"
+    topics:
+      - name: "input"
+        numPartitions: 40
+        replicationFactor: 1
+      - name: "output"
+        numPartitions: 40
+        replicationFactor: 1
+      - name: "theodolite-.*"
+        removeOnly: True
diff --git a/theodolite-benchmarks/definitions/uc3-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc3-flink-benchmark-operator.yaml
index 00552c52883137d7fdda03000a1f112072031664..f7a05c1371089126d5e39b91f48ac9df42ef05e1 100644
--- a/theodolite-benchmarks/definitions/uc3-flink-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc3-flink-benchmark-operator.yaml
@@ -1,48 +1,52 @@
-apiVersion: theodolite.com/v1alpha1
+apiVersion: theodolite.com/v1
 kind: benchmark
 metadata:
   name: uc3-flink
-appResource:
-  - "uc3-flink/flink-configuration-configmap.yaml"
-  - "uc3-flink/taskmanager-deployment.yaml"
-  - "uc3-flink/taskmanager-service.yaml"
-  - "uc3-flink/service-monitor.yaml"
-  - "uc3-flink/jobmanager-service.yaml"
-  - "uc3-flink/jobmanager-deployment.yaml"
-  #- "uc3-flink/jobmanager-rest-service.yaml"
-loadGenResource:
-  - "uc3-kstreams/uc3-load-generator-deployment.yaml"
-  - "uc3-kstreams/uc3-load-generator-service.yaml"
-resourceTypes:
-  - typeName: "Instances"
-    patchers:
-      - type: "ReplicaPatcher"
-        resource: "uc3-flink/taskmanager-deployment.yaml"
-      - type: "EnvVarPatcher"
-        resource: "uc3-flink/jobmanager-deployment.yaml"
-        container: "jobmanager"
-        variableName: "PARALLELISM"
-      - type: "EnvVarPatcher" # required?
-        resource: "uc3-flink/taskmanager-deployment.yaml"
-        container: "taskmanager"
-        variableName: "PARALLELISM"
-loadTypes:
-  - typeName: "NumSensors"
-    patchers:
-      - type: "EnvVarPatcher"
-        resource: "uc3-kstreams/uc3-load-generator-deployment.yaml"
-        container: "workload-generator"
-        variableName: "NUM_SENSORS"
-      - type: NumSensorsLoadGeneratorReplicaPatcher
-        resource: "uc3-kstreams/uc3-load-generator-deployment.yaml"
-kafkaConfig:
-  bootstrapServer: "theodolite-cp-kafka:9092"
-  topics:
-    - name: "input"
-      numPartitions: 40
-      replicationFactor: 1
-    - name: "output"
-      numPartitions: 40
-      replicationFactor: 1
-    - name: "theodolite-.*"
-      removeOnly: True
+spec:
+  appResource:
+    - "uc3-flink/flink-configuration-configmap.yaml"
+    - "uc3-flink/taskmanager-deployment.yaml"
+    - "uc3-flink/taskmanager-service.yaml"
+    - "uc3-flink/service-monitor.yaml"
+    - "uc3-flink/jobmanager-service.yaml"
+    - "uc3-flink/jobmanager-deployment.yaml"
+    #- "uc3-flink/jobmanager-rest-service.yaml"
+  loadGenResource:
+    - "uc3-kstreams/uc3-load-generator-deployment.yaml"
+    - "uc3-kstreams/uc3-load-generator-service.yaml"
+  resourceTypes:
+    - typeName: "Instances"
+      patchers:
+        - type: "ReplicaPatcher"
+          resource: "uc3-flink/taskmanager-deployment.yaml"
+        - type: "EnvVarPatcher"
+          resource: "uc3-flink/jobmanager-deployment.yaml"
+          properties:
+            container: "jobmanager"
+            variableName: "PARALLELISM"
+        - type: "EnvVarPatcher" # required?
+          resource: "uc3-flink/taskmanager-deployment.yaml"
+          properties:
+            container: "taskmanager"
+            variableName: "PARALLELISM"
+  loadTypes:
+    - typeName: "NumSensors"
+      patchers:
+        - type: "EnvVarPatcher"
+          resource: "uc3-kstreams/uc3-load-generator-deployment.yaml"
+          properties:
+            container: "workload-generator"
+            variableName: "NUM_SENSORS"
+        - type: NumSensorsLoadGeneratorReplicaPatcher
+          resource: "uc3-kstreams/uc3-load-generator-deployment.yaml"
+  kafkaConfig:
+    bootstrapServer: "theodolite-cp-kafka:9092"
+    topics:
+      - name: "input"
+        numPartitions: 40
+        replicationFactor: 1
+      - name: "output"
+        numPartitions: 40
+        replicationFactor: 1
+      - name: "theodolite-.*"
+        removeOnly: True
diff --git a/theodolite-benchmarks/definitions/uc4-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc4-benchmark-operator.yaml
index ed71d9cef1ce88412de77ea10dbc1f38acf51e97..3e10fd1aebf071e854cb31501030a50c11eab01d 100644
--- a/theodolite-benchmarks/definitions/uc4-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc4-benchmark-operator.yaml
@@ -1,43 +1,48 @@
-apiVersion: theodolite.com/v1alpha1
+apiVersion: theodolite.com/v1
 kind: benchmark
 metadata:
   name: uc4-kstreams
-appResource:
-  - "uc4-kstreams/uc4-kstreams-deployment.yaml"
-  - "uc4-kstreams/uc4-kstreams-service.yaml"
-  - "uc4-kstreams/uc4-jmx-configmap.yaml"
-  - "uc4-kstreams/uc4-service-monitor.yaml"
-loadGenResource:
-  - "uc4-kstreams/uc4-load-generator-deployment.yaml"
-  - "uc4-kstreams/uc4-load-generator-service.yaml"
-resourceTypes:
-  - typeName: "Instances"
-    patchers:
-      - type: "ReplicaPatcher"
-        resource: "uc4-kstreams/uc4-kstreams-deployment.yaml"
-loadTypes:
-  - typeName: "NumNestedGroups"
-    patchers:
-      - type: "EnvVarPatcher"
-        resource: "uc4-kstreams/uc4-load-generator-deployment.yaml"
-        container: "workload-generator"
-        variableName: "NUM_NESTED_GROUPS"
-      - type: "NumNestedGroupsLoadGeneratorReplicaPatcher"
-        resource: "uc4-kstreams/uc4-load-generator-deployment.yaml"
-kafkaConfig:
-  bootstrapServer: "theodolite-cp-kafka:9092"
-  topics:
-    - name: "input"
-      numPartitions: 40
-      replicationFactor: 1
-    - name: "output"
-      numPartitions: 40
-      replicationFactor: 1
-    - name: "configuration"
-      numPartitions: 40
-      replicationFactor: 1
-    - name: "aggregation-feedback"
-      numPartitions: 40
-      replicationFactor: 1
-    - name: "theodolite-.*"
-      removeOnly: True
+spec:
+  appResource:
+    - "uc4-kstreams/uc4-kstreams-deployment.yaml"
+    - "uc4-kstreams/uc4-kstreams-service.yaml"
+    - "uc4-kstreams/uc4-jmx-configmap.yaml"
+    - "uc4-kstreams/uc4-service-monitor.yaml"
+  loadGenResource:
+    - "uc4-kstreams/uc4-load-generator-deployment.yaml"
+    - "uc4-kstreams/uc4-load-generator-service.yaml"
+  resourceTypes:
+    - typeName: "Instances"
+      patchers:
+        - type: "ReplicaPatcher"
+          resource: "uc4-kstreams/uc4-kstreams-deployment.yaml"
+  loadTypes:
+    - typeName: "NumNestedGroups"
+      patchers:
+        - type: "EnvVarPatcher"
+          resource: "uc4-kstreams/uc4-load-generator-deployment.yaml"
+          properties:
+            container: "workload-generator"
+            variableName: "NUM_SENSORS"
+        - type: NumNestedGroupsLoadGeneratorReplicaPatcher
+          resource: "uc4-kstreams/uc4-load-generator-deployment.yaml"
+          properties:
+            loadGenMaxRecords: "15000"
+            numSensors: "4.0"
+  kafkaConfig:
+    bootstrapServer: "theodolite-cp-kafka:9092"
+    topics:
+      - name: "input"
+        numPartitions: 40
+        replicationFactor: 1
+      - name: "output"
+        numPartitions: 40
+        replicationFactor: 1
+      - name: "configuration"
+        numPartitions: 40
+        replicationFactor: 1
+      - name: "aggregation-feedback"
+        numPartitions: 40
+        replicationFactor: 1
+      - name: "theodolite-.*"
+        removeOnly: True
diff --git a/theodolite-benchmarks/definitions/uc4-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc4-flink-benchmark-operator.yaml
index 814dc9b19f91e1597ee58aa64512d7f6757d7265..523167286f04e3ec0a66a43eabda618908ae3f11 100644
--- a/theodolite-benchmarks/definitions/uc4-flink-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc4-flink-benchmark-operator.yaml
@@ -1,54 +1,58 @@
-apiVersion: theodolite.com/v1alpha1
+apiVersion: theodolite.com/v1
 kind: benchmark
 metadata:
   name: uc4-flink
-appResource:
-  - "uc4-flink/flink-configuration-configmap.yaml"
-  - "uc4-flink/taskmanager-deployment.yaml"
-  - "uc4-flink/taskmanager-service.yaml"
-  - "uc4-flink/service-monitor.yaml"
-  - "uc4-flink/jobmanager-service.yaml"
-  - "uc4-flink/jobmanager-deployment.yaml"
-  #- "uc4-flink/jobmanager-rest-service.yaml"
-loadGenResource:
-  - "uc4-kstreams/uc4-load-generator-deployment.yaml"
-  - "uc4-kstreams/uc4-load-generator-service.yaml"
-resourceTypes:
-  - typeName: "Instances"
-    patchers:
-      - type: "ReplicaPatcher"
-        resource: "uc4-flink/taskmanager-deployment.yaml"
-      - type: "EnvVarPatcher"
-        resource: "uc4-flink/jobmanager-deployment.yaml"
-        container: "jobmanager"
-        variableName: "PARALLELISM"
-      - type: "EnvVarPatcher" # required?
-        resource: "uc4-flink/taskmanager-deployment.yaml"
-        container: "taskmanager"
-        variableName: "PARALLELISM"
-loadTypes:
-  - typeName: "NumNestedGroups"
-    patchers:
-      - type: "EnvVarPatcher"
-        resource: "uc4-kstreams/uc4-load-generator-deployment.yaml"
-        container: "workload-generator"
-        variableName: "NUM_NESTED_GROUPS"
-      - type: "NumNestedGroupsLoadGeneratorReplicaPatcher"
-        resource: "uc4-kstreams/uc4-load-generator-deployment.yaml"
-kafkaConfig:
-  bootstrapServer: "theodolite-cp-kafka:9092"
-  topics:
-    - name: "input"
-      numPartitions: 40
-      replicationFactor: 1
-    - name: "output"
-      numPartitions: 40
-      replicationFactor: 1
-    - name: "configuration"
-      numPartitions: 40
-      replicationFactor: 1
-    - name: "aggregation-feedback"
-      numPartitions: 40
-      replicationFactor: 1
-    - name: "theodolite-.*"
-      removeOnly: True
+spec:
+  appResource:
+    - "uc4-flink/flink-configuration-configmap.yaml"
+    - "uc4-flink/taskmanager-deployment.yaml"
+    - "uc4-flink/taskmanager-service.yaml"
+    - "uc4-flink/service-monitor.yaml"
+    - "uc4-flink/jobmanager-service.yaml"
+    - "uc4-flink/jobmanager-deployment.yaml"
+    #- "uc4-flink/jobmanager-rest-service.yaml"
+  loadGenResource:
+    - "uc4-kstreams/uc4-load-generator-deployment.yaml"
+    - "uc4-kstreams/uc4-load-generator-service.yaml"
+  resourceTypes:
+    - typeName: "Instances"
+      patchers:
+        - type: "ReplicaPatcher"
+          resource: "uc4-flink/taskmanager-deployment.yaml"
+        - type: "EnvVarPatcher"
+          resource: "uc4-flink/jobmanager-deployment.yaml"
+          properties:
+            container: "jobmanager"
+            variableName: "PARALLELISM"
+        - type: "EnvVarPatcher" # required?
+          resource: "uc4-flink/taskmanager-deployment.yaml"
+          properties:
+            container: "taskmanager"
+            variableName: "PARALLELISM"
+  loadTypes:
+    - typeName: "NumNestedGroups"
+      patchers:
+        - type: "EnvVarPatcher"
+          resource: "uc4-kstreams/uc4-load-generator-deployment.yaml"
+          properties:
+            container: "workload-generator"
+            variableName: "NUM_NESTED_GROUPS"
+        - type: "NumNestedGroupsLoadGeneratorReplicaPatcher"
+          resource: "uc4-kstreams/uc4-load-generator-deployment.yaml"
+  kafkaConfig:
+    bootstrapServer: "theodolite-cp-kafka:9092"
+    topics:
+      - name: "input"
+        numPartitions: 40
+        replicationFactor: 1
+      - name: "output"
+        numPartitions: 40
+        replicationFactor: 1
+      - name: "configuration"
+        numPartitions: 40
+        replicationFactor: 1
+      - name: "aggregation-feedback"
+        numPartitions: 40
+        replicationFactor: 1
+      - name: "theodolite-.*"
+        removeOnly: True