diff --git a/components/driver/rose-meta/lfric-driver/versions.py b/components/driver/rose-meta/lfric-driver/versions.py
index 01798ad2b..eb91a8b17 100644
--- a/components/driver/rose-meta/lfric-driver/versions.py
+++ b/components/driver/rose-meta/lfric-driver/versions.py
@@ -31,3 +31,5 @@ def upgrade(self, config, meta_config=None):
         # Add settings
         return config, self.reports
 """
+
+
diff --git a/mesh_tools/rose-meta/lfric-mesh_tools/versions.py b/mesh_tools/rose-meta/lfric-mesh_tools/versions.py
index 01798ad2b..1f7cc94fa 100644
--- a/mesh_tools/rose-meta/lfric-mesh_tools/versions.py
+++ b/mesh_tools/rose-meta/lfric-mesh_tools/versions.py
@@ -20,14 +20,130 @@ def __repr__(self):
 
 """
 Copy this template and complete to add your macro
-
 class vnXX_txxx(MacroUpgrade):
     # Upgrade macro for <TICKET> by <Author>
-
     BEFORE_TAG = "vnX.X"
     AFTER_TAG = "vnX.X_txxx"
-
     def upgrade(self, config, meta_config=None):
         # Add settings
         return config, self.reports
 """
+
+
+class vn31_t11(MacroUpgrade):
+    """Upgrade macro for ticket TTTT by Unknown."""
+
+    BEFORE_TAG = "vn3.1"
+    AFTER_TAG = "vn3.1_t11"
+
+    def upgrade(self, config, meta_config=None):
+        # Commands From: rose-meta/lfric-mesh_tools
+        n_meshes = self.get_setting_value(config, ["namelist:mesh", "n_meshes"])
+        if config.get_value(["namelist:planar_mesh"]) is not None:
+            if n_meshes == "4":
+                self.add_setting(
+                    config,
+                    ["namelist:mesh", "mesh_maps"],
+                    "'planar_l0:planar_l1','planar_l1:planar_l2','planar_l2:planar_l3'",
+                    forced=True,
+                )
+                self.add_setting(
+                    config,
+                    ["namelist:mesh", "mesh_names"],
+                    "'planar_l0','planar_l1','planar_l2','planar_l3'",
+                    forced=True,
+                )
+            elif n_meshes == "3":
+                self.add_setting(
+                    config,
+                    ["namelist:mesh", "mesh_maps"],
+                    "'planar_l0:planar_l1','planar_l1:planar_l2'",
+                    forced=True,
+                )
+                self.add_setting(
+                    config,
+                    ["namelist:mesh", "mesh_names"],
+                    "'planar_l0','planar_l1','planar_l2'",
+                    forced=True,
+                )
+            elif n_meshes == "2":
+                self.add_setting(
+                    config,
+                    ["namelist:mesh", "mesh_maps"],
+                    "'planar_l0:planar_l1'",
+                    forced=True,
+                )
+                self.add_setting(
+                    config,
+                    ["namelist:mesh", "mesh_names"],
+                    "'planar_l0','planar_l1'",
+                    forced=True,
+                )
+            else:
+                self.add_setting(
+                    config,
+                    ["namelist:mesh", "mesh_names"],
+                    "'planar_l0'",
+                    forced=True,
+                )
+        else:
+            if n_meshes == "4":
+                self.add_setting(
+                    config,
+                    ["namelist:mesh", "mesh_maps"],
+                    "'cubedsphere_l0:cubedsphere_l1','cubedsphere_l1:cubedsphere_l2','cubedsphere_l2:cubedsphere_l3'",
+                    forced=True,
+                )
+                self.add_setting(
+                    config,
+                    ["namelist:mesh", "mesh_names"],
+                    "'cubedsphere_l0','cubedsphere_l1','cubedsphere_l2','cubedsphere_l3'",
+                    forced=True,
+                )
+            elif n_meshes == "3":
+                self.add_setting(
+                    config,
+                    ["namelist:mesh", "mesh_maps"],
+                    "'cubedsphere_l0:cubedsphere_l1','cubedsphere_l1:cubedsphere_l2'",
+                    forced=True,
+                )
+                self.add_setting(
+                    config,
+                    ["namelist:mesh", "mesh_names"],
+                    "'cubedsphere_l0','cubedsphere_l1','cubedsphere_l2'",
+                    forced=True,
+                )
+            elif n_meshes == "2":
+                self.add_setting(
+                    config,
+                    ["namelist:mesh", "mesh_maps"],
+                    "'cubedsphere_l0:cubedsphere_l1'",
+                    forced=True,
+                )
+                self.add_setting(
+                    config,
+                    ["namelist:mesh", "mesh_names"],
+                    "'cubedsphere_l0','cubedsphere_l1'",
+                    forced=True,
+                )
+            else:
+                self.add_setting(
+                    config,
+                    ["namelist:mesh", "mesh_names"],
+                    "'cubedsphere_l0'",
+                    forced=True,
+                )
+
+        self.change_setting_value(
+                    config,
+                    ["namelist:planar_mesh", "lbc_parent_mesh"],
+                    "'planar_l0'"
+                )
+
+        self.change_setting_value(
+                    config,
+                    ["namelist:stretch_transform", "transform_mesh"],
+                    "'planar_l0'"
+                )
+
+        return config, self.reports
diff --git a/rose-stem/app/coupled/opt/rose-app-LAM50x50-2x2.conf b/rose-stem/app/coupled/opt/rose-app-LAM50x50-2x2.conf
index 907e12d60..328296211 100644
--- a/rose-stem/app/coupled/opt/rose-app-LAM50x50-2x2.conf
+++ b/rose-stem/app/coupled/opt/rose-app-LAM50x50-2x2.conf
@@ -4,6 +4,7 @@ source=$MESH_DIR/mesh_LAM50x50-2x2.nc
 
 [namelist:base_mesh]
 file_prefix='mesh_LAM50x50-2x2'
+prime_mesh_name='planar_l0'
 topology='non_periodic'
 
 [namelist:partitioning]
diff --git a/rose-stem/app/coupled/rose-app.conf b/rose-stem/app/coupled/rose-app.conf
index 38b1839b6..a53194d2e 100644
--- a/rose-stem/app/coupled/rose-app.conf
+++ b/rose-stem/app/coupled/rose-app.conf
@@ -33,7 +33,7 @@ file_prefix='mesh'
 fplane=.false.
 geometry='spherical'
 prepartitioned=.false.
-prime_mesh_name='dynamics'
+prime_mesh_name='cubedsphere_l0'
 topology='fully_periodic'
 
 [namelist:extrusion]
diff --git a/rose-stem/app/io_demo/rose-app.conf b/rose-stem/app/io_demo/rose-app.conf
index 27248bb13..694078bfa 100644
--- a/rose-stem/app/io_demo/rose-app.conf
+++ b/rose-stem/app/io_demo/rose-app.conf
@@ -33,7 +33,7 @@ file_prefix=''
 fplane=.false.
 geometry='planar'
 prepartitioned=.false.
-prime_mesh_name='dynamics'
+prime_mesh_name='cubedsphere_l0'
 topology='fully_periodic'
 
 [namelist:development]
diff --git a/rose-stem/app/lbc_demo/opt/rose-app-lbc.conf b/rose-stem/app/lbc_demo/opt/rose-app-lbc.conf
index 68ac98b55..d322c1d4d 100644
--- a/rose-stem/app/lbc_demo/opt/rose-app-lbc.conf
+++ b/rose-stem/app/lbc_demo/opt/rose-app-lbc.conf
@@ -6,9 +6,5 @@ XIOS_SERVER_RANKS=1
 
 [namelist:base_mesh]
 file_prefix='${MESH_DIR}/mesh_lbc'
-geometry='spherical'
-prepartitioned=.true.
-prime_mesh_name='primary'
-topology='non_periodic'
 
 [!!namelist:partitioning]
diff --git a/rose-stem/app/lbc_demo/opt/rose-app-lbc_1x1P.conf b/rose-stem/app/lbc_demo/opt/rose-app-lbc_1x1P.conf
index bb0a0ecee..9c40e1119 100644
--- a/rose-stem/app/lbc_demo/opt/rose-app-lbc_1x1P.conf
+++ b/rose-stem/app/lbc_demo/opt/rose-app-lbc_1x1P.conf
@@ -6,9 +6,5 @@ XIOS_SERVER_RANKS=1
 
 [namelist:base_mesh]
 file_prefix='${MESH_DIR}/mesh_lbc_1x1P'
-geometry='spherical'
-prepartitioned=.true.
-prime_mesh_name='primary'
-topology='non_periodic'
 
 [!!namelist:partitioning]
diff --git a/rose-stem/app/lbc_demo/opt/rose-app-lbc_2x2P.conf b/rose-stem/app/lbc_demo/opt/rose-app-lbc_2x2P.conf
index a93fd67d5..a93af7cc2 100644
--- a/rose-stem/app/lbc_demo/opt/rose-app-lbc_2x2P.conf
+++ b/rose-stem/app/lbc_demo/opt/rose-app-lbc_2x2P.conf
@@ -6,9 +6,5 @@ XIOS_SERVER_RANKS=1
 
 [namelist:base_mesh]
 file_prefix='${MESH_DIR}/mesh_lbc_2x2P'
-geometry='spherical'
-prepartitioned=.true.
-prime_mesh_name='primary'
-topology='non_periodic'
 
 [!!namelist:partitioning]
diff --git a/rose-stem/app/lbc_demo/opt/rose-app-lbc_8x2P.conf b/rose-stem/app/lbc_demo/opt/rose-app-lbc_8x2P.conf
index 37201404e..a33c7b6d7 100644
--- a/rose-stem/app/lbc_demo/opt/rose-app-lbc_8x2P.conf
+++ b/rose-stem/app/lbc_demo/opt/rose-app-lbc_8x2P.conf
@@ -6,9 +6,5 @@ XIOS_SERVER_RANKS=1
 
 [namelist:base_mesh]
 file_prefix='${MESH_DIR}/mesh_lbc_8x2P'
-geometry='spherical'
-prepartitioned=.true.
-prime_mesh_name='primary'
-topology='non_periodic'
 
 [!!namelist:partitioning]
diff --git a/rose-stem/app/lbc_demo/opt/rose-app-mesh_lbc_demo.conf b/rose-stem/app/lbc_demo/opt/rose-app-mesh_lbc_demo.conf
index 5225b2288..cb029237c 100644
--- a/rose-stem/app/lbc_demo/opt/rose-app-mesh_lbc_demo.conf
+++ b/rose-stem/app/lbc_demo/opt/rose-app-mesh_lbc_demo.conf
@@ -4,9 +4,5 @@ source=$MESH_DIR/mesh_lbc_demo.nc
 
 [namelist:base_mesh]
 file_prefix='mesh_lbc_demo'
-geometry='spherical'
-prepartitioned=.true.,
-prime_mesh_name='primary',
-topology='non_periodic',
 
 [!!namelist:partitioning]
diff --git a/rose-stem/app/lbc_demo/rose-app.conf b/rose-stem/app/lbc_demo/rose-app.conf
index d979a47c6..9790a60da 100644
--- a/rose-stem/app/lbc_demo/rose-app.conf
+++ b/rose-stem/app/lbc_demo/rose-app.conf
@@ -32,11 +32,12 @@ file_prefix=''
 fplane=.false.
 geometry='spherical'
 prepartitioned=.true.
-prime_mesh_name='primary'
+prime_mesh_name='planar_l0'
 topology='non_periodic'
 
 [namelist:extrusion]
 domain_height=1000.0
+!!eta_values=''
 method='uniform'
 number_of_layers=3
 planet_radius=6371229.0
@@ -54,6 +55,7 @@ checkpoint_read=.false.
 checkpoint_write=.false.
 counter_output_suffix='counter.txt'
 diagnostic_frequency=1
+!!end_of_run_checkpoint=.true.
 file_convention='UGRID'
 !!nodal_output_on_w3=.false.
 subroutine_counters=.false.
@@ -75,8 +77,13 @@ set_lbc='quadrant'
 write_lbc=.false.
 
 [namelist:logging]
+log_to_rank_zero_only=.false.
 run_log_level='info'
 
+[namelist:multigrid]
+chain_mesh_tags=''
+multigrid_chain_nitems=1
+
 [!!namelist:partitioning]
 generate_inner_halos=.false.
 panel_decomposition='auto'
diff --git a/rose-stem/app/simple_diffusion/rose-app.conf b/rose-stem/app/simple_diffusion/rose-app.conf
index f710dfe34..945f6e509 100644
--- a/rose-stem/app/simple_diffusion/rose-app.conf
+++ b/rose-stem/app/simple_diffusion/rose-app.conf
@@ -32,7 +32,7 @@ file_prefix=''
 fplane=.false.
 geometry='planar'
 prepartitioned=.false.
-prime_mesh_name='dynamics'
+prime_mesh_name='cubedsphere_l0'
 topology='fully_periodic'
 
 [namelist:development]
diff --git a/rose-stem/app/skeleton/rose-app.conf b/rose-stem/app/skeleton/rose-app.conf
index 7e966d0b7..b13a415a6 100644
--- a/rose-stem/app/skeleton/rose-app.conf
+++ b/rose-stem/app/skeleton/rose-app.conf
@@ -31,7 +31,7 @@ file_prefix=''
 fplane=.false.
 geometry='planar'
 prepartitioned=.false.
-prime_mesh_name='dynamics'
+prime_mesh_name='cubedsphere_l0'
 topology='fully_periodic'
 
 [namelist:extrusion]