diff --git a/theodolite-benchmarks/definitions/uc1-beam-flink/resources/jobmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc1-beam-flink/resources/jobmanager-deployment.yaml
index d274cba8a326ddaac7670e7797b899d6022b12c9..343b7e7729ca5cdc1c78150e8b77896dcc59eb81 100644
--- a/theodolite-benchmarks/definitions/uc1-beam-flink/resources/jobmanager-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc1-beam-flink/resources/jobmanager-deployment.yaml
@@ -28,8 +28,6 @@ spec:
               value: "theodolite-kafka-kafka-bootstrap:9092"
             - name: SCHEMA_REGISTRY_URL
               value: "http://theodolite-kafka-schema-registry:8081"
-            - name: COMMIT_INTERVAL_MS
-              value: "100"
             - name: CHECKPOINTING
               value: "false"
             - name: PARALLELISM
diff --git a/theodolite-benchmarks/definitions/uc1-beam-flink/resources/taskmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc1-beam-flink/resources/taskmanager-deployment.yaml
index bcf3a04f34dd039a3d75c86df095d09b9523f615..3af767a83266287e984241be52197c8ad92f7a63 100644
--- a/theodolite-benchmarks/definitions/uc1-beam-flink/resources/taskmanager-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc1-beam-flink/resources/taskmanager-deployment.yaml
@@ -24,8 +24,6 @@ spec:
               value: "theodolite-kafka-kafka-bootstrap:9092"
             - name: SCHEMA_REGISTRY_URL
               value: "http://theodolite-kafka-schema-registry:8081"
-            - name: COMMIT_INTERVAL_MS
-              value: "100"
             - name: CHECKPOINTING
               value: "false"
             # - name: PARALLELISM
diff --git a/theodolite-benchmarks/definitions/uc1-beam-samza/resources/uc1-beam-samza-deployment.yaml b/theodolite-benchmarks/definitions/uc1-beam-samza/resources/uc1-beam-samza-deployment.yaml
index d7f453e2ab9c15bca83162520ebe7e90ce7be3ea..b4d3879a14c58ca0ed59762927cc6df3aee1fe04 100644
--- a/theodolite-benchmarks/definitions/uc1-beam-samza/resources/uc1-beam-samza-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc1-beam-samza/resources/uc1-beam-samza-deployment.yaml
@@ -31,8 +31,6 @@ spec:
               value: "http://theodolite-kafka-schema-registry:8081"
             # - name: JAVA_OPTS
             #   value: "-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.port=5555"
-            - name: COMMIT_INTERVAL_MS # Set as default for the applications
-              value: "100"
           resources:
             limits:
               memory: 4Gi
diff --git a/theodolite-benchmarks/definitions/uc1-flink/resources/jobmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc1-flink/resources/jobmanager-deployment.yaml
index 74c5002dbdf988071ee43946b55b56d7d439a09e..f247a5d9b2fcc21825d2ac1a5164edba0d0d840b 100644
--- a/theodolite-benchmarks/definitions/uc1-flink/resources/jobmanager-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc1-flink/resources/jobmanager-deployment.yaml
@@ -23,8 +23,6 @@ spec:
               value: "theodolite-kafka-kafka-bootstrap:9092"
             - name: SCHEMA_REGISTRY_URL
               value: "http://theodolite-kafka-schema-registry:8081"
-            - name: COMMIT_INTERVAL_MS
-              value: "100"
             - name: CHECKPOINTING
               value: "false"
             - name: PARALLELISM
diff --git a/theodolite-benchmarks/definitions/uc1-flink/resources/taskmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc1-flink/resources/taskmanager-deployment.yaml
index be23c1d6abf2ccdc39481997bff12f11fd8fd580..a940f1ee30a1bc705c19329cfd25db7af48d27b0 100644
--- a/theodolite-benchmarks/definitions/uc1-flink/resources/taskmanager-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc1-flink/resources/taskmanager-deployment.yaml
@@ -23,8 +23,6 @@ spec:
               value: "theodolite-kafka-kafka-bootstrap:9092"
             - name: SCHEMA_REGISTRY_URL
               value: "http://theodolite-kafka-schema-registry:8081"
-            - name: COMMIT_INTERVAL_MS
-              value: "100"
             - name: CHECKPOINTING
               value: "false"
             - name: PARALLELISM
diff --git a/theodolite-benchmarks/definitions/uc1-hazelcastjet/resources/uc1-hazelcastjet-deployment.yaml b/theodolite-benchmarks/definitions/uc1-hazelcastjet/resources/uc1-hazelcastjet-deployment.yaml
index 28cf4761d44a4d98c1d2b889f9c6a679ec96304a..636fde2588f1a454471d1b491c83895266c0e5b9 100644
--- a/theodolite-benchmarks/definitions/uc1-hazelcastjet/resources/uc1-hazelcastjet-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc1-hazelcastjet/resources/uc1-hazelcastjet-deployment.yaml
@@ -21,8 +21,6 @@ spec:
               value: "theodolite-kafka-kafka-bootstrap:9092"
             - name: SCHEMA_REGISTRY_URL
               value: "http://theodolite-kafka-schema-registry:8081"
