diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8fbba45de..0aec4002a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### Changed
 - Updated default CEDS from CEDSv2 (0.5 deg x 0.5 de) to new CEDS (0.1 deg x 0.1 deg)
+- Move Cloud-J and Fast-JX input directoryies to Cloud-J and new Fast-JX  menus respectively in geoschem_config.yml
+- Updated photolysis input directory path to use FJX_scat-aer.dat with new mineral dust values based on spheroidal shapex
 
 ### Fixed
 - Fixed CEDS `HEMCO_Config.rc` entries to emit TMB into the TMB species (and not HCOOH)
@@ -17,6 +19,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### Removed
 - `CEDSv2`, `CEDS_GBDMAPS`, `CEDS_GBDMAPSbyFuelType` emissions entries from HEMCO and ExtData template files
+- Remove Fast-JX input directory from geoschem_config.yml files except for Hg simulation
 
 ## [14.5.1] - 2025-01-10
 ### Added
diff --git a/GeosCore/input_mod.F90 b/GeosCore/input_mod.F90
index 0f85d4a0e..4e423e432 100644
--- a/GeosCore/input_mod.F90
+++ b/GeosCore/input_mod.F90
@@ -2964,7 +2964,7 @@ SUBROUTINE Config_Photolysis( Config, Input_Opt, RC )
     ! Directories with photolysis input files
     !------------------------------------------------------------------------
 
-    key   = "operations%photolysis%input_directories%fastjx_input_dir"
+    key   = "operations%photolysis%fast-jx%fastjx_input_dir"
     v_str = MISSING_STR
     CALL QFYAML_Add_Get( Config, TRIM( key ), v_str, "", RC )
     IF ( RC /= GC_SUCCESS ) THEN
@@ -2974,7 +2974,7 @@ SUBROUTINE Config_Photolysis( Config, Input_Opt, RC )
     ENDIF
     Input_Opt%FAST_JX_DIR = TRIM( v_str )
 
-    key   = "operations%photolysis%input_directories%cloudj_input_dir"
+    key   = "operations%photolysis%cloudj_input_dir"
     v_str = MISSING_STR
     CALL QFYAML_Add_Get( Config, TRIM( key ), v_str, "", RC )
     IF ( RC /= GC_SUCCESS ) THEN
diff --git a/run/CESM/geoschem_config.yml b/run/CESM/geoschem_config.yml
index fb31b6dea..37f464816 100644
--- a/run/CESM/geoschem_config.yml
+++ b/run/CESM/geoschem_config.yml
@@ -47,6 +47,7 @@ operations:
   photolysis:
     activate: true
     cloud-j:
+      cloudj_input_dir: /see/namelist/file
       num_levs_with_cloud: 22
       cloud_scheme_flag: 3
       opt_depth_increase_factor: 1.050
@@ -56,9 +57,6 @@ operations:
       sphere_correction: 1
       num_wavelength_bins: 18
       use_H2O_UV_absorption: true
-    input_directories:
-      fastjx_input_dir: /see/namelist/file
-      cloudj_input_dir: /see/namelist/file
     overhead_O3:
       use_online_O3_from_model: true
       use_column_O3_from_met: true
diff --git a/run/GCClassic/geoschem_config.yml.templates/geoschem_config.yml.Hg b/run/GCClassic/geoschem_config.yml.templates/geoschem_config.yml.Hg
index 1e9699e44..fefb192f7 100644
--- a/run/GCClassic/geoschem_config.yml.templates/geoschem_config.yml.Hg
+++ b/run/GCClassic/geoschem_config.yml.templates/geoschem_config.yml.Hg
@@ -66,6 +66,7 @@ operations:
   photolysis:
     activate: true
     cloud-j:
+      cloudj_input_dir: ${RUNDIR_DATA_ROOT}/CHEM_INPUTS/CLOUD_J/v2025-01-Hg/
       num_levs_with_cloud: ${RUNDIR_PHOT_CLD_NLEV}
       cloud_scheme_flag: 3
       opt_depth_increase_factor: 1.050
