diff --git a/Geometry/GEMGeometryBuilder/data/GEMSpecs/2021/v1/GEMSpecs.xml b/Geometry/GEMGeometryBuilder/data/GEMSpecs/2021/v1/GEMSpecs.xml
new file mode 100644
index 0000000000000..36e08b6c0abe5
--- /dev/null
+++ b/Geometry/GEMGeometryBuilder/data/GEMSpecs/2021/v1/GEMSpecs.xml
@@ -0,0 +1,17 @@
+<?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="GEMSpecs.xml">
+    <SpecPar name="nStripsGE11" eval="true">
+      <PartSelector path="//GHA1.."/>
+      <Parameter name="nStrips" value="384"/>
+    </SpecPar>
+    <SpecPar name="nPadsGE11" eval="true">
+      <PartSelector path="//GHA1.."/>
+      <Parameter name="nPads" value="192"/>
+    </SpecPar>
+    <SpecPar name="dPhiGE11" eval="true">
+      <PartSelector path="//GHA1.."/>
+      <Parameter name="dPhi" value="10.15*deg"/>
+    </SpecPar>
+  </SpecParSection>
+</DDDefinition>
diff --git a/Geometry/GEMGeometryBuilder/data/v4x/GEMSpecs.xml b/Geometry/GEMGeometryBuilder/data/GEMSpecs/2021/v2/GEMSpecs.xml
similarity index 100%
rename from Geometry/GEMGeometryBuilder/data/v4x/GEMSpecs.xml
rename to Geometry/GEMGeometryBuilder/data/GEMSpecs/2021/v2/GEMSpecs.xml
diff --git a/Geometry/GEMGeometryBuilder/data/GEMSpecsFilter/2021/v1/GEMSpecsFilter.xml b/Geometry/GEMGeometryBuilder/data/GEMSpecsFilter/2021/v1/GEMSpecsFilter.xml
new file mode 100644
index 0000000000000..67d45b6b30ae6
--- /dev/null
+++ b/Geometry/GEMGeometryBuilder/data/GEMSpecsFilter/2021/v1/GEMSpecsFilter.xml
@@ -0,0 +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">
+  <SpecParSection label="GEMSpecsFilter.xml">
+    <SpecPar name="MuonGEMTree">
+      <PartSelector path="//GEMBox11L"/>      
+      <PartSelector path="//GSAX11L"/>      
+      <PartSelector path="//GEMBox11S"/>      
+      <PartSelector path="//GSAX11S"/>      
+      <PartSelector path="//GHA1..*"/>
+      <Parameter name="MuStructure" value="MuonEndCapGEM"/>
+    </SpecPar>
+  </SpecParSection>
+</DDDefinition>
diff --git a/Geometry/GEMGeometryBuilder/data/v4x/GEMSpecsFilter.xml b/Geometry/GEMGeometryBuilder/data/GEMSpecsFilter/2021/v2/GEMSpecsFilter.xml
similarity index 100%
rename from Geometry/GEMGeometryBuilder/data/v4x/GEMSpecsFilter.xml
rename to Geometry/GEMGeometryBuilder/data/GEMSpecsFilter/2021/v2/GEMSpecsFilter.xml
diff --git a/Geometry/MuonCommonData/python/testExtendedGeometry2021XML_cfi.py b/Geometry/MuonCommonData/python/testExtendedGeometry2021XML_cfi.py
index b5a091a4bea91..fa847a00f35f8 100644
--- a/Geometry/MuonCommonData/python/testExtendedGeometry2021XML_cfi.py
+++ b/Geometry/MuonCommonData/python/testExtendedGeometry2021XML_cfi.py
@@ -365,8 +365,8 @@
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
         'Geometry/RPCGeometryBuilder/data/RPCSpecs.xml',
-        'Geometry/GEMGeometryBuilder/data/v4x/GEMSpecsFilter.xml',
-        'Geometry/GEMGeometryBuilder/data/v4x/GEMSpecs.xml',
+        'Geometry/GEMGeometryBuilder/data/GEMSpecsFilter/2021/v2/GEMSpecsFilter.xml',
+        'Geometry/GEMGeometryBuilder/data/GEMSpecs/2021/v2/GEMSpecs.xml',
         'Geometry/ForwardCommonData/data/brmsens.xml',
         'Geometry/ForwardSimData/data/totemsensT2/2021/totemsensT2.xml',
         'Geometry/ForwardSimData/data/zdcsens.xml',