diff --git a/polaris/ocean/model/mpaso_to_omega.yaml b/polaris/ocean/model/mpaso_to_omega.yaml
index 60b17099a..b06adc440 100644
--- a/polaris/ocean/model/mpaso_to_omega.yaml
+++ b/polaris/ocean/model/mpaso_to_omega.yaml
@@ -23,7 +23,7 @@ variables:
   normalVelocity: NormalVelocity
 
   # auxiliary state
-  ssh: SshCell
+  ssh: SshCellDefault
 
 config:
 - section:
diff --git a/polaris/ocean/tasks/manufactured_solution/forward.yaml b/polaris/ocean/tasks/manufactured_solution/forward.yaml
index 776359db2..03ebc8066 100644
--- a/polaris/ocean/tasks/manufactured_solution/forward.yaml
+++ b/polaris/ocean/tasks/manufactured_solution/forward.yaml
@@ -42,21 +42,15 @@ Omega:
     InitialState:
       UsePointerFile: false
       Filename: init.nc
-      Mode: read
-      Precision: double
-      Freq: 1
-      FreqUnits: OnStartup
-      UseStartEnd: false
       Contents:
-        - Restart
+      - NormalVelocity
+      - LayerThickness
     History:
-      UsePointerFile: false
       Filename: output.nc
-      Mode: write
-      IfExists: replace
-      Precision: double
       Freq: {{ output_freq }}
       FreqUnits: Seconds
-      UseStartEnd: false
       Contents:
-        - Tracers
+      - NormalVelocity
+      - LayerThickness
+      - SshCellDefault
+    RestartRead: {}