-            - name: COMMIT_INTERVAL_MS # Set as default for the applications
-              value: "100"
             - name: KUBERNETES_NAMESPACE
               valueFrom:
                 fieldRef:
diff --git a/theodolite-benchmarks/definitions/uc1-kstreams/resources/uc1-kstreams-deployment.yaml b/theodolite-benchmarks/definitions/uc1-kstreams/resources/uc1-kstreams-deployment.yaml
index 7698dc50306901d8fd7e2f4ab79f2f362b909d54..37d9004bba2f6ca3cbda370e9d38977aea014f1a 100644
--- a/theodolite-benchmarks/definitions/uc1-kstreams/resources/uc1-kstreams-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc1-kstreams/resources/uc1-kstreams-deployment.yaml
@@ -26,8 +26,6 @@ spec:
               value: "http://theodolite-kafka-schema-registry:8081"
             - name: JAVA_OPTS
               value: "-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.port=5555"
-            - name: COMMIT_INTERVAL_MS # Set as default for the applications
-              value: "100"
           resources:
             limits:
               memory: 4Gi
diff --git a/theodolite-benchmarks/definitions/uc2-beam-flink/resources/jobmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc2-beam-flink/resources/jobmanager-deployment.yaml
index 667559010b0dc9f642f9cb0e8c9d257d70a2dbaa..961a68acff52f7b300d2049f08652d4251da38a0 100644
--- a/theodolite-benchmarks/definitions/uc2-beam-flink/resources/jobmanager-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc2-beam-flink/resources/jobmanager-deployment.yaml
@@ -28,8 +28,6 @@ spec:
               value: "theodolite-kafka-kafka-bootstrap:9092"
             - name: SCHEMA_REGISTRY_URL
               value: "http://theodolite-kafka-schema-registry:8081"
-            - name: COMMIT_INTERVAL_MS
-              value: "100"
             - name: CHECKPOINTING
               value: "false"
             - name: PARALLELISM
diff --git a/theodolite-benchmarks/definitions/uc2-beam-flink/resources/taskmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc2-beam-flink/resources/taskmanager-deployment.yaml
index f4f7a9c54a55c42dffe838925a8a97e73ef74759..7da3d46483fca9a011b62faa1cc6166df6c04c03 100644
--- a/theodolite-benchmarks/definitions/uc2-beam-flink/resources/taskmanager-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc2-beam-flink/resources/taskmanager-deployment.yaml
@@ -24,8 +24,6 @@ spec:
               value: "theodolite-kafka-kafka-bootstrap:9092"
             - name: SCHEMA_REGISTRY_URL
               value: "http://theodolite-kafka-schema-registry:8081"
-            - name: COMMIT_INTERVAL_MS
-              value: "100"
             - name: CHECKPOINTING
               value: "false"
             - name: "FLINK_STATE_BACKEND"
diff --git a/theodolite-benchmarks/definitions/uc2-beam-samza/resources/uc2-beam-samza-deployment.yaml b/theodolite-benchmarks/definitions/uc2-beam-samza/resources/uc2-beam-samza-deployment.yaml
index 4266b47a15f2b43e7d746a581c1cd5b1f7321096..2e932176fc5aded48fcff0f3ddeb9c8daf4198f8 100644
--- a/theodolite-benchmarks/definitions/uc2-beam-samza/resources/uc2-beam-samza-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc2-beam-samza/resources/uc2-beam-samza-deployment.yaml
@@ -29,8 +29,6 @@ spec:
               value: "theodolite-kafka-kafka-bootstrap:9092"
             - name: SCHEMA_REGISTRY_URL
               value: "http://theodolite-kafka-schema-registry:8081"
-            - name: COMMIT_INTERVAL_MS # Set as default for the applications
-              value: "100"
           resources:
             limits:
               memory: 4Gi
diff --git a/theodolite-benchmarks/definitions/uc2-flink/resources/jobmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc2-flink/resources/jobmanager-deployment.yaml
index d9d7182837dcd29dec80e74d631270b678dc9a7f..d96701b891c725c08dfc7c1e786c2618c8755df6 100644
--- a/theodolite-benchmarks/definitions/uc2-flink/resources/jobmanager-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc2-flink/resources/jobmanager-deployment.yaml
@@ -23,8 +23,6 @@ spec:
               value: "theodolite-kafka-kafka-bootstrap:9092"
             - name: SCHEMA_REGISTRY_URL
               value: "http://theodolite-kafka-schema-registry:8081"
-            - name: COMMIT_INTERVAL_MS
-              value: "100"
             - name: CHECKPOINTING
               value: "false"
             - name: PARALLELISM
