diff --git a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_PREP_OBS b/jobs/JGLOBAL_PREP_OCEAN_OBS
similarity index 83%
rename from jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_PREP_OBS
rename to jobs/JGLOBAL_PREP_OCEAN_OBS
index f9a0350c17..a93d1a9636 100755
--- a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_PREP_OBS
+++ b/jobs/JGLOBAL_PREP_OCEAN_OBS
@@ -7,8 +7,6 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "prepoceanobs" -c "base prepoceanobs"
 ##############################################
 # Set variables used in the script
 ##############################################
-# Ignore possible spelling error (nothing is misspelled)
-# shellcheck disable=SC2153
 
 ##############################################
 # Begin JOB SPECIFIC work
@@ -32,8 +30,9 @@ if [[ -e "${pgmout}" ]] ; then
 fi
 
 ##########################################
-# Do not remove the Temporary working directory (do this in POST)
+# Handle the temporary working directory 
 ##########################################
-cd "${DATAROOT}" || exit 1
+cd "${DATAROOT}" || (echo "FATAL ERROR: ${DATAROOT} does not exist. ABORT!"; exit 1)
+[[ ${KEEPDATA} = "NO" ]] && rm -rf "${DATA}"
 
 exit 0
diff --git a/jobs/rocoto/prepoceanobs.sh b/jobs/rocoto/prepoceanobs.sh
new file mode 100755
index 0000000000..d7ae87851f
--- /dev/null
+++ b/jobs/rocoto/prepoceanobs.sh
@@ -0,0 +1,19 @@
+#! /usr/bin/env bash
+
+export STRICT="NO"
+source "${HOMEgfs}/ush/preamble.sh"
+
+###############################################################
+# Source UFSDA workflow modules
+. "${HOMEgfs}/ush/load_ufsda_modules.sh"
+status=$?
+[[ ${status} -ne 0 ]] && exit "${status}"
+
+export job="prepoceanobs"
+export jobid="${job}.$$"
+
+###############################################################
+# Execute the JJOB
+"${HOMEgfs}"/jobs/JGLOBAL_PREP_OCEAN_OBS
+status=$?
+exit "${status}"
diff --git a/parm/config/gfs/config.ocnanalprepobs b/parm/config/gfs/config.ocnanalprepobs
deleted file mode 100644
index a4101bf174..0000000000
--- a/parm/config/gfs/config.ocnanalprepobs
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-########## config.ocnanalprep ##########
-# Pre Ocn Analysis specific
-
-echo "BEGIN: config.ocnanalprepobs"
-
-# Get task specific resources
-. "${EXPDIR}/config.resources" ocnanalprepobs
-echo "END: config.ocnanalprepobs"
diff --git a/parm/config/gfs/config.prepoceanobs b/parm/config/gfs/config.prepoceanobs
new file mode 100644
index 0000000000..051769b6ee
--- /dev/null
+++ b/parm/config/gfs/config.prepoceanobs
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+########## config.prepoceanobs ##########
+# Pre Ocn Analysis specific
+
+echo "BEGIN: config.config.prepoceanobs"
+
+# Get task specific resources
+. "${EXPDIR}/config.resources" prepoceanobs
+echo "END: config.prepoceanobs"
diff --git a/parm/config/gfs/config.resources b/parm/config/gfs/config.resources
index ed6ff5b794..17a1423589 100644
--- a/parm/config/gfs/config.resources
+++ b/parm/config/gfs/config.resources
@@ -20,7 +20,7 @@ if [[ $# -ne 1 ]]; then
     echo "waveinit waveprep wavepostsbs wavepostbndpnt wavepostbndpntbll wavepostpnt"
     echo "wavegempak waveawipsbulls waveawipsgridded"
     echo "postsnd awips gempak"
-    echo "ocnanalprep ocnanalprepobs ocnanalbmat ocnanalrun ocnanalchkpt ocnanalpost ocnanalvrfy"
+    echo "ocnanalprep prepoceanobs ocnanalbmat ocnanalrun ocnanalchkpt ocnanalpost ocnanalvrfy"
     exit 1
 
 fi
@@ -345,14 +345,14 @@ elif [[ "${step}" = "ocnanalprep" ]]; then
     export npe_node_ocnanalprep
     export memory_ocnanalprep="24GB"
 
-elif [[ "${step}" = "ocnanalprepobs" ]]; then
+elif [[ "${step}" = "prepoceanobs" ]]; then
 
-    export wtime_ocnanalprepobs="00:10:00"
-    export npe_ocnanalprepobs=1
-    export nth_ocnanalprepobs=1
-    npe_node_ocnanalprepobs=$(echo "${npe_node_max} / ${nth_ocnanalprepobs}" | bc)
-    export npe_node_ocnanalprepobs
-    export memory_ocnanalprepobs="24GB"
+    export wtime_prepoceanobs="00:10:00"
+    export npe_prepoceanobs=1
+    export nth_prepoceanobs=1
+    npe_node_prepoceanobs=$(echo "${npe_node_max} / ${nth_prepoceanobs}" | bc)
+    export npe_node_prepoceanobs
+    export memory_prepoceanobs="24GB"
 
 
 elif [[ "${step}" = "ocnanalbmat" ]]; then