diff --git a/parm/FV3LAM_wflow.xml b/parm/FV3LAM_wflow.xml
index 745a66b6b1..8e2bce095f 100644
--- a/parm/FV3LAM_wflow.xml
+++ b/parm/FV3LAM_wflow.xml
@@ -752,6 +752,7 @@ MODULES_RUN_TASK_FP script.
 {%- if do_rrfs_dev %}
 
 <!-- beginning of meta block for prod spinup  -->
+{%- if do_smoke_dust or do_nonvar_cldanal or do_refl2tten or do_enkf_radar_ref or do_envar_radar_ref %}
 <metatask name="data_preprocessing">
   
 {%- if do_spinup %}
@@ -926,7 +927,12 @@ MODULES_RUN_TASK_FP script.
 ************************************************************************
 -->
 {%- endif %}
+<!--
+************************************************************************
+************************************************************************
+-->
 </metatask>
+{%- endif %}
 <!-- end of meta block for prod spinup  -->
 
 {%- endif %}
@@ -2337,6 +2343,7 @@ MODULES_RUN_TASK_FP script.
 ************************************************************************
 ************************************************************************
 -->
+{%- if tn_prep_cyc_prod %}
   <task name="&TN_PREP_CYC_PROD;{{ uscore_ensmem_name }}" cycledefs="prodcyc,prodcyc_long" maxtries="{{ maxtries_run_prepstart }}">
 
     &RSRV_DEFAULT;
@@ -2452,6 +2459,7 @@ MODULES_RUN_TASK_FP script.
     </dependency>
 
   </task>
+{%- endif %}
 <!--
 ************************************************************************
 ************************************************************************
@@ -3387,7 +3395,7 @@ MODULES_RUN_TASK_FP script.
 ************************************************************************
 ************************************************************************
 -->
-{%- if do_rrfs_dev %}
+{%- if do_rrfs_dev and wtime_run_fcst_long %}
   <task name="&TN_RUN_FCST;_prod_long{{ uscore_ensmem_name }}" cycledefs="prodcyc_long" maxtries="{{ maxtries_run_fcst }}">
 
     &RSRV_FCST;
@@ -3480,6 +3488,7 @@ MODULES_RUN_TASK_FP script.
 {%- if not do_ensfcst %}
 {%- if not is_rtma %}
 {%- if do_rrfs_dev %}
+{%- if tn_save_restart %}
   <metatask name="&TN_SAVE_RESTART;_prod">
 
     <var name="fhr"> {{ restart_interval }} </var>
@@ -3574,6 +3583,7 @@ MODULES_RUN_TASK_FP script.
 {%- endif %}
 {%- endif %}
 {%- endif %}
+{%- endif %}
 <!--
 ************************************************************************
 ************************************************************************
@@ -4183,6 +4193,7 @@ the <task> tag to be identical to the ones above for other output times.
 {%- if do_rrfs_dev %}
 {%- if machine in ["JET", "HERA"]  %}
 {%- if not do_ensemble %}
+{%- if ppn_run_graphics %} <!-- maybe removed later -->
 <!--
 ************************************************************************
 ************************************************************************
@@ -4275,6 +4286,7 @@ the <task> tag to be identical to the ones above for other output times.
 {%- endif %}
 {%- endif %}
 {%- endif %}
+{%- endif %}
 <!--
 ************************************************************************
 ************************************************************************
diff --git a/ush/config.rrfs.yaml b/ush/config.rrfs.yaml
index ef25385a2a..f6764135c6 100644
--- a/ush/config.rrfs.yaml
+++ b/ush/config.rrfs.yaml
@@ -60,9 +60,9 @@ rrfs:
   DO_SOIL_ADJUST: false # turn on later
   DO_RADDA: false
   DO_BUFRSND: false
-  DO_RRFS_DEV: false
-  DO_POST_SPINUP: false # true
-  DO_POST_PROD: false # true
+  DO_RRFS_DEV: true
+  DO_POST_SPINUP: false # turn on later
+  DO_POST_PROD: false # turn on later
 cycledefs:
   INITIAL_CYCLEDEF: '{{ [workflow.DATE_FIRST_CYCL[0:8], "0300 ", workflow.DATE_LAST_CYCL[0:8], "2300 12:00:00"]|join }}'
   BOUNDARY_CYCLEDEF: '{{ [workflow.DATE_FIRST_CYCL[0:8], "0000 ", workflow.DATE_LAST_CYCL[0:8], "2300 06:00:00"]|join }}'
diff --git a/ush/fill_jinja_template.py b/ush/fill_jinja_template.py
index d7a9673f36..089f3f76e1 100755
--- a/ush/fill_jinja_template.py
+++ b/ush/fill_jinja_template.py
@@ -186,6 +186,12 @@ def parse_args(argv):
         action="store_true",
         help="Suppress all output",
     )
+    parser.add_argument(
+        "-i",
+        "--ignore_undefined",
+        action="store_true",
+        help="Ignore undefined jinja template variables",
+    )
     parser.add_argument(
         "-u",
         "--user_config",
@@ -279,7 +285,7 @@ def fill_jinja_template(argv):
     tvars = {}
     for var in template_vars:
 
-        if cfg.get(var, "NULL") == "NULL":
+        if (not cla.ignore_undefined) and (cfg.get(var, "NULL") == "NULL"):
             raise KeyError(f"{var} does not exist in user-supplied settings!")
 
         if not cla.quiet:
diff --git a/ush/generate_FV3LAM_wflow.py b/ush/generate_FV3LAM_wflow.py
index 83d8d57896..2bb20ab62d 100755
--- a/ush/generate_FV3LAM_wflow.py
+++ b/ush/generate_FV3LAM_wflow.py
@@ -213,9 +213,17 @@ def generate_FV3LAM_wflow(ushdir, logfile: str = "log.generate_FV3LAM_wflow", de
         # from the jinja template file.
         #
         try:
-            fill_jinja_template(
-                ["-q", "-u", settings_str, "-t", template_xml_fp, "-o", wflow_xml_fp]
-            )
+            # Until all of RRFS is merged lets temporarily ignore undefined template variables
+            # This is needed to have all the workflow in at the beginning, then add testable tasks one
+            # one by one. Once everything is merged this should be removed.
+            if expt_config["rrfs"]["DO_RRFS_DEV"]:
+                fill_jinja_template(
+                    ["-i", "-q", "-u", settings_str, "-t", template_xml_fp, "-o", wflow_xml_fp]
+                )
+            else:
+                fill_jinja_template(
+                    ["-q", "-u", settings_str, "-t", template_xml_fp, "-o", wflow_xml_fp]
+                )
         except:
             logging.info(
                 dedent(