diff --git a/Geometry/MuonSimData/data/muonProdCuts/2021/v2/muonProdCuts.xml b/Geometry/MuonSimData/data/muonProdCuts/2021/v2/muonProdCuts.xml
index e5568bf8dc703..150c22527bec6 100644
--- a/Geometry/MuonSimData/data/muonProdCuts/2021/v2/muonProdCuts.xml
+++ b/Geometry/MuonSimData/data/muonProdCuts/2021/v2/muonProdCuts.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
-<DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../DetectorDescription/Schema/DDLSchema.xsd">
+<DDDefinition>
  <SpecParSection label="ProductionCuts" eval="true">
   <SpecPar name="Muon">
    <PartSelector path="//MUON"/>
    <Parameter name="CMSCutsRegion" value="Muon" eval="false"/>
    <Parameter name="ProdCutsForGamma" value="100.*mm"/>
    <Parameter name="ProdCutsForElectrons" value="10.*mm"/>
-   <Parameter name="ProdCutsForProtons" value="10.*mm"/>
    <Parameter name="ProdCutsForPositrons" value="10.*mm"/>
+   <Parameter name="ProdCutsForProtons" value="10.*mm"/>
   </SpecPar>
   <SpecPar name="MuonIron">
    <PartSelector path="//MGNT"/>
@@ -21,14 +21,15 @@
    <PartSelector path="//YE1.*"/>
    <PartSelector path="//YE2.*"/>
    <PartSelector path="//YE3.*"/>
-   <!-- if you want to re-stage YE4, then remove the comments around this element   <PartSelector path="//YE4.*"/>   -->
+   <PartSelector path="//YE4.*"/>
+   <PartSelector path="//MB4Shield.*"/>
    <PartSelector path="//ShieldingME4.*"/>
+   <PartSelector path="//ShieldingAnti.*"/>
    <PartSelector path="//ShieldingBoronPoly.*"/>
    <PartSelector path="//ME11SupportDisk"/>
    <Parameter name="CMSCutsRegion" value="MuonIron" eval="false"/>
    <Parameter name="ProdCutsForGamma" value="1.*mm"/>
    <Parameter name="ProdCutsForElectrons" value="1.*mm"/>
-   <Parameter name="ProdCutsForProtons" value="1.*mm"/>
    <Parameter name="ProdCutsForPositrons" value="1.*mm"/>
   </SpecPar>
   <SpecPar name="MuonChamber">
@@ -40,7 +41,6 @@
    <Parameter name="CMSCutsRegion" value="MuonChamber" eval="false"/>
    <Parameter name="ProdCutsForGamma" value="1.*mm"/>
    <Parameter name="ProdCutsForElectrons" value="0.002*mm"/>
-   <Parameter name="ProdCutsForProtons" value="0.002*mm"/>
    <Parameter name="ProdCutsForPositrons" value="0.002*mm"/>
   </SpecPar>
   <SpecPar name="MuonSensitive_DT-CSC">
@@ -51,9 +51,14 @@
    <Parameter name="CMSCutsRegion" value="MuonSensitive_DT-CSC" eval="false"/>
    <Parameter name="ProdCutsForGamma" value="25.*mm"/>
    <Parameter name="ProdCutsForElectrons" value="1.*mm"/>
-   <Parameter name="ProdCutsForProtons" value="1.*mm"/>
    <Parameter name="ProdCutsForPositrons" value="2.5*m"/>
   </SpecPar>
+  <SpecPar name="MuonSensitive_GEM">
+   <PartSelector path="//GHA.*"/>
+   <Parameter name="ProdCutsForGamma" value="1.*mm"/>
+   <Parameter name="ProdCutsForElectrons" value="0.002*mm"/>
+   <Parameter name="ProdCutsForPositrons" value="0.002*mm"/>
+  </SpecPar>
   <SpecPar name="MuonSensitive_RPC">
    <!-- 10 keV for gamma/e-, 1 MeV for e+ -->
    <PartSelector path="//MB.*RPC_.*Gas.*"/>
@@ -68,7 +73,6 @@
    <Parameter name="CMSCutsRegion" value="MuonSensitive_RPC" eval="false"/>
    <Parameter name="ProdCutsForGamma" value="8.5*m"/>
    <Parameter name="ProdCutsForElectrons" value="8.*mm"/>
