diff --git a/modulefiles/module_base.orion b/modulefiles/module_base.orion
index 1959e0bca7..2f78059706 100644
--- a/modulefiles/module_base.orion
+++ b/modulefiles/module_base.orion
@@ -9,54 +9,38 @@
 module load contrib noaatools
 
 ##
-module load cmake/3.17.3
-setenv CMAKE_C_COMPILER mpiicc
-setenv CMAKE_CXX_COMPILER mpiicpc
-setenv CMAKE_Fortran_COMPILER mpiifort
-setenv CMAKE_Platform orion.intel
-
-
-module use /apps/contrib/NCEP/libs/hpc-stack/v1.0.0-beta1/modulefiles/stack
-
-module load hpc/1.0.0-beta1
-module load hpc-intel/2018.4
-module load hpc-impi/2018.4
-
+## load programming environment
+## this typically includes compiler, MPI and job scheduler
+##
+module load intel/2018
+module load impi/2018
 
 #For ocean post: 
 module load ncl/6.6.2
 module load nco/4.8.1
 
-module load jasper/2.0.15
-module load zlib/1.2.11
-module load png/1.6.35
-
-module load hdf5/1.10.6
-module load netcdf/4.7.4
-module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_27
-
-module load bacio/2.4.1
-module load crtm/2.3.0
-module load g2/3.4.1
-module load g2tmpl/1.9.1
-module load ip/3.3.3
-module load nceppost/dceca26
-module load nemsio/2.5.2
-module load sp/2.3.3
-module load w3emc/2.7.3
-module load w3nco/2.4.1
-
 ##
-## NCEP libraries for atm post and other 
+## NCEP libraries (temporary version to match the CCPP requirements)
 ##
 module use -a /apps/contrib/NCEPLIBS/orion/cmake/install/NCEPLIBS/modules
+module load bacio/2.4.0
+module load crtm_dev/2.3.0
+module load g2/3.4.0
+module load g2tmpl/1.9.0
+module load ip/3.3.0
+module load nceppost/dceca26
+module load nemsio/2.5.1
+module load sp/2.3.0
+module load w3emc/2.7.0
+module load w3nco/2.4.0
 
 module load gfsio/1.4.0
 module load sfcio/1.4.0
 module load sigio/2.3.0
 
 module use /apps/contrib/NCEPLIBS/orion/modulefiles
+module load jasper/1.900.2
+module load png/1.2.44
 module load z/1.2.6
 
 module load prod_util/1.2.0
@@ -74,3 +58,11 @@ module load grib_util/1.2.0
 
 module load slurm/19.05.3-2
 
+##
+### load cmake
+###
+module load cmake/3.15.4
+setenv CMAKE_C_COMPILER mpiicc
+setenv CMAKE_CXX_COMPILER mpiicpc
+setenv CMAKE_Fortran_COMPILER mpiifort
+setenv CMAKE_Platform orion.intel
diff --git a/sorc/link_fv3gfs.sh b/sorc/link_fv3gfs.sh
index bcdeb10b57..12b09c6f92 100755
--- a/sorc/link_fv3gfs.sh
+++ b/sorc/link_fv3gfs.sh
@@ -64,7 +64,7 @@ if [ ! -z $FIX_DIR ]; then
 fi
 cd ${pwd}/../fix                ||exit 8
 if [ $model = "coupled" ] ; then
-  for dir in fix_am fix_fv3_gmted2010 fix_gldas fix_orog fix_verif fix_cice fix_mom6 fix_cpl fix_wave fix_reg2grb2 ; do 
+  for dir in fix_am fix_fv3_gmted2010 fix_fv3_fracoro fix_gldas fix_orog fix_verif fix_cice fix_mom6 fix_cpl fix_wave fix_reg2grb2 ; do 
     if [ -d $dir ]; then
       [[ $RUN_ENVIR = nco ]] && chmod -R 755 $dir
       rm -rf $dir
@@ -101,7 +101,7 @@ cd ${pwd}/../parm               ||exit 8
 cd ${pwd}/../scripts            ||exit 8
     $LINK ../sorc/gfs_post.fd/scripts/exgdas_atmos_nceppost.sh .
     if [ $model = "coupled" ]; then
-      $LINK exgfs_nceppost_cpl.sh.ecf exgfs_nceppost.sh.ecf
+      $LINK exgfs_nceppost_cpl.sh.ecf exgfs_atmos_nceppost.sh
     else 
       $LINK ../sorc/gfs_post.fd/scripts/exgfs_atmos_nceppost.sh  .
     fi 
diff --git a/workflow/cases/coupled_free_forecast.yaml b/workflow/cases/coupled_free_forecast.yaml
index 714494a572..f1159924ec 100644
--- a/workflow/cases/coupled_free_forecast.yaml
+++ b/workflow/cases/coupled_free_forecast.yaml
@@ -14,6 +14,7 @@ case:
     print_esmf: .true.
     nems_temp: 'cpld'
     mom6ic_prepared: .false.
+    inline_post: .false.
     KEEPDATA: YES
     ic_source: coupled_ic
 
diff --git a/workflow/cases/coupled_free_forecast_wave.yaml b/workflow/cases/coupled_free_forecast_wave.yaml
index 7e0108d3e2..1476f69e83 100644
--- a/workflow/cases/coupled_free_forecast_wave.yaml
+++ b/workflow/cases/coupled_free_forecast_wave.yaml
@@ -16,6 +16,7 @@ case:
     print_esmf: .true.
     nems_temp: 'cpld_wave'
     mom6ic_prepared: .false.
+    inline_post: .false. 
     KEEPDATA: NO
 
   nsst:
diff --git a/workflow/layout/free_forecast_gfs.yaml b/workflow/layout/free_forecast_gfs.yaml
index 3168f52f5a..afb3971119 100644
--- a/workflow/layout/free_forecast_gfs.yaml
+++ b/workflow/layout/free_forecast_gfs.yaml
@@ -134,7 +134,7 @@ suite: !Cycle
         ecflow_def: !expand "edit FHR '{FHR}'"
         release_pgrb2_anl: !DataEvent {file="/dev/null"}
         resources: !calc partition.resources.run_gfspost
-        J_JOB: JGLOBAL_NCEPPOST
+        J_JOB: JGLOBAL_ATMOS_NCEPPOST 
         ecflow_command: !expand |
           export post_times=%FHR% FHRLST=%FHR% FHRGRP=%FHR%
           $HOMEgfs/jobs/{J_JOB}
@@ -149,7 +149,7 @@ suite: !Cycle
         resources: !calc partition.resources.run_gfspost
         Name: !expand p_{dimval.fhr:03d}
         FHR: !expand "{dimval.fhr:03d}"
-        J_JOB: JGLOBAL_NCEPPOST
+        J_JOB: JGLOBAL_ATMOS_NCEPPOST
         Trigger: !FirstTrue
           - when: !calc not doc.settings.dev_safeguards
             take: !Depend jgfs_post_manager.depend("release_post{F:03d}",F=[dimval.fhr])