diff --git a/src/main/java/com/kamco/cd/training/postgres/repository/model/ModelMngRepositoryImpl.java b/src/main/java/com/kamco/cd/training/postgres/repository/model/ModelMngRepositoryImpl.java
index c83a4ef..547d837 100644
--- a/src/main/java/com/kamco/cd/training/postgres/repository/model/ModelMngRepositoryImpl.java
+++ b/src/main/java/com/kamco/cd/training/postgres/repository/model/ModelMngRepositoryImpl.java
@@ -135,7 +135,8 @@ public class ModelMngRepositoryImpl implements ModelMngRepositoryCustom {
                 modelHyperParamEntity.saturationRange,
                 modelHyperParamEntity.hueDelta,
                 Expressions.nullExpression(Integer.class),
-                Expressions.nullExpression(String.class)))
+                Expressions.nullExpression(String.class),
+                modelHyperParamEntity.uuid))
         .from(modelMasterEntity)
         .leftJoin(modelHyperParamEntity)
         .on(modelHyperParamEntity.id.eq(modelMasterEntity.hyperParamId))
diff --git a/src/main/java/com/kamco/cd/training/train/dto/TrainRunRequest.java b/src/main/java/com/kamco/cd/training/train/dto/TrainRunRequest.java
index 1e1974c..e294ce7 100644
--- a/src/main/java/com/kamco/cd/training/train/dto/TrainRunRequest.java
+++ b/src/main/java/com/kamco/cd/training/train/dto/TrainRunRequest.java
@@ -82,11 +82,17 @@ public class TrainRunRequest {
   private Integer timeoutSeconds;
   private String resumeFrom;
 
+  private UUID uuid;
+
   public String getDatasetFolder() {
-    return String.valueOf(datasetFolder);
+    return String.valueOf(this.datasetFolder);
   }
 
   public String getOutputFolder() {
-    return String.valueOf(outputFolder);
+    return String.valueOf(this.outputFolder);
+  }
+
+  public String getUuid() {
+    return String.valueOf(this.uuid);
   }
 }
diff --git a/src/main/java/com/kamco/cd/training/train/service/TestJobService.java b/src/main/java/com/kamco/cd/training/train/service/TestJobService.java
index e90cf1c..e7b5dfa 100644
--- a/src/main/java/com/kamco/cd/training/train/service/TestJobService.java
+++ b/src/main/java/com/kamco/cd/training/train/service/TestJobService.java
@@ -31,7 +31,7 @@ public class TestJobService {
 
     Map<String, Object> params = new java.util.LinkedHashMap<>();
     params.put("jobType", "EVAL");
-    params.put("uuid", uuid);
+    params.put("uuid", String.valueOf(uuid));
     params.put("epoch", epoch);
 
     int nextAttemptNo = modelTrainJobCoreService.findMaxAttemptNo(modelId) + 1;
diff --git a/src/main/java/com/kamco/cd/training/train/service/TrainJobService.java b/src/main/java/com/kamco/cd/training/train/service/TrainJobService.java
index a5816b5..189f0f9 100644
--- a/src/main/java/com/kamco/cd/training/train/service/TrainJobService.java
+++ b/src/main/java/com/kamco/cd/training/train/service/TrainJobService.java
@@ -57,6 +57,7 @@ public class TrainJobService {
     @SuppressWarnings("unchecked")
     Map<String, Object> paramsMap = objectMapper.convertValue(trainRunRequest, Map.class);
     paramsMap.put("jobType", "TRAIN");
+    paramsMap.put("uuid", trainRunRequest.getUuid());
 
     Long jobId =
         modelTrainJobCoreService.createQueuedJob(
diff --git a/src/main/java/com/kamco/cd/training/train/service/TrainJobWorker.java b/src/main/java/com/kamco/cd/training/train/service/TrainJobWorker.java
index 2e4a094..00f8cd5 100644
--- a/src/main/java/com/kamco/cd/training/train/service/TrainJobWorker.java
+++ b/src/main/java/com/kamco/cd/training/train/service/TrainJobWorker.java
@@ -47,7 +47,7 @@ public class TrainJobWorker {
 
     boolean isEval = "EVAL".equals(jobType);
 
-    String containerName = (isEval ? "eval-" : "train-") + jobId;
+    String containerName = (isEval ? "eval-" : "train-") + jobId + "-" + params.get("uuid");
 
     modelTrainJobCoreService.markRunning(jobId, containerName, null, "TRAIN_WORKER");