diff --git a/openfl-workspace/torch_cnn_mnist_fed_eval/plan/plan.yaml b/openfl-workspace/torch_cnn_mnist_fed_eval/plan/plan.yaml
index 2eca7b67c41..02db7dff3e9 100644
--- a/openfl-workspace/torch_cnn_mnist_fed_eval/plan/plan.yaml
+++ b/openfl-workspace/torch_cnn_mnist_fed_eval/plan/plan.yaml
@@ -2,15 +2,12 @@
 # Licensed subject to the terms of the separately executed evaluation license agreement between Intel Corporation and you.
 
 aggregator :
-  defaults : plan/defaults/aggregator.yaml
+  defaults : plan/defaults/federated-evaluation/aggregator.yaml
   template : openfl.component.Aggregator
   settings :
     init_state_path     : save/torch_cnn_mnist_init.pbuf
     best_state_path     : save/torch_cnn_mnist_best.pbuf
     last_state_path     : save/torch_cnn_mnist_last.pbuf
-    ######### SET ROUNDS TO 1 #############
-    rounds_to_train     : 1
-    #######################################
     log_metric_callback :
       template : src.mnist_utils.write_metric
 
@@ -37,25 +34,10 @@ network :
   defaults : plan/defaults/network.yaml
 
 assigner :
-  ######### SET ASSIGNER TO ONLY INCLUDE AGGREGATED MODEL VALIDATION #############
-  template : openfl.component.RandomGroupedAssigner
-  settings :
-    task_groups  :
-      - name       : validate
-        percentage : 1.0
-        tasks      :
-          - aggregated_model_validation
-  ################################################################################
+  defaults : plan/defaults/federated-evaluation/assigner.yaml
   
 tasks :
-  ######### SET AGGREGATED MODEL VALIDATION AS ONLY TASK #############
-  aggregated_model_validation:
-    function : validate
-    kwargs   :
-      apply   : global
-      metrics :
-        - acc
-  ####################################################################
+  defaults : plan/defaults/federated-evaluation/tasks_torch.yaml
 
 compression_pipeline :
   defaults : plan/defaults/compression_pipeline.yaml
diff --git a/openfl-workspace/workspace/plan/defaults/federated-evaluation/aggregator.yaml b/openfl-workspace/workspace/plan/defaults/federated-evaluation/aggregator.yaml
new file mode 100644
index 00000000000..df6fbcfdd64
--- /dev/null
+++ b/openfl-workspace/workspace/plan/defaults/federated-evaluation/aggregator.yaml
@@ -0,0 +1,7 @@
+template : openfl.component.Aggregator
+settings :
+    db_store_rounds : 2
+    write_logs      : true
+    ######### Default rounds to 1 for evaluation #############
+    rounds_to_train     : 1
+    ##########################################################
diff --git a/openfl-workspace/workspace/plan/defaults/federated-evaluation/assigner.yaml b/openfl-workspace/workspace/plan/defaults/federated-evaluation/assigner.yaml
new file mode 100644
index 00000000000..9d583fa0c48
--- /dev/null
+++ b/openfl-workspace/workspace/plan/defaults/federated-evaluation/assigner.yaml
@@ -0,0 +1,7 @@
+template : openfl.component.RandomGroupedAssigner
+settings :
+  task_groups  :
+    - name       : validate
+      percentage : 1.0
+      tasks      :
+        - aggregated_model_validation
\ No newline at end of file
diff --git a/openfl-workspace/workspace/plan/defaults/federated-evaluation/tasks_torch.yaml b/openfl-workspace/workspace/plan/defaults/federated-evaluation/tasks_torch.yaml
new file mode 100644
index 00000000000..f497ca845ce
--- /dev/null
+++ b/openfl-workspace/workspace/plan/defaults/federated-evaluation/tasks_torch.yaml
@@ -0,0 +1,7 @@
+aggregated_model_validation:
+  function : validate_task
+  kwargs   :
+    apply   : global
+    metrics :
+      - acc
+  
\ No newline at end of file