diff --git a/theodolite-benchmarks/definitions/uc2-flink/resources/taskmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc2-flink/resources/taskmanager-deployment.yaml
index add5ee6c770f8a4fa1cd8685009ae0fba85ac459..bea93f4539888189a3ca85008d26513c6d5f8793 100644
--- a/theodolite-benchmarks/definitions/uc2-flink/resources/taskmanager-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc2-flink/resources/taskmanager-deployment.yaml
@@ -23,8 +23,6 @@ spec:
               value: "theodolite-kafka-kafka-bootstrap:9092"
             - name: SCHEMA_REGISTRY_URL
               value: "http://theodolite-kafka-schema-registry:8081"
-            - name: COMMIT_INTERVAL_MS
-              value: "100"
             - name: CHECKPOINTING
               value: "false"
             - name: PARALLELISM
diff --git a/theodolite-benchmarks/definitions/uc2-hazelcastjet/resources/uc2-hazelcastjet-deployment.yaml b/theodolite-benchmarks/definitions/uc2-hazelcastjet/resources/uc2-hazelcastjet-deployment.yaml
index 15eb8baa4219253270066d68cfa9cb4166eafd48..ae28c0709cf11507ff4d67512b29e92b6292c7cc 100644
--- a/theodolite-benchmarks/definitions/uc2-hazelcastjet/resources/uc2-hazelcastjet-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc2-hazelcastjet/resources/uc2-hazelcastjet-deployment.yaml
@@ -21,8 +21,6 @@ spec:
               value: "theodolite-kafka-kafka-bootstrap:9092"
             - name: SCHEMA_REGISTRY_URL
               value: "http://theodolite-kafka-schema-registry:8081"
-            - name: COMMIT_INTERVAL_MS # Set as default for the applications
-              value: "100"
             - name: DOWNSAMPLE_INTERVAL
               value: "5000"
             #- name: KUBERNETES_DNS_NAME
diff --git a/theodolite-benchmarks/definitions/uc2-kstreams/resources/uc2-kstreams-deployment.yaml b/theodolite-benchmarks/definitions/uc2-kstreams/resources/uc2-kstreams-deployment.yaml
index 47711343508c712e8f46d38feaef6b6057fbdc80..ccd7a5a6e595c2ec1434bbeb091cb1d50305a339 100644
--- a/theodolite-benchmarks/definitions/uc2-kstreams/resources/uc2-kstreams-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc2-kstreams/resources/uc2-kstreams-deployment.yaml
@@ -26,8 +26,6 @@ spec:
               value: "http://theodolite-kafka-schema-registry:8081"
             - name: JAVA_OPTS
               value: "-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.port=5555"
-            - name: COMMIT_INTERVAL_MS # Set as default for the applications
-              value: "100"
           resources:
             limits:
               memory: 4Gi
diff --git a/theodolite-benchmarks/definitions/uc3-beam-flink/resources/jobmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc3-beam-flink/resources/jobmanager-deployment.yaml
index 1e70c714d0feef09e034566e9e1745b3b310753b..62a6d661570f8d25276ac4f04eefbc0e40579fd1 100644
--- a/theodolite-benchmarks/definitions/uc3-beam-flink/resources/jobmanager-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc3-beam-flink/resources/jobmanager-deployment.yaml
@@ -28,8 +28,6 @@ spec:
               value: "theodolite-kafka-kafka-bootstrap:9092"
             - name: SCHEMA_REGISTRY_URL
               value: "http://theodolite-kafka-schema-registry:8081"
-            - name: COMMIT_INTERVAL_MS
-              value: "100"
             - name: CHECKPOINTING
               value: "false"
             - name: PARALLELISM
diff --git a/theodolite-benchmarks/definitions/uc3-beam-flink/resources/taskmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc3-beam-flink/resources/taskmanager-deployment.yaml
index e71177f1c7d3595b4dc48a82aebfe839bc2786eb..ce94e22ee97f6a002913d6d6ef1fa1c74ab0f93b 100644
--- a/theodolite-benchmarks/definitions/uc3-beam-flink/resources/taskmanager-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc3-beam-flink/resources/taskmanager-deployment.yaml
@@ -24,8 +24,6 @@ spec:
               value: "theodolite-kafka-kafka-bootstrap:9092"
             - name: SCHEMA_REGISTRY_URL
               value: "http://theodolite-kafka-schema-registry:8081"
-            - name: COMMIT_INTERVAL_MS
-              value: "100"
             - name: CHECKPOINTING
               value: "false"
             - name: "FLINK_STATE_BACKEND"
diff --git a/theodolite-benchmarks/definitions/uc3-beam-samza/resources/uc3-beam-samza-deployment.yaml b/theodolite-benchmarks/definitions/uc3-beam-samza/resources/uc3-beam-samza-deployment.yaml
index bb1917a156d6a04277a3ca6e3bccd580d760de21..505abfe3ae2b1d9489b786a70db7b21886d2ee6f 100644
--- a/theodolite-benchmarks/definitions/uc3-beam-samza/resources/uc3-beam-samza-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc3-beam-samza/resources/uc3-beam-samza-deployment.yaml
@@ -29,8 +29,6 @@ spec:
               value: "theodolite-kafka-kafka-bootstrap:9092"
             - name: SCHEMA_REGISTRY_URL
               value: "http://theodolite-kafka-schema-registry:8081"