@@ -75,9 +76,8 @@ operations:
       sphere_correction: 1
       num_wavelength_bins: 18
       use_H2O_UV_absorption: true
-    input_directories:
+    fast-jx:
       fastjx_input_dir: ${RUNDIR_DATA_ROOT}/CHEM_INPUTS/FAST_JX/v2024-05-Hg/
-      cloudj_input_dir: ${RUNDIR_DATA_ROOT}/CHEM_INPUTS/CLOUD_J/v2024-09-Hg/
     overhead_O3:
       use_online_O3_from_model: ${RUNDIR_USE_ONLINE_O3}
       use_column_O3_from_met: true
diff --git a/run/GCClassic/geoschem_config.yml.templates/geoschem_config.yml.aerosol b/run/GCClassic/geoschem_config.yml.templates/geoschem_config.yml.aerosol
index 14d2fc26a..c9504cfbf 100644
--- a/run/GCClassic/geoschem_config.yml.templates/geoschem_config.yml.aerosol
+++ b/run/GCClassic/geoschem_config.yml.templates/geoschem_config.yml.aerosol
@@ -66,6 +66,7 @@ operations:
   photolysis:
     activate: true
     cloud-j:
+      cloudj_input_dir: ${RUNDIR_DATA_ROOT}/CHEM_INPUTS/CLOUD_J/v2025-01/
       num_levs_with_cloud: ${RUNDIR_PHOT_CLD_NLEV}
       cloud_scheme_flag: 3
       opt_depth_increase_factor: 1.050
@@ -75,9 +76,6 @@ operations:
       sphere_correction: 1
       num_wavelength_bins: 18
       use_H2O_UV_absorption: true
-    input_directories:
-      fastjx_input_dir: ${RUNDIR_DATA_ROOT}/CHEM_INPUTS/FAST_JX/v2024-05/
-      cloudj_input_dir: ${RUNDIR_DATA_ROOT}/CHEM_INPUTS/CLOUD_J/v2024-09/
     overhead_O3:
       use_online_O3_from_model: false
       use_column_O3_from_met: true
diff --git a/run/GCClassic/geoschem_config.yml.templates/geoschem_config.yml.fullchem b/run/GCClassic/geoschem_config.yml.templates/geoschem_config.yml.fullchem
index 3e31a5a1e..e545d7741 100644
--- a/run/GCClassic/geoschem_config.yml.templates/geoschem_config.yml.fullchem
+++ b/run/GCClassic/geoschem_config.yml.templates/geoschem_config.yml.fullchem
@@ -89,6 +89,7 @@ operations:
   photolysis:
     activate: true
     cloud-j:
+      cloudj_input_dir: ${RUNDIR_DATA_ROOT}/CHEM_INPUTS/CLOUD_J/v2025-01/
       num_levs_with_cloud: ${RUNDIR_PHOT_CLD_NLEV}
       cloud_scheme_flag: 3
       opt_depth_increase_factor: 1.050
@@ -98,9 +99,6 @@ operations:
       sphere_correction: 1
       num_wavelength_bins: 18
       use_H2O_UV_absorption: true
-    input_directories:
-      fastjx_input_dir: ${RUNDIR_DATA_ROOT}/CHEM_INPUTS/FAST_JX/v2024-05/
-      cloudj_input_dir: ${RUNDIR_DATA_ROOT}/CHEM_INPUTS/CLOUD_J/v2024-09/
     overhead_O3:
       use_online_O3_from_model: ${RUNDIR_USE_ONLINE_O3}
       use_column_O3_from_met: true
diff --git a/run/GCHP/geoschem_config.yml.templates/geoschem_config.yml.fullchem b/run/GCHP/geoschem_config.yml.templates/geoschem_config.yml.fullchem
index 1e9573d92..bdf1e4fca 100644
--- a/run/GCHP/geoschem_config.yml.templates/geoschem_config.yml.fullchem
+++ b/run/GCHP/geoschem_config.yml.templates/geoschem_config.yml.fullchem
@@ -73,6 +73,7 @@ operations:
   photolysis:
     activate: true
     cloud-j:
