diff --git a/theodolite-benchmarks/uc1-hazelcastjet/src/main/java/theodolite/uc1/application/Uc1KafkaPropertiesBuilder.java b/theodolite-benchmarks/uc1-hazelcastjet/src/main/java/theodolite/uc1/application/Uc1KafkaPropertiesBuilder.java
index 3cf7aafc61fe73e19d1e52f1cdca9f95620a79b8..750dc3453a8583c78a3f31dfbf19f9923e28dd19 100644
--- a/theodolite-benchmarks/uc1-hazelcastjet/src/main/java/theodolite/uc1/application/Uc1KafkaPropertiesBuilder.java
+++ b/theodolite-benchmarks/uc1-hazelcastjet/src/main/java/theodolite/uc1/application/Uc1KafkaPropertiesBuilder.java
@@ -13,6 +13,8 @@ import theodolite.commons.hazelcastjet.ConfigurationKeys;
  */
 public class Uc1KafkaPropertiesBuilder {
 
+  private static final String TRUE = "true";
+
   /**
    * Builds Kafka Properties used for the UC1 Benchmark pipeline.
    *
@@ -42,7 +44,7 @@ public class Uc1KafkaPropertiesBuilder {
     props.setProperty(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG,
         KafkaAvroDeserializer.class.getCanonicalName());
     props.setProperty(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
-    props.put("specific.avro.reader", true);
+    props.setProperty("specific.avro.reader", TRUE);
 
 
     return props;
diff --git a/theodolite-benchmarks/uc2-hazelcastjet/src/main/java/theodolite/uc2/application/Uc2KafkaPropertiesBuilder.java b/theodolite-benchmarks/uc2-hazelcastjet/src/main/java/theodolite/uc2/application/Uc2KafkaPropertiesBuilder.java
index db5499536f23129a160a4c7ed433aafc7f67d704..8a990306627be88ba7a291d86faccc878f463a4d 100644
--- a/theodolite-benchmarks/uc2-hazelcastjet/src/main/java/theodolite/uc2/application/Uc2KafkaPropertiesBuilder.java
+++ b/theodolite-benchmarks/uc2-hazelcastjet/src/main/java/theodolite/uc2/application/Uc2KafkaPropertiesBuilder.java
@@ -14,6 +14,8 @@ import theodolite.commons.hazelcastjet.ConfigurationKeys;
  */
 public class Uc2KafkaPropertiesBuilder {
 
+  private static final String TRUE = "true";
+
   /**
    * Builds Kafka Properties used for the UC2 Benchmark pipeline.
    *
@@ -41,7 +43,7 @@ public class Uc2KafkaPropertiesBuilder {
         StringDeserializer.class.getCanonicalName());
     props.setProperty(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG,
         KafkaAvroDeserializer.class.getCanonicalName());
-    props.put("specific.avro.reader", true);
+    props.setProperty("specific.avro.reader", TRUE);
     props.setProperty("schema.registry.url", schemaRegistryUrl);
     props.setProperty(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "latest");
     return props;
diff --git a/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/theodolite/uc3/application/Uc3KafkaPropertiesBuilder.java b/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/theodolite/uc3/application/Uc3KafkaPropertiesBuilder.java
index 25aecb2e2ca21152e3ba9f0887978b2a9c7f496a..e2cf9b53f4215047431edae8041e4267c7a2ae39 100644
--- a/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/theodolite/uc3/application/Uc3KafkaPropertiesBuilder.java
+++ b/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/theodolite/uc3/application/Uc3KafkaPropertiesBuilder.java
@@ -15,6 +15,8 @@ import theodolite.commons.hazelcastjet.ConfigurationKeys;
  */
 public class Uc3KafkaPropertiesBuilder {
 
+  private static final String TRUE = "true";
+
   /**
    * Builds Kafka Properties used for the UC3 Benchmark pipeline.
    *
@@ -39,7 +41,7 @@ public class Uc3KafkaPropertiesBuilder {
         StringDeserializer.class.getCanonicalName());
     props.setProperty(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG,
         KafkaAvroDeserializer.class.getCanonicalName());
-    props.put("specific.avro.reader", true);
+    props.setProperty("specific.avro.reader", TRUE);
     props.setProperty("schema.registry.url", schemaRegistryUrl);
     props.setProperty(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
     return props;
diff --git a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/Uc4KafkaPropertiesBuilder.java b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/Uc4KafkaPropertiesBuilder.java
index 9f533387a65159d6bcede884a727c08d887be01e..fe58073734dd2aacd0f21bb7125d3e7b5b898d46 100644
--- a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/Uc4KafkaPropertiesBuilder.java
+++ b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/Uc4KafkaPropertiesBuilder.java
@@ -19,6 +19,7 @@ public class Uc4KafkaPropertiesBuilder {
 
   private static final String SPECIFIC_AVRO_READER_CONFIG = "specific.avro.reader";
   private static final String SCHEMA_REGISTRY_URL_CONFIG = "schema.registry.url";
+  private static final String TRUE = "true";
 
   /**
    * Builds Kafka Properties used for the UC4 Benchmark pipeline.
@@ -44,7 +45,7 @@ public class Uc4KafkaPropertiesBuilder {
         StringDeserializer.class.getCanonicalName());
     props.setProperty(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG,
         KafkaAvroDeserializer.class.getCanonicalName());
-    props.put(SPECIFIC_AVRO_READER_CONFIG, true);
+    props.setProperty(SPECIFIC_AVRO_READER_CONFIG, TRUE);
     props.setProperty(SCHEMA_REGISTRY_URL_CONFIG, schemaRegistryUrl);
     props.setProperty(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "latest");
     return props;
@@ -74,7 +75,7 @@ public class Uc4KafkaPropertiesBuilder {
         StringDeserializer.class.getCanonicalName());
     props.setProperty(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG,
         KafkaAvroDeserializer.class.getCanonicalName());
-    props.put(SPECIFIC_AVRO_READER_CONFIG, true);
+    props.setProperty(SPECIFIC_AVRO_READER_CONFIG, TRUE);
     props.setProperty(SCHEMA_REGISTRY_URL_CONFIG, schemaRegistryUrl);
 
     return props;
@@ -104,7 +105,7 @@ public class Uc4KafkaPropertiesBuilder {
         EventDeserializer.class.getCanonicalName());
     props.setProperty(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG,
         StringDeserializer.class.getCanonicalName());
-    props.put(SPECIFIC_AVRO_READER_CONFIG, true);
+    props.setProperty(SPECIFIC_AVRO_READER_CONFIG, TRUE);
     props.setProperty(SCHEMA_REGISTRY_URL_CONFIG, schemaRegistryUrl);
     props.setProperty(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
     return props;
@@ -128,13 +129,13 @@ public class Uc4KafkaPropertiesBuilder {
         schemaRegistryUrlDefault);
 
     final Properties props = new Properties();
-    props.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, kafkaBootstrapServers); // NOCS
-    props.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG,
+    props.setProperty(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, kafkaBootstrapServers); // NOCS
+    props.setProperty(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG,
         StringSerializer.class.getCanonicalName());
-    props.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG,
+    props.setProperty(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG,
         KafkaAvroSerializer.class.getCanonicalName());
-    props.put("specific.avro.writer", true);
-    props.put(SCHEMA_REGISTRY_URL_CONFIG, schemaRegistryUrl);
+    props.setProperty("specific.avro.writer", TRUE);
+    props.setProperty(SCHEMA_REGISTRY_URL_CONFIG, schemaRegistryUrl);
 
     return props;
   }