diff --git a/.github/workflows/preview_namelist.yaml b/.github/workflows/preview_namelist.yaml
index c29b49fbb4..72db3aacd4 100644
--- a/.github/workflows/preview_namelist.yaml
+++ b/.github/workflows/preview_namelist.yaml
@@ -13,7 +13,7 @@ jobs:
         # Lots of python versions, pare down if we don't support a version
         python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
         config:
-          - {"compset": "BLT1850", "res": "ne30pg3_t232"} # fully coupled
+          - {"compset": "B1850CM", "res": "ne30pg3_t232"} # fully coupled
           - {"compset": "C_JRA", "res": "TL319_t232"}     # ocean only
           - {"compset": "C1850MARBL_JRA", "res": "TL319_t232"}     # ocean only, with BGC
           - {"compset": "DTEST", "res": "TL319_t232"}     # ice only
diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml
index c0cd2b83d9..2c060884ad 100644
--- a/cime_config/config_compsets.xml
+++ b/cime_config/config_compsets.xml
@@ -47,22 +47,11 @@
     <lname>1850C_CAM70%MT%CT4S_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
   </compset>
 
-
   <compset>
     <alias>B1850C_MTso</alias>
     <lname>1850C_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
   </compset>
 
-  <compset>
-    <alias>BMT1850</alias>
-    <lname>1850C_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
-  </compset>
-
-  <compset>
-    <alias>BMT1850_MARBL</alias>
-    <lname>1850_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_SWAV</lname>
-  </compset>
-
   <compset>
     <alias>BHISTC_MTso</alias>
     <lname>HISTC_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
@@ -72,24 +61,30 @@
     <alias>BHISTC_MTt4s</alias>
     <lname>HISTC_CAM70%MT%CT4S_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
   </compset>
+
   <compset>
     <alias>BHISTCM</alias>
     <lname>HISTC_CAM70%MT%CT4S_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
   </compset>
 
-
   <compset>
-    <alias>B1850C_LTso</alias>
-    <lname>1850C_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
+    <alias>BHISTC_MTso</alias>
+    <lname>HISTC_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
   </compset>
+<!--  Not yet available in cam component
   <compset>
-    <alias>BLT1850</alias>
-    <lname>1850C_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
+    <alias>B1850C_WAt4ma</alias>
+    <lname>1850C_CAM70%HT%CT4MA_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
   </compset>
 
   <compset>
-    <alias>BLT1850_MARBL</alias>
-    <lname>1850_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_SWAV</lname>
+    <alias>BHISTC_WAt4ma</alias>
+    <lname>1850_CAM70%HT%CT4MA_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV</lname>
+  </compset>
+-->
+  <compset>
+    <alias>B1850C_LTso</alias>
+    <lname>1850C_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
   </compset>
 
   <compset>
@@ -97,6 +92,7 @@
     <lname>HISTC_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
   </compset>
 
+
   <!-- Emissions driven compsets for CESM3 -->
 
   <compset>
@@ -107,6 +103,15 @@
     <alias>B1850EM</alias>
     <lname>1850E_CAM70%MT%CT4S_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
   </compset>
+  
+  <compset>
+    <alias>BHISTE_MTt4s</alias>
+    <lname>HISTE_CAM70%MT%CT4S_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
+  </compset>
+  <compset>
+    <alias>BHISTEM</alias>
+    <lname>HISTE_CAM70%MT%CT4S_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
+  </compset>
 
   <!-- SOM compsets -->