diff --git a/GEOSagcm_GridComp/GEOShs_GridComp/regression/held-suarez/cap.yaml b/GEOSagcm_GridComp/GEOShs_GridComp/regression/held-suarez/cap.yaml
deleted file mode 100644
index 6a7969276..000000000
--- a/GEOSagcm_GridComp/GEOShs_GridComp/regression/held-suarez/cap.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
----
-cap:
-  name: CAP
-  restart: cap_restart.yaml
-
-  clock:
-    dt: PT30M
-    start: 1891-03-01T00:00:00
-    stop: 2999-03-02T21:00:00
-    segment_duration: PT1H # PT1H, P1D etc.
-
-  run_extdata: false
-  run_history: true
-  history_name: History
-  root_name: AGCM
-
-  mapl:
-    setServices:
-      sharedObj: libMAPL.cap
-
-    children:
-      History:
-        dso: libMAPL.history
-        config_file: history.yaml
-      AGCM:
-        dso: libGEOSagcm_GridComp.so
-        config_file: agcm-simple.yaml
-
-  checkpointing:
-    enabled: true
-    final: true
-    path: checkpoints
-
-esmf:
-  logKindFlag: ESMF_LOGKIND_MULTI_ON_ERROR
-  logAppendFlag: false
-
-mapl:
-  model_petcount: 6
diff --git a/GEOSagcm_GridComp/GEOShs_GridComp/regression/held-suarez/cap_driver.yaml b/GEOSagcm_GridComp/GEOShs_GridComp/regression/held-suarez/cap_driver.yaml
new file mode 100644
index 000000000..188662de5
--- /dev/null
+++ b/GEOSagcm_GridComp/GEOShs_GridComp/regression/held-suarez/cap_driver.yaml
@@ -0,0 +1,14 @@
+cap_gridcomp_config: cap_gridcomp.yaml
+name: CAP
+restart: cap_restart.yaml
+
+clock:
+  dt: PT30M
+  start: 1891-03-01T00:00:00
+  stop: 2999-03-02T21:00:00
+  segment_duration: PT1H # PT1H, P1D etc.
+
+checkpointing:
+  enabled: true
+  final: true
+  path: checkpoints
diff --git a/GEOSagcm_GridComp/GEOShs_GridComp/regression/held-suarez/cap_gridcomp.yaml b/GEOSagcm_GridComp/GEOShs_GridComp/regression/held-suarez/cap_gridcomp.yaml
new file mode 100644
index 000000000..a3bf74a26
--- /dev/null
+++ b/GEOSagcm_GridComp/GEOShs_GridComp/regression/held-suarez/cap_gridcomp.yaml
@@ -0,0 +1,15 @@
+run_extdata: false
+run_history: true
+history_name: History
+root_name: AGCM
+
+mapl:
+  setServices:
+    sharedObj: libMAPL.cap
+  children:
+    History:
+      dso: libMAPL.history
+      config_file: history.yaml
+    AGCM:
+      dso: libGEOSagcm_GridComp.so
+      config_file: agcm-simple.yaml
diff --git a/GEOSagcm_GridComp/GEOShs_GridComp/regression/held-suarez/mapl.yaml b/GEOSagcm_GridComp/GEOShs_GridComp/regression/held-suarez/mapl.yaml
new file mode 100644
index 000000000..e426281c6
--- /dev/null
+++ b/GEOSagcm_GridComp/GEOShs_GridComp/regression/held-suarez/mapl.yaml
@@ -0,0 +1,8 @@
+app:
+  config: cap_driver.yaml
+
+esmf:
+  logKindFlag: ESMF_LOGKIND_MULTI_ON_ERROR
+  logAppendFlag: false
+
+app_petcount: 6