-            - name: COMMIT_INTERVAL_MS # Set as default for the applications
-              value: "100"
           resources:
             limits:
               memory: 4Gi
diff --git a/theodolite-benchmarks/definitions/uc3-flink/resources/jobmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc3-flink/resources/jobmanager-deployment.yaml
index 90e13d000d48be220d40027aaf648d7e0472bbff..8aea2eda64cc155140b7344401809ceff8ebefd4 100644
--- a/theodolite-benchmarks/definitions/uc3-flink/resources/jobmanager-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc3-flink/resources/jobmanager-deployment.yaml
@@ -23,8 +23,6 @@ spec:
               value: "theodolite-kafka-kafka-bootstrap:9092"
             - name: SCHEMA_REGISTRY_URL
               value: "http://theodolite-kafka-schema-registry:8081"
-            - name: COMMIT_INTERVAL_MS
-              value: "100"
             - name: CHECKPOINTING
               value: "false"
             - name: PARALLELISM
diff --git a/theodolite-benchmarks/definitions/uc3-flink/resources/taskmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc3-flink/resources/taskmanager-deployment.yaml
index 7092166f295a8bb85f929775170b67c41cf17612..861e8cfeebef4c7fcb367c2f6c719fe50a93039d 100644
--- a/theodolite-benchmarks/definitions/uc3-flink/resources/taskmanager-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc3-flink/resources/taskmanager-deployment.yaml
@@ -23,8 +23,6 @@ spec:
               value: "theodolite-kafka-kafka-bootstrap:9092"
             - name: SCHEMA_REGISTRY_URL
               value: "http://theodolite-kafka-schema-registry:8081"
-            - name: COMMIT_INTERVAL_MS
-              value: "100"
             - name: CHECKPOINTING
               value: "false"
             - name: PARALLELISM
diff --git a/theodolite-benchmarks/definitions/uc3-hazelcastjet/resources/uc3-hazelcastjet-deployment.yaml b/theodolite-benchmarks/definitions/uc3-hazelcastjet/resources/uc3-hazelcastjet-deployment.yaml
index 85e66f390446ead8637d11a19c9f7520f82074c9..248dccb83191f273f073912905896be192df8b4c 100644
--- a/theodolite-benchmarks/definitions/uc3-hazelcastjet/resources/uc3-hazelcastjet-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc3-hazelcastjet/resources/uc3-hazelcastjet-deployment.yaml
@@ -21,8 +21,6 @@ spec:
               value: "theodolite-kafka-kafka-bootstrap:9092"
             - name: SCHEMA_REGISTRY_URL
               value: "http://theodolite-kafka-schema-registry:8081"
-            - name: COMMIT_INTERVAL_MS # Set as default for the applications
-              value: "100"
             #- name: KUBERNETES_DNS_NAME
             #  value: "titan-ccp-aggregation"
             - name: KUBERNETES_NAMESPACE
diff --git a/theodolite-benchmarks/definitions/uc3-kstreams/resources/uc3-kstreams-deployment.yaml b/theodolite-benchmarks/definitions/uc3-kstreams/resources/uc3-kstreams-deployment.yaml
index 1a98c1a5edf2b4b0dc3b8fbb155c56c347ce22fa..6da2e5dee94fc2f65e2c4a55184654a384ffbd2f 100644
--- a/theodolite-benchmarks/definitions/uc3-kstreams/resources/uc3-kstreams-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc3-kstreams/resources/uc3-kstreams-deployment.yaml
@@ -26,8 +26,6 @@ spec:
               value: "http://theodolite-kafka-schema-registry:8081"
             - name: JAVA_OPTS
               value: "-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.port=5555"
-            - name: COMMIT_INTERVAL_MS # Set as default for the applications
-              value: "100"
           resources:
             limits:
               memory: 4Gi
diff --git a/theodolite-benchmarks/definitions/uc4-beam-flink/resources/jobmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc4-beam-flink/resources/jobmanager-deployment.yaml
index 2cd558313e07ed35945efcb2a16528911bdf3121..4deb0cb21f054bc6f39c4445d5e0411d1d079507 100644
--- a/theodolite-benchmarks/definitions/uc4-beam-flink/resources/jobmanager-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc4-beam-flink/resources/jobmanager-deployment.yaml
@@ -28,8 +28,6 @@ spec:
               value: "theodolite-kafka-kafka-bootstrap:9092"
             - name: SCHEMA_REGISTRY_URL
               value: "http://theodolite-kafka-schema-registry:8081"
-            - name: COMMIT_INTERVAL_MS
-              value: "100"
             - name: CHECKPOINTING
               value: "false"
             - name: PARALLELISM
