diff --git a/parm/atm/atm_ens_config.yaml.j2 b/parm/atm/atm_ens_config.yaml.j2
index 1c55ea3c0..87d331e0d 100644
--- a/parm/atm/atm_ens_config.yaml.j2
+++ b/parm/atm/atm_ens_config.yaml.j2
@@ -75,5 +75,11 @@ data_out:
                          '${YMD}': current_cycle | to_YMD,
                          '${HH}': current_cycle | strftime('%H'),
                          '${MEMDIR}': 'mem%03d' | format(imem) }) %}
+{% if DOENKFONLY_ATM | default(false) %}
+    {% for itile in range(1, ntiles + 1) %}
+    - ['{{ DATA }}/anl/{{ 'mem%03d' | format(imem) }}/{{ APREFIX_ENS }}cubed_sphere_grid_atminc.tile{{ itile }}.nc', '{{ COM_ATMOS_ANALYSIS_TMPL | replace_tmpl(tmpl_dict) }}/{{ APREFIX_ENS }}csg_jedi_increment.atm.i006.tile{{ itile }}.nc']
+   {% endfor %}
+{% else %}
     - ['{{ DATA }}/anl/{{ 'mem%03d' | format(imem) }}/{{ APREFIX_ENS }}cubed_sphere_grid_atminc.nc', '{{ COM_ATMOS_ANALYSIS_TMPL | replace_tmpl(tmpl_dict) }}/{{ APREFIX_ENS }}csg_jedi_increment.atm.i006.nc']
+{% endif %}
 {% endfor %}
diff --git a/parm/atm/atm_ens_obs_dist_localizations.yaml.j2 b/parm/atm/atm_ens_obs_dist_localizations.yaml.j2
new file mode 100644
index 000000000..355ce6f38
--- /dev/null
+++ b/parm/atm/atm_ens_obs_dist_localizations.yaml.j2
@@ -0,0 +1,19 @@
+obs_distribution_localizations:
+  obs_distribution:
+    name: {{ distribution_type }}
+    halo size: 1250e3
+  obs_localizations:
+  - localization method: Horizontal Gaspari-Cohn
+    lengthscale: 1250e3
+    max nobs: 10000
+
+override_obs_distribution_localizations:
+  override: false
+  atms_n20:
+    obs_distribution:
+      name: {{ distribution_type }}
+      halo size: 850e3
+    obs_localizations:
+    - localization method: Horizontal Gaspari-Cohn
+      lengthscale: 850e3
+      max nobs: 5000
diff --git a/parm/atm/jcb-base.yaml.j2 b/parm/atm/jcb-base.yaml.j2
index 1ad6fbc30..170595023 100644
--- a/parm/atm/jcb-base.yaml.j2
+++ b/parm/atm/jcb-base.yaml.j2
@@ -129,6 +129,8 @@ local_ensemble_da_solver: Deterministic GETKF
 
 increment_variables: [eastward_wind,northward_wind,layer_thickness,air_pressure_thickness,air_temperature,air_pressure_at_surface,water_vapor_mixing_ratio_wrt_moist_air,cloud_liquid_ice,cloud_liquid_water,snow_water,rain_water,graupel,ozone_mass_mixing_ratio]
 
+atm_enkfonly: {{ DOENKFONLY_ATM | default(false, true) }}
+
 # Veritcal localization for GETKF
 vl_fraction_of_retained_variance: 0.750
 vl_lengthscale: 2.1
@@ -145,9 +147,6 @@ driver_save_prior_mean: false
 driver_save_posterior_mean_increment: false
 driver_save_posterior_ensemble_increments: true
 
-# Distribution type
-distribution_type: Halo
-
 # Diagnostics
 atmosphere_ensemble_increment_prefix: "./anl/mem%{member}%/atminc."
 atmosphere_posterior_output_gaussian: "./mem%{member}%/atmanl."
