diff --git a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/EnvVarLoadGeneratorFactory.java b/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/EnvVarLoadGeneratorFactory.java
index d6f6707df5269c4f57eeef374e503a8ac102326c..3ced27377a0705de9a1d3f98b5cc2bc9fe92b573 100644
--- a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/EnvVarLoadGeneratorFactory.java
+++ b/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/EnvVarLoadGeneratorFactory.java
@@ -13,7 +13,7 @@ class EnvVarLoadGeneratorFactory {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(EnvVarLoadGeneratorFactory.class);
 
-  public LoadGenerator create() {
+  public LoadGenerator create(final LoadGenerator loadGeneratorTemplate) {
     final int numSensors = Integer.parseInt(Objects.requireNonNullElse(
         System.getenv(ConfigurationKeys.NUM_SENSORS),
         Integer.toString(LoadGenerator.NUMBER_OF_KEYS_DEFAULT)));
@@ -27,7 +27,7 @@ class EnvVarLoadGeneratorFactory {
         System.getenv(ConfigurationKeys.THREADS),
         Integer.toString(LoadGenerator.THREADS_DEFAULT)));
 
-    return LoadGenerator.fromDefaults()
+    return loadGeneratorTemplate
         .setClusterConfig(this.buildClusterConfig())
         .setLoadDefinition(new WorkloadDefinition(
             new KeySpace(LoadGenerator.SENSOR_PREFIX_DEFAULT, numSensors),
diff --git a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/LoadGenerator.java b/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/LoadGenerator.java
index 64a3e763c262e3300cefd9f7c81a9db5b251403b..1f02a0e0c910f7d1821c92a0fa71f6d08dbbf6ad 100644
--- a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/LoadGenerator.java
+++ b/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/LoadGenerator.java
@@ -102,7 +102,7 @@ public final class LoadGenerator {
    * Create a basic {@link LoadGenerator} from environment variables.
    */
   public static LoadGenerator fromEnvironment() {
-    return new EnvVarLoadGeneratorFactory().create();
+    return new EnvVarLoadGeneratorFactory().create(new LoadGenerator());
   }
 
 }