diff --git a/machines/config_batch.xml b/machines/config_batch.xml
index cf78b84e..9a9caa84 100644
--- a/machines/config_batch.xml
+++ b/machines/config_batch.xml
@@ -127,8 +127,8 @@
       <directive                       > -J {{ job_id }} </directive>
       <directive                       > -n {{ total_tasks }} </directive>
       <directive                       > -W $JOB_WALLCLOCK_TIME </directive>
-      <directive default="cesm.stdout" > -o {{ job_id }}.%J  </directive>
-      <directive default="cesm.stderr" > -e {{ job_id }}.%J  </directive>
+      <directive > -o {{ job_id }}.out.%J  </directive>
+      <directive > -e {{ job_id }}.err.%J  </directive>
     </directives>
   </batch_system>
 
@@ -533,25 +533,6 @@
     </queues>
   </batch_system>
 
-  <batch_system MACH="juno" type="lsf">
-    <batch_env>-env</batch_env>
-    <submit_args>
-      <arg flag="-q" name="$JOB_QUEUE"/>
-      <arg flag="-W" name="$JOB_WALLCLOCK_TIME"/>
-      <arg flag="-P" name="$PROJECT"/>
-      <arg flag="-M" name="300GB"/>
-      <arg flag="-x" />
-    </submit_args>
-    <directives>
-      <directive                       > -R "span[ptile={{ tasks_per_node }}]"</directive>
-    </directives>
-    <queues>
-      <queue walltimemin="00:00" walltimemax="02:00" default="true">p_short</queue>
-      <queue walltimemin="02:00" walltimemax="04:00">p_medium</queue>
-      <queue walltimemin="04:00" walltimemax="08:00">p_long</queue>
-    </queues>
-  </batch_system>
-
   <batch_system MACH="laramie" type="pbs">
     <directives>
       <directive default="/bin/bash" > -S {{ shell }}  </directive>
@@ -780,6 +761,8 @@
       <queue walltimemin="00:00" walltimemax="02:00" default="true">p_short</queue>
       <queue walltimemin="02:00" walltimemax="04:00">p_medium</queue>
       <queue walltimemin="04:00" walltimemax="08:00">p_long</queue>
+      <queue walltimemin="00:00" walltimemax="00:30">s_short</queue>
+      <queue walltimemin="00:30" walltimemax="06:00">s_medium</queue>
     </queues>
   </batch_system>
 
diff --git a/machines/config_machines.xml b/machines/config_machines.xml
index 10a97747..767d85b9 100644
--- a/machines/config_machines.xml
+++ b/machines/config_machines.xml
@@ -121,8 +121,8 @@ This allows using a different mpirun command to launch unit tests
     <OS>LINUX</OS>
     <COMPILERS>intel,intel15</COMPILERS>
     <MPILIBS>mpich2</MPILIBS>
-    <CIME_OUTPUT_ROOT>/work/$USER/CESM2</CIME_OUTPUT_ROOT>
-    <DIN_LOC_ROOT>/users/home/dp16116/CESM2/inputdata</DIN_LOC_ROOT>
+    <CIME_OUTPUT_ROOT>/work/$USER/CMCC-CM</CIME_OUTPUT_ROOT>
+    <DIN_LOC_ROOT>$ENV{CESMDATAROOT}/inputdata</DIN_LOC_ROOT>
     <DIN_LOC_ROOT_CLMFORC>$DIN_LOC_ROOT/atm/datm7</DIN_LOC_ROOT_CLMFORC>
     <DOUT_S_ROOT>$CIME_OUTPUT_ROOT/archive/$CASE</DOUT_S_ROOT>
     <BASELINE_ROOT>$ENV{CESMDATAROOT}/ccsm_baselines</BASELINE_ROOT>
@@ -3651,6 +3651,7 @@ This allows using a different mpirun command to launch unit tests
     <MPILIBS>impi,mpi-serial</MPILIBS>
     <PROJECT>R000</PROJECT>
     <CIME_OUTPUT_ROOT>/work/$ENV{DIVISION}/$ENV{USER}/CESM2</CIME_OUTPUT_ROOT>
+    <NEMO_REBUILD_ROOT>$ENV{HOME}/NEMO_REBUILD</NEMO_REBUILD_ROOT>
     <DIN_LOC_ROOT>$ENV{CESMDATAROOT}/inputdata</DIN_LOC_ROOT>
     <DIN_LOC_ROOT_CLMFORC>$DIN_LOC_ROOT/atm/datm7</DIN_LOC_ROOT_CLMFORC>
     <DOUT_S_ROOT>$CIME_OUTPUT_ROOT/archive/$CASE</DOUT_S_ROOT>
diff --git a/machines/config_workflow.xml b/machines/config_workflow.xml
index fe10bbd2..81b48764 100644
--- a/machines/config_workflow.xml
+++ b/machines/config_workflow.xml
@@ -48,6 +48,16 @@
 	<walltime>0:20:00</walltime>
       </runtime_parameters>
     </job>
+    <job name="case.nemo_rebuild">
+      <template>$NEMO_REBUILD_ROOT/template.nemo_rebuild4cmcc-cm</template>
+      <dependency>case.st_archive</dependency>
+      <prereq>$NEMO_REBUILD</prereq>
+      <runtime_parameters>
+	        <task_count>1</task_count>
+        	<tasks_per_node>1</tasks_per_node>
+        	<walltime>1:00:00</walltime>
+      </runtime_parameters>
+    </job>
   </workflow_jobs>
 
   <workflow_jobs id="timeseries" prepend="default">