-   <Parameter name="ProdCutsForProtons" value="8.*mm"/>
    <Parameter name="ProdCutsForPositrons" value="2.5*m"/>
   </SpecPar>
  </SpecParSection>
diff --git a/Geometry/MuonSimData/data/muonProdCuts/2021/v3/muonProdCuts.xml b/Geometry/MuonSimData/data/muonProdCuts/2021/v3/muonProdCuts.xml
index 8d5c5b1c94157..4151f9810bb19 100644
--- a/Geometry/MuonSimData/data/muonProdCuts/2021/v3/muonProdCuts.xml
+++ b/Geometry/MuonSimData/data/muonProdCuts/2021/v3/muonProdCuts.xml
@@ -4,9 +4,10 @@
   <SpecPar name="Muon">
    <PartSelector path="//MUON"/>
    <Parameter name="CMSCutsRegion" value="Muon" eval="false"/>
-   <Parameter name="ProdCutsForGamma" value="1.0*cm"/>
-   <Parameter name="ProdCutsForElectrons" value="1.0*cm"/>
-   <Parameter name="ProdCutsForPositrons" value="1.0*cm"/>
+   <Parameter name="ProdCutsForGamma" value="100.*mm"/>
+   <Parameter name="ProdCutsForElectrons" value="10.*mm"/>
+   <Parameter name="ProdCutsForPositrons" value="10.*mm"/>
+   <Parameter name="ProdCutsForProtons" value="10.*mm"/>
   </SpecPar>
   <SpecPar name="MuonIron">
    <PartSelector path="//MGNT"/>
@@ -27,9 +28,9 @@
    <PartSelector path="//ShieldingBoronPoly.*"/>
    <PartSelector path="//ME11SupportDisk"/>
    <Parameter name="CMSCutsRegion" value="MuonIron" eval="false"/>
-   <Parameter name="ProdCutsForGamma" value="1.0*cm"/>
-   <Parameter name="ProdCutsForElectrons" value="1.0*mm"/>
-   <Parameter name="ProdCutsForPositrons" value="1.0*mm"/>
+   <Parameter name="ProdCutsForGamma" value="1.*mm"/>
+   <Parameter name="ProdCutsForElectrons" value="1.*mm"/>
+   <Parameter name="ProdCutsForPositrons" value="1.*mm"/>
   </SpecPar>
   <SpecPar name="MuonChamber">
    <PartSelector path="//MB.*N"/>
@@ -38,7 +39,7 @@
    <PartSelector path="//RR.*"/>
    <PartSelector path="//GE.*"/>
    <Parameter name="CMSCutsRegion" value="MuonChamber" eval="false"/>
-   <Parameter name="ProdCutsForGamma" value="1.0*mm"/>
+   <Parameter name="ProdCutsForGamma" value="1.*mm"/>
    <Parameter name="ProdCutsForElectrons" value="0.002*mm"/>
    <Parameter name="ProdCutsForPositrons" value="0.002*mm"/>
   </SpecPar>
@@ -47,11 +48,16 @@
    <PartSelector path="//MB.*PhiGas"/>
    <PartSelector path="//MB.*ZGas"/>
    <PartSelector path="//ME.*ActiveGasVol"/>
-   <PartSelector path="//GHA.*"/>
    <Parameter name="CMSCutsRegion" value="MuonSensitive_DT-CSC" eval="false"/>
-   <Parameter name="ProdCutsForGamma" value="1.0*cm"/>
-   <Parameter name="ProdCutsForElectrons" value="1.0*mm"/>
-   <Parameter name="ProdCutsForPositrons" value="1.0*cm"/>
+   <Parameter name="ProdCutsForGamma" value="25.*mm"/>
+   <Parameter name="ProdCutsForElectrons" value="1.*mm"/>
+   <Parameter name="ProdCutsForPositrons" value="2.5*m"/>
+  </SpecPar>
+  <SpecPar name="MuonSensitive_GEM">
+   <PartSelector path="//GHA.*"/>
+   <Parameter name="ProdCutsForGamma" value="1.*mm"/>
+   <Parameter name="ProdCutsForElectrons" value="0.002*mm"/>
+   <Parameter name="ProdCutsForPositrons" value="0.002*mm"/>
   </SpecPar>
   <SpecPar name="MuonSensitive_RPC">
    <!-- 10 keV for gamma/e-, 1 MeV for e+ -->
