diff --git a/Externals.cfg b/Externals.cfg
index 8365f3d0a..0ee927b49 100644
--- a/Externals.cfg
+++ b/Externals.cfg
@@ -1,5 +1,5 @@
 [gtg]
-branch = master
+tag = ncep_post_gtg.v2.0.0
 protocol = git
 repo_url = git@github.com:NCAR/UPP_GTG.git
 local_path = sorc/post_gtg.fd
diff --git a/parm/postcntrl_gfs_wafs_ff.xml b/parm/postcntrl_gfs_wafs_ff.xml
deleted file mode 100755
index fd676041e..000000000
--- a/parm/postcntrl_gfs_wafs_ff.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<postxml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="EMC_POST_CTRL_Schema.xsd">
-<!--  Lin Gan:  20150410 validated -->
-  <paramset>
-    <datset>GFSPRS</datset>
-    <grid_num>0</grid_num>
-    <sub_center>ncep_nco</sub_center>
-    <version_no>v2003</version_no>
-    <local_table_vers_no>local_tab_yes1</local_table_vers_no>
-    <sigreftime>fcst</sigreftime>
-    <prod_status>oper</prod_status>
-    <data_type>fcst</data_type>
-    <gen_proc_type>fcst</gen_proc_type>
-    <time_range_unit>hour</time_range_unit>
-    <orig_center>nws_ncep</orig_center>
-    <gen_proc>gfs_avn</gen_proc>
-    <packing_method>complex_packing_spatial_diff</packing_method>
-    <order_of_sptdiff>2nd_ord_sptdiff</order_of_sptdiff>
-    <field_datatype>fltng_pnt</field_datatype>
-    <comprs_type>lossless</comprs_type>
-
-    <param>
-       <shortname>HGT_ON_ICAO_STD_SFC</shortname>
-       <level>7000. 10040. 14750. 19680. 25000. 30090. 34430. 39270. 44650. 50600. 55000. 59520. 
-       	65000. 69680. 75260. 81200. 84310. 90000. 95000. 100000.</level>
-       <scale>3.0</scale>
-    </param>
-
-    <param>
-       <shortname>TMP_ON_ICAO_STD_SFC</shortname>
-       <level>7000. 10040. 14750. 19680. 25000. 30090. 34430. 39270. 44650. 50600. 55000. 59520. 
-       	65000. 69680. 75260. 81200. 84310. 90000. 95000. 100000.</level>
-       <scale>3.0</scale>
-    </param>
-
-    <param>
-       <shortname>RH_ON_ICAO_STD_SFC</shortname>
-       <level>7000. 10040. 14750. 19680. 25000. 30090. 34430. 39270. 44650. 50600. 55000. 59520. 
-       	65000. 69680. 75260. 81200. 84310. 90000. 95000. 100000.</level>
-       <scale>3.0</scale>
-    </param>
-
-    <param>
-       <shortname>VVEL_ON_ICAO_STD_SFC</shortname>
-       <level>7000. 10040. 14750. 19680. 25000. 30090. 34430. 39270. 44650. 50600. 55000. 59520. 
-       	65000. 69680. 75260. 81200. 84310. 90000. 95000. 100000.</level>
-       <scale>3.0</scale>
-    </param>
-
-    <param>
-       <shortname>UGRD_ON_ICAO_STD_SFC</shortname>
-       <level>7000. 10040. 14750. 19680. 25000. 30090. 34430. 39270. 44650. 50600. 55000. 59520. 
-       	65000. 69680. 75260. 81200. 84310. 90000. 95000. 100000.</level>
-       <scale>3.0</scale>
-    </param>
-
-    <param>
-       <shortname>VGRD_ON_ICAO_STD_SFC</shortname>
-       <level>7000. 10040. 14750. 19680. 25000. 30090. 34430. 39270. 44650. 50600. 55000. 59520. 
-       	65000. 69680. 75260. 81200. 84310. 90000. 95000. 100000.</level>
-       <scale>3.0</scale>
-    </param>
-
-    <param>
-       <shortname>ABSV_ON_ICAO_STD_SFC</shortname>
-       <level>7000. 10040. 14750. 19680. 25000. 30090. 34430. 39270. 44650. 50600. 55000. 59520. 
-       	65000. 69680. 75260. 81200. 84310. 90000. 95000. 100000.</level>
-       <scale>3.0</scale>
-    </param>
-
-    <!--  comments wherever I like -->
-  </paramset>
-</postxml>
diff --git a/parm/postxconfig-NT-GFS-WAFS-FF.txt b/parm/postxconfig-NT-GFS-WAFS-FF.txt
deleted file mode 100644
index b56aa2079..000000000
--- a/parm/postxconfig-NT-GFS-WAFS-FF.txt
+++ /dev/null
@@ -1,277 +0,0 @@
-1
-7
-GFSPRS
-0
-ncep_nco
-v2003
-local_tab_yes1
-fcst
-oper
-fcst
-fcst
-hour
-nws_ncep
-gfs_avn
-complex_packing_spatial_diff
-2nd_ord_sptdiff
-fltng_pnt
-lossless
-518
-HGT_ON_ICAO_STD_SFC
-?
-1
-tmpl4_0
-HGT
-?
-?
-isobaric_sfc
-0
-?
-20
-7000. 10040. 14750. 19680. 25000. 30090. 34430. 39270. 44650. 50600. 55000. 59520. 65000. 69680. 75260. 81200. 84310. 90000. 95000. 100000.
-?
-0
-?
-0
-?
-?
-?
-0
-0.0
-0
-0.0
-?
-0
-0.0
-0
-0.0
-1
-3.0
-0
-0
-0
-?
-?
-?
-519
-TMP_ON_ICAO_STD_SFC
-?
-1
-tmpl4_0
-TMP
-?
-?
-isobaric_sfc
-0
-?
-20
-7000. 10040. 14750. 19680. 25000. 30090. 34430. 39270. 44650. 50600. 55000. 59520. 65000. 69680. 75260. 81200. 84310. 90000. 95000. 100000.
-?
-0
-?
-0
-?
-?
-?
-0
-0.0
-0
-0.0
-?
-0
-0.0
-0
-0.0
-1
-3.0
-0
-0
-0
-?
-?
-?
-522
-RH_ON_ICAO_STD_SFC
-?
-1
-tmpl4_0
-RH
-?
-?
-isobaric_sfc
-0
-?
-20
-7000. 10040. 14750. 19680. 25000. 30090. 34430. 39270. 44650. 50600. 55000. 59520. 65000. 69680. 75260. 81200. 84310. 90000. 95000. 100000.
-?
-0
-?
-0
-?
-?
-?
-0
-0.0
-0
-0.0
-?
-0
-0.0
-0
-0.0
-1
-3.0
-0
-0
-0
-?
-?
-?
-523
-VVEL_ON_ICAO_STD_SFC
-?
-1
-tmpl4_0
-VVEL
-?
-?
-isobaric_sfc
-0
-?
-20
-7000. 10040. 14750. 19680. 25000. 30090. 34430. 39270. 44650. 50600. 55000. 59520. 65000. 69680. 75260. 81200. 84310. 90000. 95000. 100000.
-?
-0
-?
-0
-?
-?
-?
-0
-0.0
-0
-0.0
-?
-0
-0.0
-0
-0.0
-1
-3.0
-0
-0
-0
-?
-?
-?
-520
-UGRD_ON_ICAO_STD_SFC
-?
-1
-tmpl4_0
-UGRD
-?
-?
-isobaric_sfc
-0
-?
-20
-7000. 10040. 14750. 19680. 25000. 30090. 34430. 39270. 44650. 50600. 55000. 59520. 65000. 69680. 75260. 81200. 84310. 90000. 95000. 100000.
-?
-0
-?
-0
-?
-?
-?
-0
-0.0
-0
-0.0
-?
-0
-0.0
-0
-0.0
-1
-3.0
-0
-0
-0
-?
-?
-?
-521
-VGRD_ON_ICAO_STD_SFC
-?
-1
-tmpl4_0
-VGRD
-?
-?
-isobaric_sfc
-0
-?
-20
-7000. 10040. 14750. 19680. 25000. 30090. 34430. 39270. 44650. 50600. 55000. 59520. 65000. 69680. 75260. 81200. 84310. 90000. 95000. 100000.
-?
-0
-?
-0
-?
-?
-?
-0
-0.0
-0
-0.0
-?
-0
-0.0
-0
-0.0
-1
-3.0
-0
-0
-0
-?
-?
-?
-524
-ABSV_ON_ICAO_STD_SFC
-?
-1
-tmpl4_0
-ABSV
-?
-?
-isobaric_sfc
-0
-?
-20
-7000. 10040. 14750. 19680. 25000. 30090. 34430. 39270. 44650. 50600. 55000. 59520. 65000. 69680. 75260. 81200. 84310. 90000. 95000. 100000.
-?
-0
-?
-0
-?
-?
-?
-0
-0.0
-0
-0.0
-?
-0
-0.0
-0
-0.0
-1
-3.0
-0
-0
-0
-?
-?
-?
diff --git a/scripts/exgfs_nceppost.sh.ecf b/scripts/exgfs_nceppost.sh.ecf
index e5575c03b..9c47e45c1 100755
--- a/scripts/exgfs_nceppost.sh.ecf
+++ b/scripts/exgfs_nceppost.sh.ecf
@@ -501,29 +501,29 @@ do
        if [[ $RUN = gfs && $GRIBVERSION = 'grib2' ]] ; then
           export OUTTYP=${OUTTYP:-4}
 
