diff --git a/bld/build-namelist b/bld/build-namelist
index aa3e8832ea..51ed6488ba 100755
--- a/bld/build-namelist
+++ b/bld/build-namelist
@@ -2965,17 +2965,9 @@ if ($maxzen>0.0) {
 # upper boundary specifier
 my $ubc_ver;
 if (($chem =~ /waccm_ma/ or $chem =~ /waccm_tsmlt/ or $chem =~ /waccm_t4ma/) and !$waccmx) {
-    if ($phys =~ /cam7/) {
-	$ubc_ver = 'waccm7chem';
-    } else {
-	$ubc_ver = 'waccmchem';
-    }
+    $ubc_ver = 'waccmchem';
 } elsif ($chem =~ /waccm_sc/ or ($model_top eq "ht" and $chem =~ /ghg_mam/)) {
-    if ($phys =~ /cam7/) {
-	$ubc_ver = 'waccm7sc';
-    } else {
-	$ubc_ver = 'waccmsc';
-    }
+    $ubc_ver = 'waccmsc';
 }
 if (defined $ubc_ver) {
     add_default($nl, 'ubc_specifier', 'ver'=>$ubc_ver);
diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml
index 2693fa62f7..4be0642a75 100644
--- a/bld/namelist_files/namelist_defaults_cam.xml
+++ b/bld/namelist_files/namelist_defaults_cam.xml
@@ -189,6 +189,11 @@
 <ncdata hgrid="ne16np4"  nlev="130" waccmx="1"     >atm/waccm/ic/FX2000_ne16pg3_spinup01.cam.i.0002-01-01_c251215.nc</ncdata>
 <ncdata hgrid="ne16np4"  nlev="58"                 >atm/cam/inic/se/FHISTC_LTso_ne16pg3_ne16pg3_mg17.i.c260220.nc</ncdata>
 <ncdata hgrid="ne16np4"  nlev="93"                 >atm/cam/inic/se/FHISTC_MTso_ne16pg3_ne16pg3_mg17.i.c260220.nc</ncdata>
+<ncdata hgrid="ne3np4"   nlev="135" waccm_phys="1" >atm/waccm/ic/FHISTC_WAt1ma_ne3pg3_spinup01.cam.i.1980-01-01_c261018.nc</ncdata>
+<ncdata hgrid="ne16np4"  nlev="135" waccm_phys="1" >atm/waccm/ic/f.e30.FHISTC_WAt1ma.ne16pg3_mg17_L135_cam6_4_cam6_4_201_beres0.15.cam.i.1980-01-01_c260909.nc</ncdata>
+<ncdata hgrid="ne30np4"  nlev="135" waccm_phys="1" >atm/waccm/ic/f.e30.FHISTC_WAt1ma.ne30pg3_mg17_L135_cam6_4_201_beres0.15.cam.i.1980-01-01_c261017.nc</ncdata>
+<ncdata hgrid="ne16np4"  nlev="189" waccmx="1"     >atm/waccm/ic/FHISTC_WXma_ne16pg3_watervapor_spinup02.cam.i.1980-01-01_c261015.nc</ncdata>
+<ncdata hgrid="ne30np4"  nlev="189" waccmx="1"     >atm/waccm/ic/FHISTC_WXma_ne30pg3_watervapor_spinup02.cam.i.1980-01-01_c261015.nc</ncdata>
 
 <ncdata hgrid="ne30np4"  nlev="26"                 >atm/cam/inic/se/ape_topo_cam4_ne30np4_L26_c171020.nc</ncdata>
 <ncdata hgrid="ne30np4"  nlev="26"  aquaplanet="1" >atm/cam/inic/se/ape_cam4_ne30np4_L26_c170417.nc</ncdata>
@@ -2099,13 +2104,6 @@
 <ubc_specifier ver="waccmsc">
   'T->MSIS','Q->2.d-8vmr','CH4->2.d-10vmr'
 </ubc_specifier>
-<!-- WACCM7 -- do not include water vapor for now -->
-<ubc_specifier ver="waccm7chem">
-  'T->MSIS','CH4->2.d-10vmr','F->1.0D-15mmr','HF->1.0D-15mmr','H->MSIS','N->MSIS','O->MSIS','O2->MSIS','H2->TGCM','NO->SNOE'
-</ubc_specifier>
-<ubc_specifier ver="waccm7sc">
-  'T->MSIS','CH4->2.d-10vmr'
-</ubc_specifier>
 
 <!-- Boundary data for Tropopheric Chemistry -->
 <fstrat_file    >atm/cam/chem/trop_mozart/ub/ubvals_b40.20th.track1_1996-2005_c110315.nc</fstrat_file>
diff --git a/bld/namelist_files/use_cases/waccm_ma_hist_cam7.xml b/bld/namelist_files/use_cases/waccm_ma_hist_cam7.xml
index 252b293ed7..27fb325545 100644
--- a/bld/namelist_files/use_cases/waccm_ma_hist_cam7.xml
+++ b/bld/namelist_files/use_cases/waccm_ma_hist_cam7.xml
@@ -14,12 +14,6 @@
 <epp_all_filepath>atm/cam/solar/SolarForcingCMIP7-4.6_18491230-20240101_sumEPP_c20250630.nc</epp_all_filepath>
 <epp_all_varname>'epp_ion_rates'</epp_all_varname>
 
-<!--Species IC -->
-<ncdata dyn="se" hgrid="ne30np4" nlev="135">atm/waccm/ic/FHIST_WAt1ma_ne30pg3_spinup01.cam.i.1980-01-01-00000_c250124.nc</ncdata>
-<ncdata dyn="se" hgrid="ne16np4" nlev="135">/glade/work/fvitt/waccm_ic/FHISTC_WAt1ma_ne16pg3_watervapor_initial_spinup01.cam.i.1980-01-01-00000.nc</ncdata>
-<ncdata dyn="se" hgrid="ne30np4" nlev="189">atm/waccm/ic/FHIST_WXma_ne30pg3_spinup03.cam.i.1980-01-01-00000_c250201.nc</ncdata>
-<ncdata dyn="se" hgrid="ne16np4" nlev="189">atm/waccm/ic/FHIST_WXma_ne16pg3_spinup02.cam.i.1980-01-01-00000_c250201.nc</ncdata>
-
 <!-- LBC, UBC Files -->
 <flbc_type>SERIAL</flbc_type>
 <flbc_list>
diff --git a/bld/namelist_files/use_cases/waccm_sc_hist_cam7.xml b/bld/namelist_files/use_cases/waccm_sc_hist_cam7.xml
index 4f592c3886..b477a25be2 100644
--- a/bld/namelist_files/use_cases/waccm_sc_hist_cam7.xml
+++ b/bld/namelist_files/use_cases/waccm_sc_hist_cam7.xml
@@ -10,12 +10,6 @@
 <!-- Kp and F10.7 -->
 <solar_parms_data_file>atm/cam/solar/SolarForcingCMIP7-4.6_18491230-20240101_sumEPP_c20250630.nc</solar_parms_data_file>
 
-<!--Species IC -->
-<ncdata dyn="se" hgrid="ne30np4" nlev="135">atm/waccm/ic/FHIST_WAt1ma_ne30pg3_spinup01.cam.i.1980-01-01-00000_c250124.nc</ncdata>
-<ncdata dyn="se" hgrid="ne16np4" nlev="135">atm/waccm/ic/FHIST_WAt1ma_ne16pg3_spinup01.cam.i.1980-01-01-00000_c250124.nc</ncdata>
-<ncdata dyn="se" hgrid="ne30np4" nlev="189">atm/waccm/ic/FHIST_WXma_ne30pg3_spinup03.cam.i.1980-01-01-00000_c250201.nc</ncdata>
-<ncdata dyn="se" hgrid="ne16np4" nlev="189">atm/waccm/ic/FHIST_WXma_ne16pg3_spinup02.cam.i.1980-01-01-00000_c250201.nc</ncdata>
-
 <!-- LBC, UBC Files -->
 <flbc_type>SERIAL</flbc_type>
 <flbc_list>'CO2','CH4','N2O','CFC11','CFC12','CFC11eq'</flbc_list>