@@ -63,9 +69,9 @@
    <!--    <PartSelector path="//REG.*"/>  -->
    <!--    <PartSelector path="//REH.*"/>  -->
    <Parameter name="CMSCutsRegion" value="MuonSensitive_RPC" eval="false"/>
-   <Parameter name="ProdCutsForGamma" value="1.0*cm"/>
-   <Parameter name="ProdCutsForElectrons" value="8.0*mm"/>
-   <Parameter name="ProdCutsForPositrons" value="1.0*cm"/>
+   <Parameter name="ProdCutsForGamma" value="8.5*m"/>
+   <Parameter name="ProdCutsForElectrons" value="8.*mm"/>
+   <Parameter name="ProdCutsForPositrons" value="2.5*m"/>
   </SpecPar>
  </SpecParSection>
 </DDDefinition>
diff --git a/Geometry/MuonSimData/data/muonSens/2021/v2/muonSens.xml b/Geometry/MuonSimData/data/muonSens/2021/v2/muonSens.xml
deleted file mode 100644
index 0529c79b68a2f..0000000000000
--- a/Geometry/MuonSimData/data/muonSens/2021/v2/muonSens.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0"?>
-<DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../DetectorDescription/Schema/DDLSchema.xsd">
-  <SpecParSection label="muonsensitive">
-    <SpecPar name="barrel">
-      <PartSelector path="//MBSLPhiGas"/>
-      <PartSelector path="//MBChimSLPhiGas"/>
-      <PartSelector path="//MB1SLZGas"/>
-      <PartSelector path="//MB2SLZGas"/>
-      <PartSelector path="//MB3SLZGas"/>
-      <Parameter name="SensitiveDetector" value="MuonSensitiveDetector"/>
-      <Parameter name="ReadOutName" value="MuonDTHits"/>
-    </SpecPar>
-    <SpecPar name="rpc">
-      <PartSelector path="//MB.*RPC.*Gas.*"/>
-      <PartSelector path="//REB1"/>
-      <PartSelector path="//REB2"/>
-      <PartSelector path="//REB3"/>
-      <PartSelector path="//REC1"/>
-      <PartSelector path="//REC2"/>
-      <PartSelector path="//REC3"/>
-      <PartSelector path="//REE1"/>
-      <PartSelector path="//REE2"/>
-      <PartSelector path="//REE3"/>
-      <PartSelector path="//REF1"/>
-      <PartSelector path="//REF2"/>
-      <PartSelector path="//REF3"/>
-      <Parameter name="SensitiveDetector" value="MuonSensitiveDetector"/>
-      <Parameter name="ReadOutName" value="MuonRPCHits"/>
-    </SpecPar>
-    <SpecPar name="endcap">
-      <PartSelector path="//ME11_ActiveGasVol"/>
-      <PartSelector path="//ME12_ActiveGasVol"/>
-      <PartSelector path="//ME13_ActiveGasVol"/>
-      <PartSelector path="//ME1A_ActiveGasVol"/>
-      <PartSelector path="//ME21_ActiveGasVol"/>
-      <PartSelector path="//ME22_ActiveGasVol"/>
-      <PartSelector path="//ME31_ActiveGasVol"/>
-      <PartSelector path="//ME32_ActiveGasVol"/>
-      <PartSelector path="//ME41_ActiveGasVol"/>
-      <PartSelector path="//ME42_ActiveGasVol"/>
-      <Parameter name="SensitiveDetector" value="MuonSensitiveDetector"/>
-      <Parameter name="ReadOutName" value="MuonCSCHits"/>
-    </SpecPar>
-    <SpecPar name="gem">
-      <PartSelector path="//GHA1..*"/>
-      <Parameter name="SensitiveDetector" value="MuonSensitiveDetector"/>
-      <Parameter name="ReadOutName" value="MuonGEMHits"/>
-    </SpecPar>
-  </SpecParSection>
-</DDDefinition>