-	  # Control file of forecast hours 00-36 is superset of other forecast hours
-	  #                                 and has more levels
-          # process icing and gtg turbulence only when fhr is between [0, 36]
-          if [[ $fhr -ge 0  &&  $fhr -le 36 ]] ; then
-             export PostFlatFile=$PARMpost/postxconfig-NT-GFS-WAFS.txt
-             export CTLFILE=$PARMpost/postcntrl_gfs_wafs.xml
-
-             # gtg has its own configurations
-             cp $PARMpost/gtg.config.gfs gtg.config
-             cp $PARMpost/gtg_imprintings.txt gtg_imprintings.txt
-          else
-             export PostFlatFile=$PARMpost/postxconfig-NT-GFS-WAFS-FF.txt
-             export CTLFILE=$PARMpost/postcntrl_gfs_wafs_ff.xml
-          fi
+	  # Extend WAFS icing and gtg up to 120 hours
+          export PostFlatFile=$PARMpost/postxconfig-NT-GFS-WAFS.txt
+          export CTLFILE=$PARMpost/postcntrl_gfs_wafs.xml
+
+          # gtg has its own configurations
+          cp $PARMpost/gtg.config.gfs gtg.config
+          cp $PARMpost/gtg_imprintings.txt gtg_imprintings.txt
 
           export PGBOUT=wafsfile
           export PGIOUT=wafsifile
 
-	  # WAFS data is processed hourly if fhr<=24, and every 3 forecast hour if 24<fhr<=120
+          # WAFS data is processed:
+          #   hourly if fhr<=24
+          #   every 3 forecast hour if 24<fhr<=48
+          #   every 6 forecast hour if 48<fhr<=120
 	  if [  $fhr -le 24  ] ; then
              $POSTGPSH
-          elif [  $((10#$fhr%3)) -eq 0  ] ; then
-             $POSTGPSH
+          elif [  $fhr -le 48  ] ; then
+             if [  $((10#$fhr%3)) -eq 0  ] ; then
+               $POSTGPSH
+             fi
+          elif [  $((10#$fhr%6)) -eq 0  ] ; then
+               $POSTGPSH
 	  fi
 
           export err=$?; err_chk