diff --git a/env/ORION.env b/env/ORION.env
index f15594e1cc6..61f6105eb3b 100755
--- a/env/ORION.env
+++ b/env/ORION.env
@@ -91,7 +91,7 @@ elif [ ${step} = "ocnanalrun" ]; then
 
     export NTHREADS_OCNANAL=${nth_ocnanalrun:-${nth_max}}
     [[ $NTHREADS_OCNANAL -gt ${nth_max} ]] && export NTHREADS_OCNANAL=${nth_max}
-    export APRUN_OCNANAL="${launcher} -n ${npe_aeroanlrun}"
+    export APRUN_OCNANAL="${launcher} -n ${npe_ocnanalrun}"
 
 elif [[ "${step}" = "anal" ]] || [[ "${step}" = "analcalc" ]]; then
 
diff --git a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_POST b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_POST
index 00526d45e71..f4c4cc60e7e 100755
--- a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_POST
+++ b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_POST
@@ -5,7 +5,7 @@ source "${HOMEgfs}/ush/preamble.sh"
 ##############################################
 # make temp directory
 ##############################################
-export DATA=${DATA:-${DATAROOT}/ocnanal_${cyc}}
+export DATA=${DATA:-${DATAROOT}/ocnanal_${CDATE}} # TODO (G): Switch to {cyc} when the downstream code is ready
 mkdir -p "${DATA}"
 cd "${DATA}" || (echo "${DATA} does not exist. ABORT!"; exit 1)
 
diff --git a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_PREP b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_PREP
index 3c036674fa4..88a540a62c7 100755
--- a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_PREP
+++ b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_PREP
@@ -5,7 +5,7 @@ source "${HOMEgfs}/ush/preamble.sh"
 ##############################################
 # make temp directory
 ##############################################
-export DATA=${DATA:-${DATAROOT}/ocnanal_${cyc}}
+export DATA=${DATA:-${DATAROOT}/ocnanal_${CDATE}} # TODO (G): Switch to {cyc} when the downstream code is ready
 rm -rf "${DATA}"  # Ensure starting with a clean DATA
 mkdir -p "${DATA}"
 cd "${DATA}" || (echo "${DATA} does not exist. ABORT!"; exit 1)
@@ -42,7 +42,7 @@ done
 ##########################################
 # Source machine runtime environment
 ##########################################
-. "${HOMEgfs}/env/${machine}.env ocnanalprep"
+. "${HOMEgfs}/env/${machine}.env" ocnanalprep
 status=$?
 [[ ${status} -ne 0 ]] && exit "${status}"
 
diff --git a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_RUN b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_RUN
index 25941d17840..65232697ffa 100755
--- a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_RUN
+++ b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_RUN
@@ -6,7 +6,7 @@ source "${HOMEgfs}/ush/preamble.sh"
 ##############################################
 # make temp directory
 ##############################################
-export DATA=${DATA:-${DATAROOT}/ocnanal_${cyc}}
+export DATA=${DATA:-${DATAROOT}/ocnanal_${CDATE}} # TODO (G): Switch to {cyc} when the downstream code is ready
 mkdir -p "${DATA}"
 cd "${DATA}" || (echo "${DATA} does not exist. ABORT!"; exit 1)
 
@@ -42,7 +42,7 @@ done
 ##########################################
 # Source machine runtime environment
 ##########################################
-. "${HOMEgfs}/env/${machine}.env ocnanalrun"
+. "${HOMEgfs}/env/${machine}.env" ocnanalrun
 status=$?
 [[ ${status} -ne 0 ]] && exit "${status}"
 
diff --git a/parm/config/config.ocnanal b/parm/config/config.ocnanal
index 385db2dc86f..6a56190584d 100644
--- a/parm/config/config.ocnanal
+++ b/parm/config/config.ocnanal
@@ -9,17 +9,17 @@ export OBS_YAML_DIR=${HOMEgfs}/sorc/gdas.cd/parm/soca/obs/config
 export OBS_YAML=${HOMEgfs}/sorc/gdas.cd/parm/soca/obs/obs_list.yaml
 export OBS_LIST=${OBS_YAML_DIR}/obs_list.yaml
 export FV3JEDI_STAGE_YAML=${HOMEgfs}/sorc/gdas.cd/test/soca/testinput/dumy.yaml
-export SOCA_INPUT_FIX_DIR=/scratch2/NCEPDEV/ocean/Guillaume.Vernieres/data/static/72x35x25/soca # TODO: Should be moved somewhere else
+export SOCA_INPUT_FIX_DIR=@SOCA_INPUT_FIX_DIR@
 export SOCA_VARS=tocn,socn,ssh
-export SOCA_NINNER=50
-export CASE_ANL="C48"
+export SOCA_NINNER=@SOCA_NINNER@
+export CASE_ANL=@CASE_ANL@
 export DOMAIN_STACK_SIZE=2000000
 export JEDI_BIN=${HOMEgfs}/sorc/gdas.cd/build/bin
 
 # TODO: Move the R2D2 configuration to a common space
 export R2D2_OBS_DB=shared
-export R2D2_OBS_DUMP=s2s_v1
-export R2D2_OBS_SRC=gdas_marine
+export R2D2_OBS_DUMP=@R2D2_OBS_DUMP@
+export R2D2_OBS_SRC=@R2D2_OBS_SRC@
 export R2D2_OBS_WINDOW=24     # TODO: Check if the R2D2 sampling DB window is still needed
-export COMIN_OBS=/scratch2/NCEPDEV/marineda/r2d2
+export COMIN_OBS=@COMIN_OBS@
 echo "END: config.ocnanal"
diff --git a/parm/config/config.ocnanalpost b/parm/config/config.ocnanalpost
index a67f07de225..bc4d945865c 100644
--- a/parm/config/config.ocnanalpost
+++ b/parm/config/config.ocnanalpost
@@ -6,5 +6,5 @@
 echo "BEGIN: config.ocnanalpost"
 
 # Get task specific resources
-. "${EXPDIR}/config.resources ocnanalpost"
+. "${EXPDIR}/config.resources" ocnanalpost
 echo "END: config.ocnanalpost"
diff --git a/parm/config/config.ocnanalprep b/parm/config/config.ocnanalprep
old mode 100644
new mode 100755
index 66b41463a8b..225eb089c34
--- a/parm/config/config.ocnanalprep
+++ b/parm/config/config.ocnanalprep
@@ -6,5 +6,5 @@
 echo "BEGIN: config.ocnanalprep"
 
 # Get task specific resources
-. "${EXPDIR}/config.resources ocnanalprep"
+. "${EXPDIR}/config.resources" ocnanalprep
 echo "END: config.ocnanalprep"
diff --git a/parm/config/config.ocnanalrun b/parm/config/config.ocnanalrun
index a71c3066f69..5345b6c6843 100644
--- a/parm/config/config.ocnanalrun
+++ b/parm/config/config.ocnanalrun
@@ -6,6 +6,6 @@
 echo "BEGIN: config.ocnanalrun"
 
 # Get task specific resources
-. "${EXPDIR}/config.resources ocnanalrun"
+. "${EXPDIR}/config.resources" ocnanalrun
 
 echo "END: config.ocnanalrun"
diff --git a/parm/config/yaml/defaults.yaml b/parm/config/yaml/defaults.yaml
index 7537454957e..b119aee6a81 100644
--- a/parm/config/yaml/defaults.yaml
+++ b/parm/config/yaml/defaults.yaml
@@ -1,3 +1,11 @@
 aeroanl:
   IO_LAYOUT_X: 1
   IO_LAYOUT_Y: 1
+
+ocnanal:
+  SOCA_INPUT_FIX_DIR: '/scratch2/NCEPDEV/ocean/Guillaume.Vernieres/data/static/72x35x25'
+  CASE_ANL: 'C48'
+  COMIN_OBS: '/scratch2/NCEPDEV/marineda/r2d2'
+  SOCA_NINNER: 50
+  R2D2_OBS_SRC: 'gdas_marine'
+  R2D2_OBS_DUMP: 's2s_v1'