+      cloudj_input_dir: ${RUNDIR_DATA_ROOT}/CHEM_INPUTS/CLOUD_J/v2025-01/
       num_levs_with_cloud: ${RUNDIR_PHOT_CLD_NLEV}
       cloud_scheme_flag: 3
       opt_depth_increase_factor: 1.050
@@ -82,9 +83,6 @@ operations:
       sphere_correction: 1
       num_wavelength_bins: 18
       use_H2O_UV_absorption: true
-    input_directories:
-      fastjx_input_dir: ${RUNDIR_DATA_ROOT}/CHEM_INPUTS/FAST_JX/v2024-05/
-      cloudj_input_dir: ${RUNDIR_DATA_ROOT}/CHEM_INPUTS/CLOUD_J/v2024-09/
     overhead_O3:
       use_online_O3_from_model: ${RUNDIR_USE_ONLINE_O3}
       use_column_O3_from_met: true
diff --git a/run/GEOS/geoschem_config.yml b/run/GEOS/geoschem_config.yml
index dbdb8feb3..ed6c6a6bf 100644
--- a/run/GEOS/geoschem_config.yml
+++ b/run/GEOS/geoschem_config.yml
@@ -60,6 +60,7 @@ operations:
   photolysis:
     activate: true
     cloud-j:
+      cloudj_input_dir: /discover/nobackup/projects/gmao/share/dasilva/fvInput/ExtData/chemistry/GEOSCHEMchem/v0.0.0/CHEM_INPUTS/CLOUD_J/v2025-01/
       num_levs_with_cloud: 34
       cloud_scheme_flag: 3
       opt_depth_increase_factor: 1.050
@@ -69,9 +70,6 @@ operations:
       sphere_correction: 1
       num_wavelength_bins: 18
       use_H2O_UV_absorption: true
-    input_directories:
-      fastjx_input_dir: /discover/nobackup/projects/gmao/share/dasilva/fvInput/ExtData/chemistry/GEOSCHEMchem/v0.0.0/CHEM_INPUTS/FAST_JX/v2023-10/
-      cloudj_input_dir: /discover/nobackup/projects/gmao/share/dasilva/fvInput/ExtData/chemistry/GEOSCHEMchem/v0.0.0/CHEM_INPUTS/CLOUD_J/v2024-09/
     overhead_O3:
       use_online_O3_from_model: true
       use_column_O3_from_met: true
diff --git a/run/WRF/fullchem/geoschem_config.yml b/run/WRF/fullchem/geoschem_config.yml
index e59444f91..971f0488f 100644
--- a/run/WRF/fullchem/geoschem_config.yml
+++ b/run/WRF/fullchem/geoschem_config.yml
@@ -68,6 +68,7 @@ operations:
   photolysis:
     activate: true
     cloud-j:
+      cloudj_input_dir: /n/holyscratch01/external_repos/GEOS-CHEM/gcgrid/data/ExtData/CHEM_INPUTS/CLOUD_J/v2025-01/
       num_levs_with_cloud: 20
       cloud_scheme_flag: 3
       opt_depth_increase_factor: 1.050
@@ -77,9 +78,6 @@ operations:
       sphere_correction: 1
       num_wavelength_bins: 18
       use_H2O_UV_absorption: true
-    input_directories:
-      fastjx_input_dir: /n/holyscratch01/external_repos/GEOS-CHEM/gcgrid/data/ExtData/CHEM_INPUTS/FAST_JX/v2024-05/
-      cloudj_input_dir: /n/holyscratch01/external_repos/GEOS-CHEM/gcgrid/data/ExtData/CHEM_INPUTS/CLOUD_J/v2024-09/
     overhead_O3:
       use_online_O3_from_model: true 
       use_column_O3_from_met: true