diff --git a/theodolite-benchmarks/definitions/uc4-beam-flink/resources/taskmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc4-beam-flink/resources/taskmanager-deployment.yaml
index 75718b28564a2ffca7f684eccaab26b9caff6a5f..2bd37ed9b2e511c4ed4a0024690b719867d11857 100644
--- a/theodolite-benchmarks/definitions/uc4-beam-flink/resources/taskmanager-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc4-beam-flink/resources/taskmanager-deployment.yaml
@@ -24,8 +24,6 @@ spec:
               value: "theodolite-kafka-kafka-bootstrap:9092"
             - name: SCHEMA_REGISTRY_URL
               value: "http://theodolite-kafka-schema-registry:8081"
-            - name: COMMIT_INTERVAL_MS
-              value: "100"
             - name: CHECKPOINTING
               value: "false"
             - name: "FLINK_STATE_BACKEND"
diff --git a/theodolite-benchmarks/definitions/uc4-beam-samza/resources/uc4-beam-samza-deployment.yaml b/theodolite-benchmarks/definitions/uc4-beam-samza/resources/uc4-beam-samza-deployment.yaml
index fccf67c82bbda59a1f31fa0617cd158a99a09f46..b22c1b40c5bd0552e92a2a840d30237d2ec52552 100644
--- a/theodolite-benchmarks/definitions/uc4-beam-samza/resources/uc4-beam-samza-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc4-beam-samza/resources/uc4-beam-samza-deployment.yaml
@@ -29,8 +29,6 @@ spec:
               value: "theodolite-kafka-kafka-bootstrap:9092"
             - name: SCHEMA_REGISTRY_URL
               value: "http://theodolite-kafka-schema-registry:8081"
-            - name: COMMIT_INTERVAL_MS # Set as default for the applications
-              value: "100"
           resources:
             limits:
               memory: 4Gi
diff --git a/theodolite-benchmarks/definitions/uc4-flink/resources/jobmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc4-flink/resources/jobmanager-deployment.yaml
index fe8f232170406d06f7339455e1488c716d0326db..d76bcf72eae1036ec2f1d5bad0038af1b8fe72a1 100644
--- a/theodolite-benchmarks/definitions/uc4-flink/resources/jobmanager-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc4-flink/resources/jobmanager-deployment.yaml
@@ -23,8 +23,6 @@ spec:
               value: "theodolite-kafka-kafka-bootstrap:9092"
             - name: SCHEMA_REGISTRY_URL
               value: "http://theodolite-kafka-schema-registry:8081"
-            - name: COMMIT_INTERVAL_MS
-              value: "100"
             - name: CHECKPOINTING
               value: "false"
             - name: PARALLELISM
diff --git a/theodolite-benchmarks/definitions/uc4-flink/resources/taskmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc4-flink/resources/taskmanager-deployment.yaml
index 7092166f295a8bb85f929775170b67c41cf17612..861e8cfeebef4c7fcb367c2f6c719fe50a93039d 100644
--- a/theodolite-benchmarks/definitions/uc4-flink/resources/taskmanager-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc4-flink/resources/taskmanager-deployment.yaml
@@ -23,8 +23,6 @@ spec:
               value: "theodolite-kafka-kafka-bootstrap:9092"
             - name: SCHEMA_REGISTRY_URL
               value: "http://theodolite-kafka-schema-registry:8081"
-            - name: COMMIT_INTERVAL_MS
-              value: "100"
             - name: CHECKPOINTING
               value: "false"
             - name: PARALLELISM
diff --git a/theodolite-benchmarks/definitions/uc4-hazelcastjet/resources/uc4-hazelcastjet-deployment.yaml b/theodolite-benchmarks/definitions/uc4-hazelcastjet/resources/uc4-hazelcastjet-deployment.yaml
index 1c5272cb6adf05579f79125f300836740450e361..980ab44a2f5673d33e489efa4bf4c95a90981949 100644
--- a/theodolite-benchmarks/definitions/uc4-hazelcastjet/resources/uc4-hazelcastjet-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc4-hazelcastjet/resources/uc4-hazelcastjet-deployment.yaml
@@ -21,8 +21,6 @@ spec:
               value: "theodolite-kafka-kafka-bootstrap:9092"
             - name: SCHEMA_REGISTRY_URL
               value: "http://theodolite-kafka-schema-registry:8081"
-            - name: COMMIT_INTERVAL_MS # Set as default for the applications
-              value: "100"
             - name: WINDOW_SIZE
               value: "5000"
             #- name: KUBERNETES_DNS_NAME
diff --git a/theodolite-benchmarks/definitions/uc4-kstreams/resources/uc4-kstreams-deployment.yaml b/theodolite-benchmarks/definitions/uc4-kstreams/resources/uc4-kstreams-deployment.yaml
index bc083914431fa027308205825730afd5a19cc250..848d1d3a1e416412b157963afd7fc98431a0049a 100644
--- a/theodolite-benchmarks/definitions/uc4-kstreams/resources/uc4-kstreams-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc4-kstreams/resources/uc4-kstreams-deployment.yaml
@@ -26,8 +26,6 @@ spec:
               value: "http://theodolite-kafka-schema-registry:8081"
             - name: JAVA_OPTS
               value: "-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.port=5555"
-            - name: COMMIT_INTERVAL_MS # Set as default for the applications
-              value: "100"
           resources:
             limits:
               memory: 4Gi
