diff --git a/jobs/JREGIONAL_RUN_PYTHON_GRAPHICS b/jobs/JREGIONAL_RUN_PYTHON_GRAPHICS
index 0f23dca51..e9d3d06d4 100755
--- a/jobs/JREGIONAL_RUN_PYTHON_GRAPHICS
+++ b/jobs/JREGIONAL_RUN_PYTHON_GRAPHICS
@@ -74,15 +74,6 @@ else
   zip_dir="${CYCLE_DIR}${SLASH_ENSMEM_SUBDIR}/nclprd"
 fi
 
-# Use a subdirectory for input from alternative wgrib2-produced grids.
-if [ "${TILES:-}" = "full" ] ; then
-  subdir=${postprd_dir}/${TILELABEL:-}_grid
-  if [ -d ${subdir} ] ; then
-    postprd_dir=${subdir}
-    run_dir=${run_dir}/${TILELABEL:-}_grid
-    zip_dir=${zip_dir}/${TILELABEL:-}_grid
-  fi
-fi
 
 
 # Choose an appropriate sites file for the grid
@@ -90,9 +81,10 @@ sites_file=conus_raobs.txt
 tiles=${TILES:-full}
 
 if [[ "${PREDEF_GRID_NAME}" =~ "AK" || \
-      "${TILELABEL:-}" == "242" ]] ; then
+      "${TILELABEL:-}" == "242" || \
+      "${TILELABEL:-}" == "hrrrak" ]] ; then
   sites_file=alaska_raobs.txt
-  tiles=${TILES:-full}
+  tiles=${TILES:-hrrrak}
 
 elif [[ "${PREDEF_GRID_NAME}" =~ "RAP" || \
         "${PREDEF_GRID_NAME}" =~ "NA" || \
@@ -102,6 +94,37 @@ elif [[ "${PREDEF_GRID_NAME}" =~ "RAP" || \
   sites_file=na_raobs.txt
   tiles=${TILES:-full}
 
+elif [[ "${TILELABEL:-}" = hrrr ]] ; then
+
+  # This domain comes from a NA domain, so wait longer.
+  age=5
+  wait_time=15
+  tiles=${TILES:-hrrr}
+
+fi
+
+# Use a subdirectory for input from alternative wgrib2-produced grids.
+wgrib2_grids=( hrrr hrrrak full )
+first_grid=${tiles%%,*} # First in a comma separated list
+first_grid=${first_grid%%_*} # First part of an underscore separated string (requirement set by Rocoto)
+
+sub_conus_grids=( SE SC SW NE NC NW \
+  ATL CA-NV CentralCA CHI-DET DCArea EastCO GreatLakes NYC-BOS SEA-POR SouthCA SouthFL VortexSE )
+
+sub_ak_grids=( AKRange Anchorage Juneau )
+
+if [[ "${sub_conus_grids[*]}" =~ $first_grid ]] ; then
+  subdir=hrrr_grid
+elif [[ "${sub_ak_grids[*]}" =~ $first_grid ]] ; then
+  subdir=hrrrak_grid
+elif [[ "${wgrib2_grids[*]}" =~ $first_grid ]] ; then
+  subdir=${first_grid:-}_grid
+fi
+
+if [ -d ${postprd_dir}/${subdir} ] ; then
+  postprd_dir=${postprd_dir}/${subdir}
+  run_dir=${run_dir}/${subdir:-}
+  zip_dir=${zip_dir}/${subdir:-}
 fi
 
 # Choose the appropriate file template for graphics type
diff --git a/ush/config.sh.RRFS_NA_3km b/ush/config.sh.RRFS_NA_3km
index 5f2219aa3..f5bc11eb3 100644
--- a/ush/config.sh.RRFS_NA_3km
+++ b/ush/config.sh.RRFS_NA_3km
@@ -124,8 +124,10 @@ NCL_REGION="conus"
 MODEL="RRFS_NA_3km"
 ADDNL_OUTPUT_GRIDS=( "hrrr" "hrrrak" )
 
-TILE_LABELS="NA"
-TILE_SETS="full"
+TILE_LABELS="NA hrrr_regions1 hrrr_regions2 hrrr_tiles1 hrrr_tiles2 hrrr_tiles3
+hrrr_tiles4 hrrrak_tiles"
+TILE_SETS="full SE,SC,SW NE,NC,NW ATL,CA-NV,CentralCA CHI-DET,DCArea,EastCO \
+GreatLakes,NYC-BOS,SEA-POR SouthCA,SouthFL,VortexSE AKRange,Anchorage,Juneau"
 
 CLEAN_OLDPROD_HRS="48"
 CLEAN_OLDRUN_HRS="24"
@@ -147,4 +149,3 @@ COMINgfs=""
 STMP="/lfs4/BMC/nrtrr/NCO_dirs/stmp"  # Path to directory STMP that mostly contains input files.
 PTMP="/lfs4/BMC/nrtrr/NCO_dirs/ptmp"  # Path to directory STMP that mostly contains input files.
 NWGES="/lfs4/BMC/nrtrr/NCO_dirs/nwges"  # Path to directory NWGES that save boundary, cold initial, restart files
-
diff --git a/ush/generate_FV3LAM_wflow.sh b/ush/generate_FV3LAM_wflow.sh
index 03156e24e..86d4e37c4 100755
--- a/ush/generate_FV3LAM_wflow.sh
+++ b/ush/generate_FV3LAM_wflow.sh
@@ -409,8 +409,8 @@ settings="\
 #
 # graphics related parameters
 #
-  'tilelabels': ${TILE_LABELS}
-  'tilesets': ${TILE_SETS}
+  'tilelabels': \"${TILE_LABELS}\"
+  'tilesets': \"${TILE_SETS}\"
 #
 #  retrospective experiments
 #
diff --git a/ush/setup.sh b/ush/setup.sh
index 70558a850..53ccf1a28 100755
--- a/ush/setup.sh
+++ b/ush/setup.sh
@@ -902,7 +902,7 @@ fi
 #
 if [ ${#ADDNL_OUTPUT_GRIDS[@]} -ne 0 ]; then
   for grid in ${ADDNL_OUTPUT_GRIDS[@]} ; do
-    TILE_SETS="${TILE_SETS} full"
+    TILE_SETS="${TILE_SETS} ${grid}"
     TILE_LABELS="${TILE_LABELS} ${grid}"
   done
 fi