diff --git a/regression/README.md b/regression/README.md
index 7c339143..0c8d5d3f 100644
--- a/regression/README.md
+++ b/regression/README.md
@@ -19,8 +19,8 @@ This directory contains CTest-based regression cases for
 
 Coupled advection + dynamics test.
 
-Key files:
-- `cap.yaml`, `cap_restart.yaml`
+ Key files:
+- `mapl.yaml`, `cap_driver.yaml`, `cap_gridcomp.yaml`, `cap_restart.yaml`
 - `root.yaml`
 - `dyn.yaml`, `adv.yaml`
 - `data-moist.yaml` — `DataMoist` component; owns `Q`, that is advected by DYN
@@ -32,8 +32,8 @@ Key files:
 
 Held-Suarez style standalone dynamics test.
 
-Key files:
-- `cap.yaml`, `cap_restart.yaml`
+ Key files:
+- `mapl.yaml`, `cap_driver.yaml`, `cap_gridcomp.yaml`, `cap_restart.yaml`
 - `root.yaml`
 - `dyn-sa.yaml`
 - `data-moist.yaml`
diff --git a/regression/adv-dyn/cap.yaml b/regression/adv-dyn/cap.yaml
deleted file mode 100644
index 31e3f091..00000000
--- a/regression/adv-dyn/cap.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
----
-cap:
-  name: CAP
-  restart: cap_restart.yaml
-
-  clock:
-    dt: PT1800S
-    start: 1891-03-01T00:00:00
-    stop: 2999-03-11T00:00:00
-    segment_duration: PT1H  # P1DT
-
-  run_extdata: false
-  run_history: true
-  history_name: History
-  root_name: Root
-
-  mapl:
-
-    setServices:
-      sharedObj: libMAPL.cap
-
-    children:
-      Root:
-        config_file: root.yaml
-        dso: libconfigurable_gridcomp
-
-      History:
-        config_file: history.yaml
-        dso: libMAPL.history
-
-  checkpointing:
-    enabled: true
-    final: true
-    path: checkpoints
-
-esmf:
-  logKindFlag: ESMF_LOGKIND_MULTI_ON_ERROR
-  logAppendFlag: false
-
-mapl:
-  model_petcount: 6
diff --git a/regression/adv-dyn/cap_driver.yaml b/regression/adv-dyn/cap_driver.yaml
new file mode 100644
index 00000000..3b2a3819
--- /dev/null
+++ b/regression/adv-dyn/cap_driver.yaml
@@ -0,0 +1,14 @@
+cap_gridcomp_config: cap_gridcomp.yaml
+name: CAP
+restart: cap_restart.yaml
+
+clock:
+  dt: PT1800S
+  start: 1891-03-01T00:00:00
+  stop: 2999-03-11T00:00:00
+  segment_duration: PT1H  # P1DT
+
+checkpointing:
+  enabled: true
+  final: true
+  path: checkpoints
diff --git a/regression/adv-dyn/cap_gridcomp.yaml b/regression/adv-dyn/cap_gridcomp.yaml
new file mode 100644
index 00000000..371dbe55
--- /dev/null
+++ b/regression/adv-dyn/cap_gridcomp.yaml
@@ -0,0 +1,15 @@
+run_extdata: false
+run_history: true
+history_name: History
+root_name: Root
+
+mapl:
+  setServices:
+    sharedObj: libMAPL.cap
+  children:
+    Root:
+      config_file: root.yaml
+      dso: libconfigurable_gridcomp
+    History:
+      config_file: history.yaml
+      dso: libMAPL.history
diff --git a/regression/adv-dyn/mapl.yaml b/regression/adv-dyn/mapl.yaml
new file mode 100644
index 00000000..e426281c
--- /dev/null
+++ b/regression/adv-dyn/mapl.yaml
@@ -0,0 +1,8 @@
+app:
+  config: cap_driver.yaml
+
+esmf:
+  logKindFlag: ESMF_LOGKIND_MULTI_ON_ERROR
+  logAppendFlag: false
+
+app_petcount: 6
diff --git a/regression/dyn-sa/cap.yaml b/regression/dyn-sa/cap.yaml
deleted file mode 100644
index a478e500..00000000
--- a/regression/dyn-sa/cap.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
----
-cap:
-  name: CAP
-  restart: cap_restart.yaml
-
-  clock:
-    dt: PT1200S
-    start: 1891-03-01T00:00:00
-    stop: 2999-03-11T00:00:00
-    segment_duration: PT1H  # P1DT
-
-  run_extdata: false
-  run_history: true
-  history_name: History
-  root_name: Root
-
-  mapl:
-
-    setServices:
-      sharedObj: libMAPL.cap
-
-    children:
-      Root:
-        dso: libconfigurable_gridcomp
-        config_file: root.yaml
-      History:
-        dso: libMAPL.history
-        config_file: history.yaml
-
-  checkpointing:
-    enabled: true
-    final: true
-    path: checkpoints
-
-esmf:
-  logKindFlag: ESMF_LOGKIND_MULTI_ON_ERROR
-  logAppendFlag: false
-
-mapl:
-  model_petcount: 6
diff --git a/regression/dyn-sa/cap_driver.yaml b/regression/dyn-sa/cap_driver.yaml
new file mode 100644
index 00000000..c5062b0b
--- /dev/null
+++ b/regression/dyn-sa/cap_driver.yaml
@@ -0,0 +1,14 @@
+cap_gridcomp_config: cap_gridcomp.yaml
+name: CAP
+restart: cap_restart.yaml
+
+clock:
+  dt: PT1200S
+  start: 1891-03-01T00:00:00
+  stop: 2999-03-11T00:00:00
+  segment_duration: PT1H  # P1DT
+
+checkpointing:
+  enabled: true
+  final: true
+  path: checkpoints
diff --git a/regression/dyn-sa/cap_gridcomp.yaml b/regression/dyn-sa/cap_gridcomp.yaml
new file mode 100644
index 00000000..a3a969d5
--- /dev/null
+++ b/regression/dyn-sa/cap_gridcomp.yaml
@@ -0,0 +1,15 @@
+run_extdata: false
+run_history: true
+history_name: History
+root_name: Root
+
+mapl:
+  setServices:
+    sharedObj: libMAPL.cap
+  children:
+    Root:
+      dso: libconfigurable_gridcomp
+      config_file: root.yaml
+    History:
+      dso: libMAPL.history
+      config_file: history.yaml
diff --git a/regression/dyn-sa/mapl.yaml b/regression/dyn-sa/mapl.yaml
new file mode 100644
index 00000000..e426281c
--- /dev/null
+++ b/regression/dyn-sa/mapl.yaml
@@ -0,0 +1,8 @@
+app:
+  config: cap_driver.yaml
+
+esmf:
+  logKindFlag: ESMF_LOGKIND_MULTI_ON_ERROR
+  logAppendFlag: false
+
+app_petcount: 6