diff --git a/helm/values.yaml b/helm/values.yaml
index e06537842039bc655af1f842f5ac6b03806de3d3..6f6faeb95b828e71e9f645904c02a8b47393b2a9 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -252,38 +252,46 @@ operator:
       uc1LoadGenerator: true
       uc1Kstreams: true
       uc1Flink: true
+      uc1Hazelcast: true
       uc1BeamFlink: true
       uc1BeamSamza: true
       uc2LoadGenerator: true
       uc2Kstreams: true
       uc2Flink: true
+      uc2Hazelcast: true
       uc2BeamFlink: true
       uc2BeamSamza: true
       uc3LoadGenerator: true
       uc3Kstreams: true
       uc3Flink: true
+      uc3Hazelcast: true
       uc3BeamFlink: true
       uc3BeamSamza: true
       uc4LoadGenerator: true
       uc4Kstreams: true
       uc4Flink: true
+      uc4Hazelcast: true
       uc4BeamFlink: true
       uc4BeamSamza: true
     benchmarks:
       uc1Kstreams: true
       uc1Flink: true
+      uc1Hazelcast: true
       uc1BeamFlink: true
       uc1BeamSamza: true
       uc2Kstreams: true
       uc2Flink: true
+      uc2Hazelcast: true
       uc2BeamFlink: true
       uc2BeamSamza: true
       uc3Kstreams: true
       uc3Flink: true
+      uc3Hazelcast: true
       uc3BeamFlink: true
       uc3BeamSamza: true
       uc4Kstreams: true
       uc4Flink: true
+      uc4Hazelcast: true
       uc4BeamFlink: true
       uc4BeamSamza: true
 
diff --git a/theodolite-benchmarks/definitions/install-configmaps.sh b/theodolite-benchmarks/definitions/install-configmaps.sh
index e6630ca08154631a395c151fac376859fc885495..a1bbb2c60f0b74eb31ac36628de92174ed1ac910 100755
--- a/theodolite-benchmarks/definitions/install-configmaps.sh
+++ b/theodolite-benchmarks/definitions/install-configmaps.sh
@@ -4,6 +4,7 @@ kubectl create configmap benchmark-resources-uc2-flink --from-file uc2-flink/res
 kubectl create configmap benchmark-resources-uc3-flink --from-file uc3-flink/resources
 kubectl create configmap benchmark-resources-uc4-flink --from-file uc4-flink/resources
 
+# Hazelcast Jet
 kubectl create configmap benchmark-resources-uc1-hazelcastjet --from-file uc1-hazelcastjet/resources
 kubectl create configmap benchmark-resources-uc2-hazelcastjet --from-file uc2-hazelcastjet/resources
 kubectl create configmap benchmark-resources-uc3-hazelcastjet --from-file uc3-hazelcastjet/resources
diff --git a/theodolite-benchmarks/definitions/uc1-hazelcastjet/uc1-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc1-hazelcastjet/uc1-hazelcastjet-benchmark-operator.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc1-hazelcastjet/uc1-benchmark-operator.yaml
rename to theodolite-benchmarks/definitions/uc1-hazelcastjet/uc1-hazelcastjet-benchmark-operator.yaml
diff --git a/theodolite-benchmarks/definitions/uc2-hazelcastjet/uc2-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc2-hazelcastjet/uc2-hazelcastjet-benchmark-operator.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc2-hazelcastjet/uc2-benchmark-operator.yaml
rename to theodolite-benchmarks/definitions/uc2-hazelcastjet/uc2-hazelcastjet-benchmark-operator.yaml
diff --git a/theodolite-benchmarks/definitions/uc3-hazelcastjet/uc3-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc3-hazelcastjet/uc3-hazelcastjet-benchmark-operator.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc3-hazelcastjet/uc3-benchmark-operator.yaml
rename to theodolite-benchmarks/definitions/uc3-hazelcastjet/uc3-hazelcastjet-benchmark-operator.yaml
diff --git a/theodolite-benchmarks/definitions/uc4-hazelcastjet/uc4-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc4-hazelcastjet/uc4-hazelcastjet-benchmark-operator.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc4-hazelcastjet/uc4-benchmark-operator.yaml
rename to theodolite-benchmarks/definitions/uc4-hazelcastjet/uc4-hazelcastjet-benchmark-operator.yaml