diff --git a/parm/atm/jcb-prototype_lgetkf.yaml.j2 b/parm/atm/jcb-prototype_lgetkf.yaml.j2
index feba60edd..92da4d7e3 100644
--- a/parm/atm/jcb-prototype_lgetkf.yaml.j2
+++ b/parm/atm/jcb-prototype_lgetkf.yaml.j2
@@ -1,6 +1,6 @@
 # Use observations for lgetkf
 # ---------------------------
-app_path_observations: {{PARMgfs}}/gdas/jcb-gdas/observations/atmosphere-lgetkf
+app_path_observations: {{PARMgfs}}/gdas/jcb-gdas/observations/atmosphere
 app_path_observation_chronicle: {{PARMgfs}}/gdas/jcb-gdas/observation_chronicle/atmosphere
 
 # Algorithm
@@ -11,9 +11,13 @@ algorithm: local_ensemble_da
 # ------------
 atmosphere_background_ensemble_path: ./bkg/mem%mem%
 
+# Distribution type used in OBS_DIST_LOCALIZATIONS_YAML
+{% set distribution_type = "Halo" %}
+
 # Observation things
 # ------------------
 {% include OBS_LIST_YAML %}
+{% include OBS_DIST_LOCALIZATIONS_YAML %}
 
 # Testing things
 # --------------
diff --git a/parm/atm/jcb-prototype_lgetkf_observer.yaml.j2 b/parm/atm/jcb-prototype_lgetkf_observer.yaml.j2
index f188fecf1..9672a812a 100644
--- a/parm/atm/jcb-prototype_lgetkf_observer.yaml.j2
+++ b/parm/atm/jcb-prototype_lgetkf_observer.yaml.j2
@@ -1,6 +1,6 @@
 # Use observations for lgetkf
 # ---------------------------
-app_path_observations: {{PARMgfs}}/gdas/jcb-gdas/observations/atmosphere-lgetkf
+app_path_observations: {{PARMgfs}}/gdas/jcb-gdas/observations/atmosphere
 app_path_observation_chronicle: {{PARMgfs}}/gdas/jcb-gdas/observation_chronicle/atmosphere
 
 # Algorithm
@@ -14,12 +14,13 @@ atmosphere_background_ensemble_path: ./bkg/mem%mem%
 # Naming conventions for observation files
 atmosphere_obsdataout_prefix: diag_lobs_
 
-# Distribution type
-distribution_type: RoundRobin
+# Distribution type used in OBS_DIST_LOCALIZATIONS_YAML
+{% set distribution_type = "RoundRobin" %}
 
 # Observation things
 # ------------------
 {% include OBS_LIST_YAML %}
+{% include OBS_DIST_LOCALIZATIONS_YAML %}
 
 # Testing things
 # --------------
diff --git a/parm/atm/jcb-prototype_lgetkf_solver.yaml.j2 b/parm/atm/jcb-prototype_lgetkf_solver.yaml.j2
index abd0022dd..146a57290 100644
--- a/parm/atm/jcb-prototype_lgetkf_solver.yaml.j2
+++ b/parm/atm/jcb-prototype_lgetkf_solver.yaml.j2
@@ -1,6 +1,6 @@
 # Use observations for lgetkf
 # ---------------------------
-app_path_observations: {{PARMgfs}}/gdas/jcb-gdas/observations/atmosphere-lgetkf
+app_path_observations: {{PARMgfs}}/gdas/jcb-gdas/observations/atmosphere
 app_path_observation_chronicle: {{PARMgfs}}/gdas/jcb-gdas/observation_chronicle/atmosphere
 
 # Algorithm
@@ -17,12 +17,13 @@ atmosphere_obsdatain_prefix: diag_lobs_
 atmosphere_obsdatain_suffix: "_{{ current_cycle | to_YMDH }}.nc"
 atmosphere_obsdataout_prefix: diag_solv_
 
-# Distribution type
-distribution_type: Halo
+# Distribution type used in OBS_DIST_LOCALIZATIONS_YAML
+{% set distribution_type = "Halo" %}
 
 # Observation things
 # ------------------
 {% include OBS_LIST_YAML %}
+{% include OBS_DIST_LOCALIZATIONS_YAML %}
 
 # Testing things
 # --------------