diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_NA_3km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1alpha.sh b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_NA_3km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1alpha.sh
index 9b4e0da93..a01a30807 100644
--- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_NA_3km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1alpha.sh
+++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_NA_3km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1alpha.sh
@@ -45,8 +45,6 @@ PPN_MAKE_ICS="4"
 PPN_MAKE_LBCS="4"
 WTIME_MAKE_LBCS="01:00:00"
 
-PPN_RUN_FCST="24"
-
 NNODES_RUN_POST="6"
 PPN_RUN_POST="12"
 
diff --git a/ush/config_defaults.sh b/ush/config_defaults.sh
index dd6a2968c..35c744039 100644
--- a/ush/config_defaults.sh
+++ b/ush/config_defaults.sh
@@ -1515,7 +1515,7 @@ PPN_VX_ENSPOINT_PROB="1"
 # Walltimes.
 #
 WTIME_MAKE_GRID="00:20:00"
-WTIME_MAKE_OROG="00:20:00"
+WTIME_MAKE_OROG="01:00:00"
 WTIME_MAKE_SFC_CLIMO="00:20:00"
 WTIME_GET_EXTRN_ICS="00:45:00"
 WTIME_GET_EXTRN_LBCS="00:45:00"
diff --git a/ush/set_predef_grid_params.sh b/ush/set_predef_grid_params.sh
index aca2a26e3..dd664670a 100644
--- a/ush/set_predef_grid_params.sh
+++ b/ush/set_predef_grid_params.sh
@@ -1227,8 +1227,8 @@ case ${PREDEF_GRID_NAME} in
 
   DT_ATMOS="${DT_ATMOS:-36}"
 
-  LAYOUT_X="${LAYOUT_X:-18}"
-  LAYOUT_Y="${LAYOUT_Y:-36}"
+  LAYOUT_X="${LAYOUT_X:-18}"   # 40 - EMC operational configuration
+  LAYOUT_Y="${LAYOUT_Y:-36}"   # 45 - EMC operational configuration
   BLOCKSIZE="${BLOCKSIZE:-28}"
 
   if [ "$QUILTING" = "TRUE" ]; then