diff --git a/benchmarks/cloudmask/target/greene_v0.5/config-greene.in.yaml b/benchmarks/cloudmask/target/greene_v0.5/config-greene.in.yaml
index 7ede49e2..465d01a4 100644
--- a/benchmarks/cloudmask/target/greene_v0.5/config-greene.in.yaml
+++ b/benchmarks/cloudmask/target/greene_v0.5/config-greene.in.yaml
@@ -95,19 +95,14 @@ training:
   loss: binary_crossentropy
   metrics: accuracy
 
-# Training data
-#train_dir: "/scratch/{os.USER}/data/cloudmask/data/one-day"
-# Inference data
-#  inference_dir: "/scratch/{os.USER}/data/cloudmask/data/ssts"
-  # Output directory
 output:
   output_dir: "."
   # Model file
-  model_file: "{output_dir}/cloudModel-{identifier}.h5"
+  model_file: "./cloudModel.h5"
   # Log file for recording runtimes
-  log_file: "{output_dir}/cloudmask_final_{identifier}.log"
+  log_file: "./cloudmask_final.log"
   # Log file for MLCommons logging
-  mlperf_logfile: "{output_dir}/mlperf_cloudmask_final_{identifier}.log"
+  mlperf_logfile: "./mlperf_cloudmask_final.log"
 
 
 data:
diff --git a/benchmarks/cloudmask/target/greene_v0.5/config-rivanna-test.in.yaml b/benchmarks/cloudmask/target/greene_v0.5/config-rivanna-test.in.yaml
index 33eb55be..c5c1db5a 100644
--- a/benchmarks/cloudmask/target/greene_v0.5/config-rivanna-test.in.yaml
+++ b/benchmarks/cloudmask/target/greene_v0.5/config-rivanna-test.in.yaml
@@ -95,19 +95,14 @@ training:
   loss: binary_crossentropy
   metrics: accuracy
 
-# Training data
-#train_dir: "/scratch/{os.USER}/data/cloudmask/data/one-day"
-# Inference data
-#  inference_dir: "/scratch/{os.USER}/data/cloudmask/data/ssts"
-  # Output directory
 output:
   output_dir: "."
   # Model file
-  model_file: "{output_dir}/cloudModel-{identifier}.h5"
+  model_file: "./cloudModel.h5"
   # Log file for recording runtimes
-  log_file: "{output_dir}/cloudmask_final_{identifier}.log"
+  log_file: "./cloudmask_final.log"
   # Log file for MLCommons logging
-  mlperf_logfile: "{output_dir}/mlperf_cloudmask_final_{identifier}.log"
+  mlperf_logfile: "./mlperf_cloudmask_final.log"
 
 data:
 # scratch: "/project/bii_dsc_community/mlcommons/data/cloudmask"
diff --git a/benchmarks/cloudmask/target/greene_v0.5/config-rivanna.in.yaml b/benchmarks/cloudmask/target/greene_v0.5/config-rivanna.in.yaml
index 77d796d9..4fa6dace 100644
--- a/benchmarks/cloudmask/target/greene_v0.5/config-rivanna.in.yaml
+++ b/benchmarks/cloudmask/target/greene_v0.5/config-rivanna.in.yaml
@@ -96,13 +96,8 @@ training:
   loss: binary_crossentropy
   metrics: accuracy
 
-# Training data
-#train_dir: "/scratch/{os.USER}/data/cloudmask/data/one-day"
-# Inference data
-#  inference_dir: "/scratch/{os.USER}/data/cloudmask/data/ssts"
-  # Output directory
 output:
-  directory: "."
+  output_dir: "."
   # Model file
   model_file: "./cloudModel.h5"
   # Log file for recording runtimes