diff --git a/theodolite-benchmarks/flink-commons/src/main/java/rocks/theodolite/benchmarks/commons/flink/ConfigurationKeys.java b/theodolite-benchmarks/flink-commons/src/main/java/rocks/theodolite/benchmarks/commons/flink/ConfigurationKeys.java
index cbe2e993d66d1824117169e7986311b2663038ee..750f11ab50c5f22edf35c8dd1d0b07b739d7155a 100644
--- a/theodolite-benchmarks/flink-commons/src/main/java/rocks/theodolite/benchmarks/commons/flink/ConfigurationKeys.java
+++ b/theodolite-benchmarks/flink-commons/src/main/java/rocks/theodolite/benchmarks/commons/flink/ConfigurationKeys.java
@@ -25,7 +25,7 @@ public final class ConfigurationKeys {
 
   public static final String CHECKPOINTING = "checkpointing";
 
-  public static final String CHECKPOINTING_INTERVAL_MS = "commit.interval.ms";
+  public static final String CHECKPOINTING_INTERVAL_MS = "checkpointing.interval.ms";
 
   public static final String FLINK_STATE_BACKEND = "flink.state.backend";
 
diff --git a/theodolite-benchmarks/uc1-beam/src/main/resources/META-INF/application.properties b/theodolite-benchmarks/uc1-beam/src/main/resources/META-INF/application.properties
index e9de96c0df34b1254a8ec9886586e163999c7c6e..6bb2df5bef42038637b88b67b36178797407088e 100644
--- a/theodolite-benchmarks/uc1-beam/src/main/resources/META-INF/application.properties
+++ b/theodolite-benchmarks/uc1-beam/src/main/resources/META-INF/application.properties
@@ -10,11 +10,9 @@ kafka.output.topic=output
 
 schema.registry.url=http://localhost:8081
 
-num.threads=1
-commit.interval.ms=1000
-cache.max.bytes.buffering=-1
-
 specific.avro.reader=true
+
+# Kafka Settings
 enable.auto.commit=true
 max.poll.records=500
 auto.offset.reset=earliest
diff --git a/theodolite-benchmarks/uc1-flink/src/main/resources/META-INF/application.properties b/theodolite-benchmarks/uc1-flink/src/main/resources/META-INF/application.properties
index 905e501b8cb66712f2b245470d96803987a9b93b..4c5a921ce6775e355138e25de2146eec82dc4a18 100644
--- a/theodolite-benchmarks/uc1-flink/src/main/resources/META-INF/application.properties
+++ b/theodolite-benchmarks/uc1-flink/src/main/resources/META-INF/application.properties
@@ -7,6 +7,5 @@ kafka.output.topic=output
 
 schema.registry.url=http://localhost:8081
 
-num.threads=1
-commit.interval.ms=1000
-cache.max.bytes.buffering=-1
+# Flink configuration
+checkpointing.interval.ms=1000
diff --git a/theodolite-benchmarks/uc1-kstreams/src/main/resources/META-INF/application.properties b/theodolite-benchmarks/uc1-kstreams/src/main/resources/META-INF/application.properties
index e3371cc87e20e85e6e8c327955537e6e49dab86e..9bb191b3eaa56bab474e2926565449884d76badd 100644
--- a/theodolite-benchmarks/uc1-kstreams/src/main/resources/META-INF/application.properties
+++ b/theodolite-benchmarks/uc1-kstreams/src/main/resources/META-INF/application.properties
@@ -6,3 +6,5 @@ kafka.input.topic=input
 
 schema.registry.url=http://localhost:8081
 
+# Kafka Streams Config
+commit.interval.ms=5000	
diff --git a/theodolite-benchmarks/uc2-beam/src/main/resources/META-INF/application.properties b/theodolite-benchmarks/uc2-beam/src/main/resources/META-INF/application.properties
index c6672125a8b6a074cb7eca31bd90700cd4da736a..557689f074683353550363d628382d5f4acf096a 100644
--- a/theodolite-benchmarks/uc2-beam/src/main/resources/META-INF/application.properties
+++ b/theodolite-benchmarks/uc2-beam/src/main/resources/META-INF/application.properties
@@ -8,11 +8,9 @@ kafka.window.duration.minutes=1
 
 schema.registry.url=http://localhost:8081
 
-num.threads=1
-commit.interval.ms=1000
-cache.max.bytes.buffering=-1
-
 specific.avro.reader=true
+
+# Kafka Settings
 enable.auto.commit=true
 max.poll.records=500
-auto.offset.reset=earliest
\ No newline at end of file
+auto.offset.reset=earliest
diff --git a/theodolite-benchmarks/uc2-flink/src/main/resources/META-INF/application.properties b/theodolite-benchmarks/uc2-flink/src/main/resources/META-INF/application.properties
index f971390984ee41be1fce54e62f4f43ee2b9c02da..3e8b8e08eacb61a92bc40d16d0c30a65bd1161f8 100644
--- a/theodolite-benchmarks/uc2-flink/src/main/resources/META-INF/application.properties
+++ b/theodolite-benchmarks/uc2-flink/src/main/resources/META-INF/application.properties
@@ -5,7 +5,8 @@ kafka.bootstrap.servers=localhost:9092
 kafka.input.topic=input
 kafka.output.topic=output
 schema.registry.url=http://localhost:8081
-num.threads=1
-commit.interval.ms=100
-cache.max.bytes.buffering=-1
-kafka.window.duration.minutes=1
\ No newline at end of file
+
+kafka.window.duration.minutes=1
+
+# Flink configuration
+checkpointing.interval.ms=100
diff --git a/theodolite-benchmarks/uc2-kstreams/src/main/resources/META-INF/application.properties b/theodolite-benchmarks/uc2-kstreams/src/main/resources/META-INF/application.properties
index 1b59528db59653d8dc0c2a04d242a0cd39fe07da..7765cbff37fd8e72029d933c22c7891b94a7b87c 100644
--- a/theodolite-benchmarks/uc2-kstreams/src/main/resources/META-INF/application.properties
+++ b/theodolite-benchmarks/uc2-kstreams/src/main/resources/META-INF/application.properties
@@ -7,3 +7,6 @@ kafka.output.topic=output
 kafka.window.duration.minutes=1
 
 schema.registry.url=http://localhost:8081
+
+# Kafka Streams Config
+commit.interval.ms=5000	
diff --git a/theodolite-benchmarks/uc3-beam/src/main/resources/META-INF/application.properties b/theodolite-benchmarks/uc3-beam/src/main/resources/META-INF/application.properties
index 1c41e150066b71fca274eee0c5b684601cc744cf..fdb700fd9daf7d5e8b5260fa6c9c8810bca39eb5 100644
--- a/theodolite-benchmarks/uc3-beam/src/main/resources/META-INF/application.properties
+++ b/theodolite-benchmarks/uc3-beam/src/main/resources/META-INF/application.properties
@@ -14,11 +14,9 @@ aggregation.advance.days=1
 # in seconds
 trigger.interval=15
 
-num.threads=1
-commit.interval.ms=1000
-cache.max.bytes.buffering=-1
-
 specific.avro.reader=true
+
+# Kafka Settings
 enable.auto.commit=true
 max.poll.records=500
-auto.offset.reset=earliest
\ No newline at end of file
+auto.offset.reset=earliest
diff --git a/theodolite-benchmarks/uc3-flink/src/main/resources/META-INF/application.properties b/theodolite-benchmarks/uc3-flink/src/main/resources/META-INF/application.properties
index 4423cd38c867a50f758437aa8eac8b12c7f10e62..24fb0b0b7044df51e44a7291dfc53ced89008e5f 100644
--- a/theodolite-benchmarks/uc3-flink/src/main/resources/META-INF/application.properties
+++ b/theodolite-benchmarks/uc3-flink/src/main/resources/META-INF/application.properties
@@ -8,7 +8,8 @@ schema.registry.url=http://localhost:8081
 aggregation.duration.days=30
 aggregation.advance.days=1
 aggregation.trigger.interval.seconds=15
-num.threads=1
-commit.interval.ms=100
-cache.max.bytes.buffering=-1
-time.zone=Europe/Paris
\ No newline at end of file
+
+time.zone=Europe/Paris
+
+# Flink configuration
+checkpointing.interval.ms=1000
diff --git a/theodolite-benchmarks/uc3-kstreams/src/main/resources/META-INF/application.properties b/theodolite-benchmarks/uc3-kstreams/src/main/resources/META-INF/application.properties
index 0ce745fb61f87016aee5cc242c03069924ceb58e..8189f7568a64cf645375bc6fc2c1323b66d85d75 100644
--- a/theodolite-benchmarks/uc3-kstreams/src/main/resources/META-INF/application.properties
+++ b/theodolite-benchmarks/uc3-kstreams/src/main/resources/META-INF/application.properties
@@ -8,3 +8,6 @@ aggregation.duration.days=30
 aggregation.advance.days=1
 
 schema.registry.url=http://localhost:8081
+
+# Kafka Streams Config
+commit.interval.ms=5000	
diff --git a/theodolite-benchmarks/uc4-beam/src/main/resources/META-INF/application.properties b/theodolite-benchmarks/uc4-beam/src/main/resources/META-INF/application.properties
index c1a8ca17b41ab8c8f0fa939c748200db5ba7d0d2..547b92a3a19dda930e582878752c4eeaacee6a04 100644
--- a/theodolite-benchmarks/uc4-beam/src/main/resources/META-INF/application.properties
+++ b/theodolite-benchmarks/uc4-beam/src/main/resources/META-INF/application.properties
@@ -16,11 +16,9 @@ aggregation.advance.days=1
 trigger.interval=15
 grace.period.ms=270
 
-num.threads=1
-commit.interval.ms=1000
-cache.max.bytes.buffering=-1
-
 specific.avro.reader=true
+
+# Kafka Settings
 enable.auto.commit=true
 max.poll.records=500
-auto.offset.reset=earliest
\ No newline at end of file
+auto.offset.reset=earliest
diff --git a/theodolite-benchmarks/uc4-flink/src/main/resources/META-INF/application.properties b/theodolite-benchmarks/uc4-flink/src/main/resources/META-INF/application.properties
index de85fdb88c0462edc9fba58409918470fcb8cb6c..f48b6c6ef1ae747474da54cc43e0c88207f7464e 100644
--- a/theodolite-benchmarks/uc4-flink/src/main/resources/META-INF/application.properties
+++ b/theodolite-benchmarks/uc4-flink/src/main/resources/META-INF/application.properties
@@ -11,6 +11,6 @@ kafka.output.topic=output
 schema.registry.url=http://localhost:8081
 window.size.ms=1000
 window.grace.ms=0
-num.threads=1
-commit.interval.ms=1000
-cache.max.bytes.buffering=-1
+
+# Flink configuration
+checkpointing.interval.ms=1000
diff --git a/theodolite-benchmarks/uc4-kstreams/src/main/resources/META-INF/application.properties b/theodolite-benchmarks/uc4-kstreams/src/main/resources/META-INF/application.properties
index a21f7e917e3ce4a0762261ca90444613c82ab650..8a1d86ae3ecc419badae62d62c102ec8fafb4730 100644
--- a/theodolite-benchmarks/uc4-kstreams/src/main/resources/META-INF/application.properties
+++ b/theodolite-benchmarks/uc4-kstreams/src/main/resources/META-INF/application.properties
@@ -10,4 +10,7 @@ kafka.output.topic=output
 schema.registry.url=http://localhost:8081
 
 emit.period.ms=5000
-grace.period.ms=0
\ No newline at end of file
+grace.period.ms=0
+
+# Kafka Streams Config
+commit.interval.ms=5000	
diff --git a/theodolite/src/test/resources/cpu-deployment.yaml b/theodolite/src/test/resources/cpu-deployment.yaml
index 9845648949babd260192e6c6fa652db976c04288..4ed00ba8b7b0c11481379c259b9b3a26e8eedef8 100644
--- a/theodolite/src/test/resources/cpu-deployment.yaml
+++ b/theodolite/src/test/resources/cpu-deployment.yaml
@@ -26,8 +26,6 @@ spec:
               value: "http://my-confluent-cp-schema-registry:8081"
             - name: JAVA_OPTS
               value: "-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.port=5555"
-            - name: COMMIT_INTERVAL_MS # Set as default for the applications
-              value: "100"
           resources:
             limits:
               cpu: 1000m
diff --git a/theodolite/src/test/resources/cpu-memory-deployment.yaml b/theodolite/src/test/resources/cpu-memory-deployment.yaml
index eaae989abb1f3b4fa44f032eee700181fb75e48e..c6231f3508b6fa580f70f33a39f1afab55072866 100644
--- a/theodolite/src/test/resources/cpu-memory-deployment.yaml
+++ b/theodolite/src/test/resources/cpu-memory-deployment.yaml
@@ -26,8 +26,6 @@ spec:
               value: "http://my-confluent-cp-schema-registry:8081"
             - name: JAVA_OPTS
               value: "-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.port=5555"
-            - name: COMMIT_INTERVAL_MS # Set as default for the applications
-              value: "100"
           resources:
             limits:
               memory: 4Gi
diff --git a/theodolite/src/test/resources/memory-deployment.yaml b/theodolite/src/test/resources/memory-deployment.yaml
index 7af278b8c6b2efd13adbcc77e2db5a7b4c4478ad..57283feabb3613d5f248bb8a91c42a3e38b6aa82 100644
--- a/theodolite/src/test/resources/memory-deployment.yaml
+++ b/theodolite/src/test/resources/memory-deployment.yaml
@@ -26,8 +26,6 @@ spec:
               value: "http://my-confluent-cp-schema-registry:8081"
             - name: JAVA_OPTS
               value: "-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.port=5555"
-            - name: COMMIT_INTERVAL_MS # Set as default for the applications
-              value: "100"
           resources:
             limits:
               memory: 4Gi
diff --git a/theodolite/src/test/resources/no-resources-deployment.yaml b/theodolite/src/test/resources/no-resources-deployment.yaml
index 0687a3e042575951ec903492589101c122406f7f..1ace4851ef731758b1edf445077e295684bccdc0 100644
--- a/theodolite/src/test/resources/no-resources-deployment.yaml
+++ b/theodolite/src/test/resources/no-resources-deployment.yaml
@@ -26,8 +26,6 @@ spec:
               value: "http://my-confluent-cp-schema-registry:8081"
             - name: JAVA_OPTS
               value: "-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.port=5555"
-            - name: COMMIT_INTERVAL_MS # Set as default for the applications
-              value: "100"
         - name: prometheus-jmx-exporter
           image: "solsson/kafka-prometheus-jmx-exporter@sha256:6f82e2b0464f50da8104acd7363fb9b995001ddff77d248379f8788e78946143"
           command: