diff --git a/ci/cases/yamls/ufs_hybatmDA_defaults.ci.yaml b/ci/cases/yamls/ufs_hybatmDA_defaults.ci.yaml
index 31f8035cdb..1075f55b63 100644
--- a/ci/cases/yamls/ufs_hybatmDA_defaults.ci.yaml
+++ b/ci/cases/yamls/ufs_hybatmDA_defaults.ci.yaml
@@ -9,8 +9,8 @@ atmanl:
   LAYOUT_X_ATMANL: 4
   LAYOUT_Y_ATMANL: 4
 atmensanl:
-  LAYOUT_X_ATMENSANL: 1
-  LAYOUT_Y_ATMENSANL: 1
+  LAYOUT_X_ATMENSANL: 4
+  LAYOUT_Y_ATMENSANL: 4
 esfc:
   DONST: "NO"
 nsst:
diff --git a/parm/config/gfs/config.atmanl b/parm/config/gfs/config.atmanl
index 319a936de0..f7fc00d589 100644
--- a/parm/config/gfs/config.atmanl
+++ b/parm/config/gfs/config.atmanl
@@ -11,11 +11,10 @@ if [[ ${DOHYBVAR} = "YES" ]]; then
 else
     export CASE_ANL=${CASE}
 fi
-export OBS_YAML_DIR=${HOMEgfs}/sorc/gdas.cd/parm/atm/obs/config/
-export OBS_LIST=${HOMEgfs}/sorc/gdas.cd/parm/atm/obs/lists/gdas_prototype_3d.yaml
-export ATMVARYAML=${HOMEgfs}/sorc/gdas.cd/parm/atm/variational/3dvar_drpcg.yaml
+export OBS_LIST="${HOMEgfs}/parm/gdas/atm/obs/lists/gdas_prototype_3d.yaml.j2"
+export ATMVARYAML="${HOMEgfs}/parm/gdas/atm/variational/3dvar_drpcg.yaml.j2"
 export STATICB_TYPE="gsibec"
-export BERROR_YAML=${HOMEgfs}/sorc/gdas.cd/parm/atm/berror/hybvar_${STATICB_TYPE}.yaml
+export BERROR_YAML="${HOMEgfs}/parm/gdas/atm/berror/hybvar_${STATICB_TYPE}.yaml.j2"
 export INTERP_METHOD='barycentric'
 
 export layout_x_atmanl=@LAYOUT_X_ATMANL@
diff --git a/parm/config/gfs/config.atmensanl b/parm/config/gfs/config.atmensanl
index 7a3a632bf8..dd695a2707 100644
--- a/parm/config/gfs/config.atmensanl
+++ b/parm/config/gfs/config.atmensanl
@@ -5,9 +5,8 @@
 
 echo "BEGIN: config.atmensanl"
 
-export OBS_YAML_DIR=${HOMEgfs}/sorc/gdas.cd/parm/atm/obs/config/
-export OBS_LIST=${HOMEgfs}/sorc/gdas.cd/parm/atm/obs/lists/lgetkf_prototype.yaml
-export ATMENSYAML=${HOMEgfs}/sorc/gdas.cd/parm/atm/lgetkf/lgetkf.yaml
+export OBS_LIST="${HOMEgfs}/parm/gdas/atm/obs/lists/lgetkf_prototype.yaml.j2"
+export ATMENSYAML="${HOMEgfs}/parm/gdas/atm/lgetkf/lgetkf.yaml.j2"
 export INTERP_METHOD='barycentric'
 
 export layout_x_atmensanl=@LAYOUT_X_ATMENSANL@