diff --git a/ci/cases/pr/C96C48_hybatmDA.yaml b/ci/cases/pr/C96C48_hybatmDA.yaml
index c3aa6e8892..1f3e973ae7 100644
--- a/ci/cases/pr/C96C48_hybatmDA.yaml
+++ b/ci/cases/pr/C96C48_hybatmDA.yaml
@@ -16,3 +16,6 @@ arguments:
   gfs_cyc: 1
   start: cold
   yaml: {{ HOMEgfs }}/ci/platforms/gfs_defaults_ci.yaml
+
+skip_ci_on_hosts:
+  - hercules
diff --git a/ci/cases/pr/C96_atm3DVar.yaml b/ci/cases/pr/C96_atm3DVar.yaml
index 5215cb0d90..360e81e9d7 100644
--- a/ci/cases/pr/C96_atm3DVar.yaml
+++ b/ci/cases/pr/C96_atm3DVar.yaml
@@ -15,3 +15,6 @@ arguments:
   gfs_cyc: 1
   start: cold
   yaml: {{ HOMEgfs }}/ci/platforms/gfs_defaults_ci.yaml
+
+skip_ci_on_hosts:
+  - hercules
diff --git a/ci/platforms/config.hercules b/ci/platforms/config.hercules
new file mode 100644
index 0000000000..e5a638a827
--- /dev/null
+++ b/ci/platforms/config.hercules
@@ -0,0 +1,8 @@
+#!/usr/bin/bash
+
+export GFS_CI_ROOT=/work2/noaa/stmp/GFS_CI_ROOT/HERCULES
+export ICSDIR_ROOT=/work/noaa/global/glopara/data/ICSDIR
+export STMP="/work2/noaa/stmp/${USER}"
+export SLURM_ACCOUNT=nems
+export max_concurrent_cases=5
+export max_concurrent_pr=4
diff --git a/ci/platforms/config.orion b/ci/platforms/config.orion
index 3e87ef97a1..3ddd05c034 100644
--- a/ci/platforms/config.orion
+++ b/ci/platforms/config.orion
@@ -1,6 +1,6 @@
 #!/usr/bin/bash
 
-export GFS_CI_ROOT=/work2/noaa/stmp/GFS_CI_ROOT
+export GFS_CI_ROOT=/work2/noaa/stmp/GFS_CI_ROOT/ORION
 export ICSDIR_ROOT=/work/noaa/global/glopara/data/ICSDIR
 export STMP="/work2/noaa/stmp/${USER}"
 export SLURM_ACCOUNT=nems
diff --git a/parm/config/gfs/config.ocnpost b/parm/config/gfs/config.ocnpost
index 2505431401..851c476e6c 100644
--- a/parm/config/gfs/config.ocnpost
+++ b/parm/config/gfs/config.ocnpost
@@ -17,8 +17,8 @@ case "${OCNRES}" in
     *) export MAKE_OCN_GRIB="NO";;
 esac
 
-if [[ "${machine}" = "WCOSS2" ]]; then
-  #Currently the conversion to netcdf uses NCL which is not on WCOSS2
+if [[ "${machine}" = "WCOSS2" ]] || [[ "${machine}" = "HERCULES" ]]; then
+  #Currently the conversion to netcdf uses NCL which is not on WCOSS2 or HERCULES
   #This should be removed when this is updated
   export MAKE_OCN_GRIB="NO"
 fi