diff --git a/Configuration/Geometry/python/dict2021Geometry.py b/Configuration/Geometry/python/dict2021Geometry.py
index 0ea1374d7e778..8ddd9095f0f10 100644
--- a/Configuration/Geometry/python/dict2021Geometry.py
+++ b/Configuration/Geometry/python/dict2021Geometry.py
@@ -2584,6 +2584,105 @@
         ],
         "reco" :[
 
+        ],
+    },
+    "P7" : {
+        2 : [
+            'Geometry/VeryForwardData/data/RP_Box.xml',
+            'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_000.xml',
+            'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_001.xml',
+            'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_002.xml',
+            'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_003.xml',
+            'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_004.xml',
+            'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_005.xml',
+            'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_020.xml',
+            'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_021.xml',
+            'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_022.xml',
+            'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_023.xml',
+            'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_024.xml',
+            'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_025.xml',
+            'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_100.xml',
+            'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_101.xml',
+            'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_102.xml',
+            'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_103.xml',
+            'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_104.xml',
+            'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_105.xml',
+            'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_120.xml',
+            'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_121.xml',
+            'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_122.xml',
+            'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_123.xml',
+            'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_124.xml',
+            'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_125.xml',
+            'Geometry/VeryForwardData/data/RP_Hybrid/v2/RP_Hybrid.xml',
+            'Geometry/VeryForwardData/data/RP_Materials/v4/RP_Materials.xml',
+            'Geometry/VeryForwardData/data/RP_Transformations.xml',
+            'Geometry/VeryForwardData/data/RP_Detectors_Assembly.xml',
+            'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_000.xml',
+            'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_001.xml',
+            'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_002.xml',
+            'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_004.xml',
+            'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_005.xml',
+            'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_020.xml',
+            'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_021.xml',
+            'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_024.xml',
+            'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_025.xml',
+            'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_100.xml',
+            'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_101.xml',
+            'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_102.xml',
+            'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_104.xml',
+            'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_105.xml',
+            'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_120.xml',
+            'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_121.xml',
+            'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_124.xml',
+            'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_125.xml',
+            'Geometry/VeryForwardData/data/RP_Device/v1/RP_Device.xml',
+            'Geometry/VeryForwardData/data/RP_Vertical_Device/2021/Simu/v2/RP_Vertical_Device.xml',
+            'Geometry/VeryForwardData/data/RP_Horizontal_Device/2021/Simu/v2/RP_Horizontal_Device.xml',
+            'Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_220_Right_Station.xml',
+            'Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_220_Left_Station.xml',
+            'Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_210_Right_Station.xml',
+            'Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_210_Left_Station.xml',
+            'Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_Stations_Assembly.xml',
+            'Geometry/VeryForwardData/data/CTPPS_2021/Cuts_Per_Region/Simu/v1/CTPPS_Cuts_Per_Region.xml',
+            'Geometry/VeryForwardData/data/RP_Sensitive_Dets.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_Transformations.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_Parameters.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Timing_Station_Parameters.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Timing_Horizontal_Pot/v2/CTPPS_Timing_Horizontal_Pot.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern1_Segment1.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern2_Segment1.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern2_Segment2.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment1.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment2.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment3.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment4.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment1.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment2.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment3.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment4.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment5.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane1.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane2.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane3.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane4.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Detector_Assembly/v1/CTPPS_Diamond_Detector_Assembly.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/Simu/v1/CTPPS_Detectors_Assembly_022.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/Simu/v1/CTPPS_Detectors_Assembly_122.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_Sensitive_Dets_TimingHits.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/ppstrackerMaterials.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v3/PPS_Pixel_Module_2x2_Run3.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/PPS_Pixel_Sens.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_003.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_023.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_103.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_123.xml',
+            'Geometry/VeryForwardData/data/CTPPS_2021/RP_Dist_Beam_Cent/Simu/v1/RP_Dist_Beam_Cent.xml',
+        ],
+        "sim" : [
+
+        ],
+        "reco" :[
+
         ],
     },
 }
diff --git a/Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_003.xml b/Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_003.xml
new file mode 100644
index 0000000000000..3b7b5b744a527
--- /dev/null
+++ b/Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_003.xml
@@ -0,0 +1,104 @@
+<?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 ../../DDLSchema/DDLSchema.xsd">
+  <ConstantsSection label="CTPPS_Pixel_Assembly_Box_Real_003.xml">
+    <Constant name="RotAngle"              value="20.0*deg"/> <!-- was 18.4 degrees -->
+
+    <Constant name="FullModuleThickness"   value="[PPS_Pixel_Module_2x2_Run3:EnvelopT]+[PPS_Pixel_Module_2x2_Run3:ROChipT]+[PPS_Pixel_Module_2x2_Run3:WaferT]" />
+
+
+    <Constant name="Offset_wrt_RP_bottom" value="0.25*mm"/> 
+    <Constant name="Planes_spacing_different_support" value="4.044*mm" />   <!-- TBC -->
+    <Constant name="Planes_spacing_OFFSET" value="0.0*mm" />   
+
+    <!-- module Y offset = 0 if all modules oriented in the same direction -->
+
+    <Constant name="ModuleOffset"   value="0.00*mm" />
+    <!-- offset to align the sensors:  www.ge.infn.it/~ferro/CMS/CTPPS_offset_piani.pdf -->
+  </ConstantsSection>
+  
+
+  <RotationSection label="CTPPS_Pixel_Assembly_Box_Real_003.xml">
+    <Rotation name="ModuleROTATION" thetaX="90*deg"  phiX="0*deg" 
+              thetaY="90*deg-[RotAngle]"  phiY="90*deg" 
+              thetaZ="-[RotAngle]" phiZ="90*deg"/>  <!-- rotation of RotAngle around x axis -->
+
+    
+    <Rotation name="ModuleROTATIONmirror" thetaX="90*deg"  phiX="180*deg" 
+              thetaY="90*deg-[RotAngle]"  phiY="90*deg" 
+              thetaZ="180*deg-[RotAngle]" phiZ="90*deg"/>  
+
+    <Rotation name="ModuleROTATIONmirror2" thetaX="90*deg"  phiX="180*deg" 
+              thetaY="90*deg+[RotAngle]"  phiY="90*deg" 
+              thetaZ="180*deg+[RotAngle]" phiZ="90*deg"/>  
+
+  </RotationSection>
+
+
+
+  <PosPartSection label="CTPPS_Pixel_Assembly_Box_Real_003.xml">
+
+
+    <PosPart copyNumber="1">
+
+      <rParent name="RP_Box_003:RP_box_secondary_vacuum"/>
+      <rChild name="PPS_Pixel_Module_2x2_Run3:Envelop"/>
+ <!--     <Translation x="-0.4*mm" y="-[RP_Box:RP_Box_Secondary_Vacuum_Height]/2+[RP_Box:RP_Box_Bottom_Wall_Thickness]/2+[PPS_Pixel_Module_2x2_Run3:EnvelopL]*cos([RotAngle])+[Offset_wrt_RP_bottom]-15*mm" z="-(1.5*[Planes_spacing_different_support]) + [Planes_spacing_OFFSET]"/>
+-->
+ <Translation x="-0.4*mm" y="-[RP_Box:RP_Box_Secondary_Vacuum_Height]/2.+[PPS_Pixel_Module_2x2_Run3:EnvelopL]/2.*cos([RotAngle])+[Offset_wrt_RP_bottom]" z="-(1.5*[Planes_spacing_different_support]) + [Planes_spacing_OFFSET]"/>
+      <rRotation name="ModuleROTATIONmirror2"/>
+
+    </PosPart>
+
+    <PosPart copyNumber="2">
+
+      <rParent name="RP_Box_003:RP_box_secondary_vacuum"/>
+      <rChild name="PPS_Pixel_Module_2x2_Run3:Envelop"/>
+      <Translation x="-0.4*mm" y="-[RP_Box:RP_Box_Secondary_Vacuum_Height]/2.+[PPS_Pixel_Module_2x2_Run3:EnvelopL]/2.*cos([RotAngle])+[Offset_wrt_RP_bottom]" z="-0.5*[Planes_spacing_different_support] + [Planes_spacing_OFFSET]"/>
+      <rRotation name="ModuleROTATIONmirror2"/>
+
+    </PosPart>
+
+    <PosPart copyNumber="3">
+
+      <rParent name="RP_Box_003:RP_box_secondary_vacuum"/>
+      <rChild name="PPS_Pixel_Module_2x2_Run3:Envelop"/>
+      <Translation x="-0.4*mm" y="-[RP_Box:RP_Box_Secondary_Vacuum_Height]/2.+[PPS_Pixel_Module_2x2_Run3:EnvelopL]/2.*cos([RotAngle])+[Offset_wrt_RP_bottom]" z="0.5*[Planes_spacing_different_support] + [Planes_spacing_OFFSET]"/>
+      <rRotation name="ModuleROTATIONmirror2"/>
+
+    </PosPart>
+
+    <PosPart copyNumber="4">
+
+      <rParent name="RP_Box_003:RP_box_secondary_vacuum"/>
+      <rChild name="PPS_Pixel_Module_2x2_Run3:Envelop"/>
+      <Translation x="-0.4*mm" y="-[RP_Box:RP_Box_Secondary_Vacuum_Height]/2.+[PPS_Pixel_Module_2x2_Run3:EnvelopL]/2.*cos([RotAngle])+[Offset_wrt_RP_bottom]" z="1.5*[Planes_spacing_different_support] + [Planes_spacing_OFFSET]"/>
+      <rRotation name="ModuleROTATIONmirror2"/>
+
+    </PosPart>
+
+    <PosPart copyNumber="5">
+
+      <rParent name="RP_Box_003:RP_box_secondary_vacuum"/>
+      <rChild name="PPS_Pixel_Module_2x2_Run3:Envelop"/>
+      <Translation x="-0.4*mm" y="-[RP_Box:RP_Box_Secondary_Vacuum_Height]/2.+[PPS_Pixel_Module_2x2_Run3:EnvelopL]/2.*cos([RotAngle])+[Offset_wrt_RP_bottom]" z="2.5*[Planes_spacing_different_support] + [Planes_spacing_OFFSET]"/>
+      <rRotation name="ModuleROTATIONmirror2"/>
+
+    </PosPart>
+
+    <PosPart copyNumber="6">
+
+      <rParent name="RP_Box_003:RP_box_secondary_vacuum"/>
+      <rChild name="PPS_Pixel_Module_2x2_Run3:Envelop"/>
+      <Translation x="-0.4*mm" y="-[RP_Box:RP_Box_Secondary_Vacuum_Height]/2.+[PPS_Pixel_Module_2x2_Run3:EnvelopL]/2.*cos([RotAngle])+[Offset_wrt_RP_bottom]" z="3.5*[Planes_spacing_different_support] + [Planes_spacing_OFFSET]"/>
+      <rRotation name="ModuleROTATIONmirror2"/>
+
+    </PosPart>
+
+
+
+
+
+  </PosPartSection>
+</DDDefinition>
diff --git a/Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_023.xml b/Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_023.xml
new file mode 100644
index 0000000000000..378d4155c893e
--- /dev/null
+++ b/Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_023.xml
@@ -0,0 +1,104 @@
+<?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 ../../DDLSchema/DDLSchema.xsd">
+  <ConstantsSection label="CTPPS_Pixel_Assembly_Box_Real_023.xml">
+    <Constant name="RotAngle"              value="20.0*deg"/> <!-- was 18.4 degrees -->
+
+    <Constant name="FullModuleThickness"   value="[PPS_Pixel_Module_2x2_Run3:EnvelopT]+[PPS_Pixel_Module_2x2_Run3:ROChipT]+[PPS_Pixel_Module_2x2_Run3:WaferT]" />
+
+
+    <Constant name="Offset_wrt_RP_bottom" value="0.25*mm"/> 
+    <Constant name="Planes_spacing_different_support" value="4.044*mm" />   <!-- TBC -->
+    <Constant name="Planes_spacing_OFFSET" value="0.0*mm" />   
+
+    <!-- module Y offset = 0 if all modules oriented in the same direction -->
+
+    <Constant name="ModuleOffset"   value="0.00*mm" />
+    <!-- offset to align the sensors:  www.ge.infn.it/~ferro/CMS/CTPPS_offset_piani.pdf -->
+  </ConstantsSection>
+  
+
+  <RotationSection label="CTPPS_Pixel_Assembly_Box_Real_023.xml">
+    <Rotation name="ModuleROTATION" thetaX="90*deg"  phiX="0*deg" 
+              thetaY="90*deg-[RotAngle]"  phiY="90*deg" 
+              thetaZ="-[RotAngle]" phiZ="90*deg"/>  <!-- rotation of RotAngle around x axis -->
+
+    
+    <Rotation name="ModuleROTATIONmirror" thetaX="90*deg"  phiX="180*deg" 
+              thetaY="90*deg-[RotAngle]"  phiY="90*deg" 
+              thetaZ="180*deg-[RotAngle]" phiZ="90*deg"/>  
+
+    <Rotation name="ModuleROTATIONmirror2" thetaX="90*deg"  phiX="180*deg" 
+              thetaY="90*deg+[RotAngle]"  phiY="90*deg" 
+              thetaZ="180*deg+[RotAngle]" phiZ="90*deg"/>  
+
+  </RotationSection>
+
+
+
+  <PosPartSection label="CTPPS_Pixel_Assembly_Box_Real_023.xml">
+
+
+    <PosPart copyNumber="1">
+
+      <rParent name="RP_Box_023:RP_box_secondary_vacuum"/>
+      <rChild name="PPS_Pixel_Module_2x2_Run3:Envelop"/>
+ <!--     <Translation x="-0.4*mm" y="-[RP_Box:RP_Box_Secondary_Vacuum_Height]/2+[RP_Box:RP_Box_Bottom_Wall_Thickness]/2+[PPS_Pixel_Module_2x2_Run3:EnvelopL]*cos([RotAngle])+[Offset_wrt_RP_bottom]-15*mm" z="-(1.5*[Planes_spacing_different_support]) + [Planes_spacing_OFFSET]"/>
+-->
+ <Translation x="-0.4*mm" y="-[RP_Box:RP_Box_Secondary_Vacuum_Height]/2.+[PPS_Pixel_Module_2x2_Run3:EnvelopL]/2.*cos([RotAngle])+[Offset_wrt_RP_bottom]" z="-(1.5*[Planes_spacing_different_support]) + [Planes_spacing_OFFSET]"/>
+      <rRotation name="ModuleROTATIONmirror2"/>
+
+    </PosPart>
+
+    <PosPart copyNumber="2">
+
+      <rParent name="RP_Box_023:RP_box_secondary_vacuum"/>
+      <rChild name="PPS_Pixel_Module_2x2_Run3:Envelop"/>
+      <Translation x="-0.4*mm" y="-[RP_Box:RP_Box_Secondary_Vacuum_Height]/2.+[PPS_Pixel_Module_2x2_Run3:EnvelopL]/2.*cos([RotAngle])+[Offset_wrt_RP_bottom]" z="-0.5*[Planes_spacing_different_support] + [Planes_spacing_OFFSET]"/>
+      <rRotation name="ModuleROTATIONmirror2"/>
+
+    </PosPart>
+
+    <PosPart copyNumber="3">
+
+      <rParent name="RP_Box_023:RP_box_secondary_vacuum"/>
+      <rChild name="PPS_Pixel_Module_2x2_Run3:Envelop"/>
+      <Translation x="-0.4*mm" y="-[RP_Box:RP_Box_Secondary_Vacuum_Height]/2.+[PPS_Pixel_Module_2x2_Run3:EnvelopL]/2.*cos([RotAngle])+[Offset_wrt_RP_bottom]" z="0.5*[Planes_spacing_different_support] + [Planes_spacing_OFFSET]"/>
+      <rRotation name="ModuleROTATIONmirror2"/>
+
+    </PosPart>
+
+    <PosPart copyNumber="4">
+
+      <rParent name="RP_Box_023:RP_box_secondary_vacuum"/>
+      <rChild name="PPS_Pixel_Module_2x2_Run3:Envelop"/>
+      <Translation x="-0.4*mm" y="-[RP_Box:RP_Box_Secondary_Vacuum_Height]/2.+[PPS_Pixel_Module_2x2_Run3:EnvelopL]/2.*cos([RotAngle])+[Offset_wrt_RP_bottom]" z="1.5*[Planes_spacing_different_support] + [Planes_spacing_OFFSET]"/>
+      <rRotation name="ModuleROTATIONmirror2"/>
+
+    </PosPart>
+
+    <PosPart copyNumber="5">
+
+      <rParent name="RP_Box_023:RP_box_secondary_vacuum"/>
+      <rChild name="PPS_Pixel_Module_2x2_Run3:Envelop"/>
+      <Translation x="-0.4*mm" y="-[RP_Box:RP_Box_Secondary_Vacuum_Height]/2.+[PPS_Pixel_Module_2x2_Run3:EnvelopL]/2.*cos([RotAngle])+[Offset_wrt_RP_bottom]" z="2.5*[Planes_spacing_different_support] + [Planes_spacing_OFFSET]"/>
+      <rRotation name="ModuleROTATIONmirror2"/>
+
+    </PosPart>
+
+    <PosPart copyNumber="6">
+
+      <rParent name="RP_Box_023:RP_box_secondary_vacuum"/>
+      <rChild name="PPS_Pixel_Module_2x2_Run3:Envelop"/>
+      <Translation x="-0.4*mm" y="-[RP_Box:RP_Box_Secondary_Vacuum_Height]/2.+[PPS_Pixel_Module_2x2_Run3:EnvelopL]/2.*cos([RotAngle])+[Offset_wrt_RP_bottom]" z="3.5*[Planes_spacing_different_support] + [Planes_spacing_OFFSET]"/>
+      <rRotation name="ModuleROTATIONmirror2"/>
+
+    </PosPart>
+
+
+
+
+
+  </PosPartSection>
+</DDDefinition>
diff --git a/Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_103.xml b/Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_103.xml
new file mode 100644
index 0000000000000..aa2bec0580c4e
--- /dev/null
+++ b/Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_103.xml
@@ -0,0 +1,104 @@
+<?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 ../../DDLSchema/DDLSchema.xsd">
+  <ConstantsSection label="CTPPS_Pixel_Assembly_Box_Real_103.xml">
+    <Constant name="RotAngle"              value="20.0*deg"/>
+
+    <Constant name="FullModuleThickness"   value="[PPS_Pixel_Module_2x2_Run3:EnvelopT]+[PPS_Pixel_Module_2x2_Run3:ROChipT]+[PPS_Pixel_Module_2x2_Run3:WaferT]" />
+
+
+    <Constant name="Offset_wrt_RP_bottom" value="0.25*mm"/> 
+    <Constant name="Planes_spacing_different_support" value="4.044*mm" />   <!-- TBC -->
+    <Constant name="Planes_spacing_OFFSET" value="0.0*mm" />   
+
+    <!-- module Y offset = 0 if all modules oriented in the same direction -->
+
+    <Constant name="ModuleOffset"   value="0.00*mm" />
+    <!-- offset to align the sensors:  www.ge.infn.it/~ferro/CMS/CTPPS_offset_piani.pdf -->
+  </ConstantsSection>
+  
+
+  <RotationSection label="CTPPS_Pixel_Assembly_Box_Real_103.xml">
+    <Rotation name="ModuleROTATION" thetaX="90*deg"  phiX="0*deg" 
+              thetaY="90*deg-[RotAngle]"  phiY="90*deg" 
+              thetaZ="-[RotAngle]" phiZ="90*deg"/>  <!-- rotation of RotAngle around x axis -->
+
+    
+    <Rotation name="ModuleROTATIONmirror" thetaX="90*deg"  phiX="180*deg" 
+              thetaY="90*deg-[RotAngle]"  phiY="90*deg" 
+              thetaZ="180*deg-[RotAngle]" phiZ="90*deg"/>  
+
+    <Rotation name="ModuleROTATIONmirror2" thetaX="90*deg"  phiX="180*deg" 
+              thetaY="90*deg+[RotAngle]"  phiY="90*deg" 
+              thetaZ="180*deg+[RotAngle]" phiZ="90*deg"/>  
+
+  </RotationSection>
+
+
+
+  <PosPartSection label="CTPPS_Pixel_Assembly_Box_Real_103.xml">
+
+
+    <PosPart copyNumber="1">
+
+      <rParent name="RP_Box_103:RP_box_secondary_vacuum"/>
+      <rChild name="PPS_Pixel_Module_2x2_Run3:Envelop"/>
+ <!--     <Translation x="-0.4*mm" y="-[RP_Box:RP_Box_Secondary_Vacuum_Height]/2+[RP_Box:RP_Box_Bottom_Wall_Thickness]/2+[PPS_Pixel_Module_2x2_Run3:EnvelopL]*cos([RotAngle])+[Offset_wrt_RP_bottom]-15*mm" z="-(1.5*[Planes_spacing_different_support]) + [Planes_spacing_OFFSET]"/>
+-->
+ <Translation x="-0.4*mm" y="-[RP_Box:RP_Box_Secondary_Vacuum_Height]/2.+[PPS_Pixel_Module_2x2_Run3:EnvelopL]/2.*cos([RotAngle])+[Offset_wrt_RP_bottom]" z="-(1.5*[Planes_spacing_different_support]) + [Planes_spacing_OFFSET]"/>
+      <rRotation name="ModuleROTATIONmirror2"/>
+
+    </PosPart>
+
+    <PosPart copyNumber="2">
+
+      <rParent name="RP_Box_103:RP_box_secondary_vacuum"/>
+      <rChild name="PPS_Pixel_Module_2x2_Run3:Envelop"/>
+      <Translation x="-0.4*mm" y="-[RP_Box:RP_Box_Secondary_Vacuum_Height]/2.+[PPS_Pixel_Module_2x2_Run3:EnvelopL]/2.*cos([RotAngle])+[Offset_wrt_RP_bottom]" z="-0.5*[Planes_spacing_different_support] + [Planes_spacing_OFFSET]"/>
+      <rRotation name="ModuleROTATIONmirror2"/>
+
+    </PosPart>
+
+    <PosPart copyNumber="3">
+
+      <rParent name="RP_Box_103:RP_box_secondary_vacuum"/>
+      <rChild name="PPS_Pixel_Module_2x2_Run3:Envelop"/>
+      <Translation x="-0.4*mm" y="-[RP_Box:RP_Box_Secondary_Vacuum_Height]/2.+[PPS_Pixel_Module_2x2_Run3:EnvelopL]/2.*cos([RotAngle])+[Offset_wrt_RP_bottom]" z="0.5*[Planes_spacing_different_support] + [Planes_spacing_OFFSET]"/>
+      <rRotation name="ModuleROTATIONmirror2"/>
+
+    </PosPart>
+
+    <PosPart copyNumber="4">
+
+      <rParent name="RP_Box_103:RP_box_secondary_vacuum"/>
+      <rChild name="PPS_Pixel_Module_2x2_Run3:Envelop"/>
+      <Translation x="-0.4*mm" y="-[RP_Box:RP_Box_Secondary_Vacuum_Height]/2.+[PPS_Pixel_Module_2x2_Run3:EnvelopL]/2.*cos([RotAngle])+[Offset_wrt_RP_bottom]" z="1.5*[Planes_spacing_different_support] + [Planes_spacing_OFFSET]"/>
+      <rRotation name="ModuleROTATIONmirror2"/>
+
+    </PosPart>
+
+    <PosPart copyNumber="5">
+
+      <rParent name="RP_Box_103:RP_box_secondary_vacuum"/>
+      <rChild name="PPS_Pixel_Module_2x2_Run3:Envelop"/>
+      <Translation x="-0.4*mm" y="-[RP_Box:RP_Box_Secondary_Vacuum_Height]/2.+[PPS_Pixel_Module_2x2_Run3:EnvelopL]/2.*cos([RotAngle])+[Offset_wrt_RP_bottom]" z="2.5*[Planes_spacing_different_support] + [Planes_spacing_OFFSET]"/>
+      <rRotation name="ModuleROTATIONmirror2"/>
+
+    </PosPart>
+
+    <PosPart copyNumber="6">
+
+      <rParent name="RP_Box_103:RP_box_secondary_vacuum"/>
+      <rChild name="PPS_Pixel_Module_2x2_Run3:Envelop"/>
+      <Translation x="-0.4*mm" y="-[RP_Box:RP_Box_Secondary_Vacuum_Height]/2.+[PPS_Pixel_Module_2x2_Run3:EnvelopL]/2.*cos([RotAngle])+[Offset_wrt_RP_bottom]" z="3.5*[Planes_spacing_different_support] + [Planes_spacing_OFFSET]"/>
+      <rRotation name="ModuleROTATIONmirror2"/>
+
+    </PosPart>
+
+
+
+
+
+  </PosPartSection>
+</DDDefinition>
diff --git a/Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_123.xml b/Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_123.xml
new file mode 100644
index 0000000000000..081ad41552b3d
--- /dev/null
+++ b/Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_123.xml
@@ -0,0 +1,104 @@
+<?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 ../../DDLSchema/DDLSchema.xsd">
+  <ConstantsSection label="CTPPS_Pixel_Assembly_Box_Real_123.xml">
+    <Constant name="RotAngle"              value="20.0*deg"/> <!-- was 18.4 degrees -->
+
+    <Constant name="FullModuleThickness"   value="[PPS_Pixel_Module_2x2_Run3:EnvelopT]+[PPS_Pixel_Module_2x2_Run3:ROChipT]+[PPS_Pixel_Module_2x2_Run3:WaferT]" />
+
+
+    <Constant name="Offset_wrt_RP_bottom" value="0.25*mm"/> 
+    <Constant name="Planes_spacing_different_support" value="4.044*mm" />   <!-- TBC -->
+    <Constant name="Planes_spacing_OFFSET" value="0.0*mm" />   
+
+    <!-- module Y offset = 0 if all modules oriented in the same direction -->
+
+    <Constant name="ModuleOffset"   value="0.00*mm" />
+    <!-- offset to align the sensors:  www.ge.infn.it/~ferro/CMS/CTPPS_offset_piani.pdf -->
+  </ConstantsSection>
+  
+
+  <RotationSection label="CTPPS_Pixel_Assembly_Box_Real_123.xml">
+    <Rotation name="ModuleROTATION" thetaX="90*deg"  phiX="0*deg" 
+              thetaY="90*deg-[RotAngle]"  phiY="90*deg" 
+              thetaZ="-[RotAngle]" phiZ="90*deg"/>  <!-- rotation of RotAngle around x axis -->
+
+    
+    <Rotation name="ModuleROTATIONmirror" thetaX="90*deg"  phiX="180*deg" 
+              thetaY="90*deg-[RotAngle]"  phiY="90*deg" 
+              thetaZ="180*deg-[RotAngle]" phiZ="90*deg"/>  
+
+    <Rotation name="ModuleROTATIONmirror2" thetaX="90*deg"  phiX="180*deg" 
+              thetaY="90*deg+[RotAngle]"  phiY="90*deg" 
+              thetaZ="180*deg+[RotAngle]" phiZ="90*deg"/>  
+
+  </RotationSection>
+
+
+
+  <PosPartSection label="CTPPS_Pixel_Assembly_Box_Real_123.xml">
+
+
+    <PosPart copyNumber="1">
+
+      <rParent name="RP_Box_123:RP_box_secondary_vacuum"/>
+      <rChild name="PPS_Pixel_Module_2x2_Run3:Envelop"/>
+ <!--     <Translation x="-0.4*mm" y="-[RP_Box:RP_Box_Secondary_Vacuum_Height]/2+[RP_Box:RP_Box_Bottom_Wall_Thickness]/2+[PPS_Pixel_Module_2x2_Run3:EnvelopL]*cos([RotAngle])+[Offset_wrt_RP_bottom]-15*mm" z="-(1.5*[Planes_spacing_different_support]) + [Planes_spacing_OFFSET]"/>
+-->
+ <Translation x="-0.4*mm" y="-[RP_Box:RP_Box_Secondary_Vacuum_Height]/2.+[PPS_Pixel_Module_2x2_Run3:EnvelopL]/2.*cos([RotAngle])+[Offset_wrt_RP_bottom]" z="-(1.5*[Planes_spacing_different_support]) + [Planes_spacing_OFFSET]"/>
+      <rRotation name="ModuleROTATIONmirror2"/>
+
+    </PosPart>
+
+    <PosPart copyNumber="2">
+
+      <rParent name="RP_Box_123:RP_box_secondary_vacuum"/>
+      <rChild name="PPS_Pixel_Module_2x2_Run3:Envelop"/>
+      <Translation x="-0.4*mm" y="-[RP_Box:RP_Box_Secondary_Vacuum_Height]/2.+[PPS_Pixel_Module_2x2_Run3:EnvelopL]/2.*cos([RotAngle])+[Offset_wrt_RP_bottom]" z="-0.5*[Planes_spacing_different_support] + [Planes_spacing_OFFSET]"/>
+      <rRotation name="ModuleROTATIONmirror2"/>
+
+    </PosPart>
+
+    <PosPart copyNumber="3">
+
+      <rParent name="RP_Box_123:RP_box_secondary_vacuum"/>
+      <rChild name="PPS_Pixel_Module_2x2_Run3:Envelop"/>
+      <Translation x="-0.4*mm" y="-[RP_Box:RP_Box_Secondary_Vacuum_Height]/2.+[PPS_Pixel_Module_2x2_Run3:EnvelopL]/2.*cos([RotAngle])+[Offset_wrt_RP_bottom]" z="0.5*[Planes_spacing_different_support] + [Planes_spacing_OFFSET]"/>
+      <rRotation name="ModuleROTATIONmirror2"/>
+
+    </PosPart>
+
+    <PosPart copyNumber="4">
+
+      <rParent name="RP_Box_123:RP_box_secondary_vacuum"/>
+      <rChild name="PPS_Pixel_Module_2x2_Run3:Envelop"/>
+      <Translation x="-0.4*mm" y="-[RP_Box:RP_Box_Secondary_Vacuum_Height]/2.+[PPS_Pixel_Module_2x2_Run3:EnvelopL]/2.*cos([RotAngle])+[Offset_wrt_RP_bottom]" z="1.5*[Planes_spacing_different_support] + [Planes_spacing_OFFSET]"/>
+      <rRotation name="ModuleROTATIONmirror2"/>
+
+    </PosPart>
+
+    <PosPart copyNumber="5">
+
+      <rParent name="RP_Box_123:RP_box_secondary_vacuum"/>
+      <rChild name="PPS_Pixel_Module_2x2_Run3:Envelop"/>
+      <Translation x="-0.4*mm" y="-[RP_Box:RP_Box_Secondary_Vacuum_Height]/2.+[PPS_Pixel_Module_2x2_Run3:EnvelopL]/2.*cos([RotAngle])+[Offset_wrt_RP_bottom]" z="2.5*[Planes_spacing_different_support] + [Planes_spacing_OFFSET]"/>
+      <rRotation name="ModuleROTATIONmirror2"/>
+
+    </PosPart>
+
+    <PosPart copyNumber="6">
+
+      <rParent name="RP_Box_123:RP_box_secondary_vacuum"/>
+      <rChild name="PPS_Pixel_Module_2x2_Run3:Envelop"/>
+      <Translation x="-0.4*mm" y="-[RP_Box:RP_Box_Secondary_Vacuum_Height]/2.+[PPS_Pixel_Module_2x2_Run3:EnvelopL]/2.*cos([RotAngle])+[Offset_wrt_RP_bottom]" z="3.5*[Planes_spacing_different_support] + [Planes_spacing_OFFSET]"/>
+      <rRotation name="ModuleROTATIONmirror2"/>
+
+    </PosPart>
+
+
+
+
+
+  </PosPartSection>
+</DDDefinition>
diff --git a/Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v3/PPS_Pixel_Module_2x2_Run3.xml b/Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v3/PPS_Pixel_Module_2x2_Run3.xml
new file mode 100644
index 0000000000000..03e56824cec6e
--- /dev/null
+++ b/Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v3/PPS_Pixel_Module_2x2_Run3.xml
@@ -0,0 +1,248 @@
+<?xml version="1.0"?>
+<DDDefinition>
+
+<!--
+PPS Tracker module 2x2 for Run3
+
+Author: F.Ferro - INFN Genova
+
+-->
+
+<ConstantsSection label="PPS_Pixel_Module_2x2_Run3.xml" eval="true">
+
+<Constant name="ROChipL"            value="7.87*mm"/>    <!-- Readout chip length -->
+<Constant name="ROChipW"            value="10.557*mm"/>     <!-- Readout chip width -->
+<Constant name="ROChipT"            value="0.180*mm"/>    <!-- Readout chip thickness -->
+<Constant name="ROChipSpaceL"       value="0.23*mm"/>    <!-- Distance (along width) between adjacent chips -->
+<Constant name="ROChipSpaceW"       value="0.22*mm"/>    <!-- Distance (along length) between  adjacent chips -->
+
+<!-- https://istnazfisnucl-my.sharepoint.com/:b:/g/personal/fferro_infn_it/EZaGp04OlqRJm-IUy-UrkPcB6s8Q0eMGOGbIL6R-buTlsQ?e=b7t9oS -->
+<Constant name="AlSupportUshapeL" value="25.5*mm" />   <!-- height of the U shaped Aluminium support 1mm thick -->
+<Constant name="AlSupportUshapeW" value="50.0*mm" />   <!-- width of the U shaped Aluminium support 1mm thick -->
+<Constant name="AlSupportUshapeT" value="0.9*mm" />    <!-- thickness of the U shaped Aluminium support -->
+
+
+<Constant name="AlSupportThinWindowL" value="18.3*mm" />   <!-- height of the thin Aluminium support 0.5mm thick -->
+<Constant name="AlSupportThinWindowW" value="21.6*mm" />   <!-- width of the thin Aluminium support 0.5mm thick -->
+<Constant name="AlSupportThinWindowOffsetL" value="3.5*mm" />   <!-- overhang of the thin Aluminium support 0.5mm thick wrt to the U shape -->
+<Constant name="AlSupportThinWindowT" value="0.4*mm" />   <!-- width of the thin Aluminium support -->
+<Constant name="AlSupportUshapeTopCenterL" value="[AlSupportUshapeL]+[AlSupportThinWindowOffsetL]-[AlSupportThinWindowL]" />   <!-- height of the U shaped Aluminium support 1mm thick - Central Top part -->
+<Constant name="AlSupportUshapeSideW" value="[AlSupportUshapeW]/2.-[AlSupportThinWindowW]/2." />   <!-- Width of the U shaped Aluminium support 1mm thick - Left and Right wings -->
+
+<Constant name="FlexL" value="[AlSupportUshapeL]+[AlSupportThinWindowOffsetL]+0.17*mm" />  <!-- height of the Flex circuit (only the part in the envelop of the module) -->
+<Constant name="FlexW" value="16.65*mm" />    <!-- width of the Flex circuit - LIKE THE SENSOR? -->
+<Constant name="FlexT" value="0.445*mm" />   <!-- thickness of the Flex circuit -->
+
+<Constant name="WaferL" value="16.200*mm" />   <!-- height of the sensor -->
+<Constant name="WaferW" value="16.65*mm" />   <!-- width of the sensor -->
+<Constant name="WaferT" value="0.220*mm" />   <!-- thickness of the sensor -->
+
+<Constant name="EnvelopL" value="[FlexL]"/>
+<Constant name="EnvelopW" value="[AlSupportUshapeW]"/>    
+<Constant name="EnvelopT" value="[FlexT]+[WaferT]+[ROChipT]+2*[GlueT]+[AlSupportThinWindowT]"/>
+<Constant name="EnvelopToBeSubtractedL" value="[AlSupportThinWindowOffsetL]"/>
+<Constant name="EnvelopToBeSubtractedW" value="[AlSupportUshapeW]/2. - [AlSupportThinWindowW]/2."/>    
+
+<Constant name="ThinWindowRailW" value="2.5*mm" />
+
+<Constant name="GlueT" value="0.050*mm" />   <!-- thickness of the glue -->
+<Constant name="GlueOnWaferL" value="16.200*mm" />   <!-- height of the glue on sensor -->
+<Constant name="GlueOnWaferW" value="16.65*mm" />   <!-- width of the glue on sensor -->
+<Constant name="GlueOnROCsL" value="2*[ROChipL]+[ROChipSpaceL]" />
+
+<!-- Al Support window defined WITH FULL ALUMINIUM WINDOW -->
+<Constant name="GlueOnROCsW" value="2*[ROChipW]+[ROChipSpaceW]" />
+
+<!-- Al Support window WITH ONLY LATERAL RAILS 
+<Constant name="GlueOnROCsW" value="[ThinWindowRailW] - [AlSupportThinWindowW]/2. + [ROChipW] + [ROChipSpaceW]/2." />
+-->
+
+</ConstantsSection>
+
+
+
+<SolidSection label="PPS_Pixel_Module_2x2_Run3.xml">
+
+<Box name="EnvelopBeforeSubtraction"              dx="[EnvelopW]/2."   dy="[EnvelopL]/2."    dz="[EnvelopT]/2." /> 
+<Box name="EnvelopToBeSubtracted"              dx="[EnvelopToBeSubtractedW]/2."   dy="[EnvelopToBeSubtractedL]/2."    dz="[EnvelopT]/2." /> 
+
+<Box name="AlSupportUshapeTopCenter" dx="[AlSupportThinWindowW]/2." dy="[AlSupportUshapeTopCenterL]/2." dz="[AlSupportUshapeT]/2." />
+<Box name="AlSupportUshapeLeftSide" dx="[AlSupportUshapeSideW]/2." dy="[AlSupportUshapeL]/2." dz="[AlSupportUshapeT]/2." />
+<Box name="AlSupportUshapeRightSide" dx="[AlSupportUshapeSideW]/2." dy="[AlSupportUshapeL]/2." dz="[AlSupportUshapeT]/2." />
+<Box name="AlSupportThinWindow" dx="[AlSupportThinWindowW]/2." dy="[AlSupportThinWindowL]/2." dz="[AlSupportThinWindowT]/2." />
+<Box name="AlSupportThinWindowRail" dx="[ThinWindowRailW]/2." dy="[AlSupportThinWindowL]/2." dz="[AlSupportThinWindowT]/2." />
+
+
+<UnionSolid name="AlSupportUshapeCenterLeft">
+<rSolid name="AlSupportUshapeTopCenter"/>
+<rSolid name="AlSupportUshapeLeftSide"/>
+<Translation x="-[AlSupportThinWindowW]/2.-[AlSupportUshapeSideW]/2." y="[AlSupportUshapeTopCenterL]/2.-[AlSupportUshapeL]/2." z="0."/>
+</UnionSolid>
+<UnionSolid name="AlSupportUshape">
+<rSolid name="AlSupportUshapeCenterLeft"/>
+<rSolid name="AlSupportUshapeRightSide"/>
+<Translation x="[AlSupportThinWindowW]/2.+[AlSupportUshapeSideW]/2." y="[AlSupportUshapeTopCenterL]/2.-[AlSupportUshapeL]/2." z="0."/>
+</UnionSolid>
+<!-- Al Support window defined WITH FULL ALUMINIUM WINDOW -->
+<UnionSolid name="AlSupport">
+<rSolid name="AlSupportUshape"/>
+<rSolid name="AlSupportThinWindow"/> 
+<Translation x="0" y="-[AlSupportUshapeTopCenterL]/2.-[AlSupportThinWindowL]/2." z="-[AlSupportUshapeT]/2.+[AlSupportThinWindowT]/2."/>
+</UnionSolid>
+
+<!-- Al Support window WITH ONLY LATERAL RAILS 
+<UnionSolid name="AlSupportWithLeftRail">
+<rSolid name="AlSupportUshape"/>
+<rSolid name="AlSupportThinWindowRail"/> 
+<Translation x="-[AlSupportThinWindowW]/2.+[ThinWindowRailW]/2." y="-[AlSupportUshapeTopCenterL]/2.-[AlSupportThinWindowL]/2." z="-[AlSupportUshapeT]/2.+[AlSupportThinWindowT]/2."/>
+</UnionSolid>
+<UnionSolid name="AlSupport">
+<rSolid name="AlSupportWithLeftRail"/>
+<rSolid name="AlSupportThinWindowRail"/> 
+<Translation x="[AlSupportThinWindowW]/2.-[ThinWindowRailW]/2." y="-[AlSupportUshapeTopCenterL]/2.-[AlSupportThinWindowL]/2." z="-[AlSupportUshapeT]/2.+[AlSupportThinWindowT]/2."/>
+</UnionSolid>
+-->
+
+
+
+<Box name="RPixWafer2x2"              dx="[WaferW]/2."   dy="[WaferL]/2."    dz="[WaferT]/2." /> 
+<Box name="GlueOnWafer"              dx="[GlueOnWaferW]/2."   dy="[GlueOnWaferL]/2."    dz="[GlueT]/2." /> 
+<Box name="Flex"              dx="[FlexW]/2."   dy="[FlexL]/2."    dz="[FlexT]/2." /> 
+<Box name="GlueOnROCs"              dx="[GlueOnROCsW]/2."   dy="[GlueOnROCsL]/2."    dz="[GlueT]/2." /> 
+<Box name="ROChip"              dx="[ROChipW]/2."   dy="[ROChipL]/2."    dz="[ROChipT]/2." /> 
+
+<SubtractionSolid name="EnvelopTemp">
+  <rSolid name="EnvelopBeforeSubtraction" />
+  <rSolid name="EnvelopToBeSubtracted" />
+  <Translation x="-[AlSupportUshapeW]/2. + [EnvelopToBeSubtractedW]/2." y="-[EnvelopL]/2. + [AlSupportThinWindowOffsetL]/2." z="0.0*mm" />
+	     <!-- removing the bottom left corner of the box envelop -->
+</SubtractionSolid>
+<SubtractionSolid name="Envelop">
+  <rSolid name="EnvelopTemp" />
+  <rSolid name="EnvelopToBeSubtracted" />
+  <Translation x="[AlSupportUshapeW]/2. - [EnvelopToBeSubtractedW]/2." y="-[EnvelopL]/2. + [AlSupportThinWindowOffsetL]/2." z="0.0*mm" />
+	     <!-- removing the bottom right corner of the box envelop -->
+</SubtractionSolid>
+
+
+
+</SolidSection>
+
+
+<LogicalPartSection label="PPS_Pixel_Module_2x2_Run3.xml">
+
+ <LogicalPart name="Envelop" category="unspecified">
+  <rSolid name="Envelop"/>
+  <rMaterial name="materials:Vacuum" />
+ </LogicalPart>
+
+ <LogicalPart name="RPixWafer2x2" category="unspecified">
+  <rSolid name="RPixWafer2x2"/>
+  <rMaterial name="materials:Silicon"/>
+ </LogicalPart>
+
+
+<LogicalPart name="ROChip" category="unspecified">
+  <rSolid name="ROChip"/>
+  <rMaterial name="pixfwdMaterials:Pix_Fwd_ROChip"/>
+ </LogicalPart>
+
+<LogicalPart name="GlueOnROCs" category="unspecified">
+  <rSolid name="GlueOnROCs"/>
+  <rMaterial name="pixfwdMaterials:FPix_Thermflow"/>
+ </LogicalPart>
+
+<LogicalPart name="GlueOnWafer" category="unspecified">
+  <rSolid name="GlueOnWafer"/>
+  <rMaterial name="pixfwdMaterials:FPix_Thermflow"/>
+ </LogicalPart>
+
+<LogicalPart name="Flex" category="unspecified">
+  <rSolid name="Flex"/>
+  <rMaterial name="pixfwdMaterials:Pix_Fwd_HDI"/> 
+ </LogicalPart>
+
+<LogicalPart name="AlSupport" category="unspecified">
+  <rSolid name="AlSupport"/>
+  <rMaterial name="materials:Aluminium"/> 
+ </LogicalPart>
+
+</LogicalPartSection>
+
+
+<PosPartSection label="PPS_Pixel_Module_2x2_Run3.xml">
+
+<PosPart copyNumber="1">
+  <rParent name="PPS_Pixel_Module_2x2_Run3:Envelop"/>
+  <rChild name="PPS_Pixel_Module_2x2_Run3:Flex"/>
+  <Translation x="0" y="0"  z="[EnvelopT]/2.-[FlexT]/2." />
+ </PosPart>
+
+<PosPart copyNumber="1">
+  <rParent name="PPS_Pixel_Module_2x2_Run3:Envelop"/>
+  <rChild name="PPS_Pixel_Module_2x2_Run3:GlueOnWafer"/>
+  <Translation x="0" y="-[EnvelopL]/2.+[GlueOnWaferL]/2."  z="[EnvelopT]/2.-[FlexT]-[GlueT]/2." />
+ </PosPart>
+
+<PosPart copyNumber="1">
+  <rParent name="PPS_Pixel_Module_2x2_Run3:Envelop"/>
+  <rChild name="PPS_Pixel_Module_2x2_Run3:RPixWafer2x2"/>
+  <Translation x="0" y="-[EnvelopL]/2.+[WaferL]/2."  z="[EnvelopT]/2.-[FlexT]-[GlueT]-[WaferT]/2." />
+ </PosPart>
+
+<PosPart copyNumber="1">
+  <rParent name="PPS_Pixel_Module_2x2_Run3:Envelop"/>
+  <rChild name="PPS_Pixel_Module_2x2_Run3:ROChip"/>
+  <Translation x="-[ROChipW]/2.-[ROChipSpaceW]/2." y="-[EnvelopL]/2.+[ROChipL]/2.+0.17*mm"  z="[EnvelopT]/2.-[FlexT]-[GlueT]-[WaferT]-[ROChipT]/2." />
+ </PosPart>
+<PosPart copyNumber="2">
+  <rParent name="PPS_Pixel_Module_2x2_Run3:Envelop"/>
+  <rChild name="PPS_Pixel_Module_2x2_Run3:ROChip"/>
+  <Translation x="[ROChipW]/2.+[ROChipSpaceW]/2." y="-[EnvelopL]/2.+[ROChipL]/2.+0.17*mm"  z="[EnvelopT]/2.-[FlexT]-[GlueT]-[WaferT]-[ROChipT]/2." />
+ </PosPart>
+<PosPart copyNumber="3">
+  <rParent name="PPS_Pixel_Module_2x2_Run3:Envelop"/>
+  <rChild name="PPS_Pixel_Module_2x2_Run3:ROChip"/>
+  <Translation x="-[ROChipW]/2.-[ROChipSpaceW]/2." y="-[EnvelopL]/2.+3*[ROChipL]/2.+[ROChipSpaceL]+0.17*mm"  z="[EnvelopT]/2.-[FlexT]-[GlueT]-[WaferT]-[ROChipT]/2." />
+ </PosPart>
+<PosPart copyNumber="4">
+  <rParent name="PPS_Pixel_Module_2x2_Run3:Envelop"/>
+  <rChild name="PPS_Pixel_Module_2x2_Run3:ROChip"/>
+  <Translation x="+[ROChipW]/2.+[ROChipSpaceW]/2." y="-[EnvelopL]/2.+3*[ROChipL]/2.+[ROChipSpaceL]+0.17*mm"  z="[EnvelopT]/2.-[FlexT]-[GlueT]-[WaferT]-[ROChipT]/2." />
+ </PosPart>
+
+<!-- Al Support window defined WITH FULL ALUMINIUM WINDOW -->
+
+<PosPart copyNumber="1">
+  <rParent name="PPS_Pixel_Module_2x2_Run3:Envelop"/>
+  <rChild name="PPS_Pixel_Module_2x2_Run3:GlueOnROCs"/>
+  <Translation x="0" y="-[EnvelopL]/2.+[GlueOnROCsL]/2. + 0.17*mm"  z="[EnvelopT]/2.-[FlexT]-[GlueT]-[WaferT]-[ROChipT]-[GlueT]/2." />
+ </PosPart>
+
+<!-- Al Support window WITH ONLY LATERAL RAILS 
+<PosPart copyNumber="1">
+  <rParent name="PPS_Pixel_Module_2x2_Run3:Envelop"/>
+  <rChild name="PPS_Pixel_Module_2x2_Run3:GlueOnROCs"/>
+  <Translation x="-[ROChipW]-[ROChipSpaceW]/2.+[GlueOnROCsW]/2." y="-[EnvelopL]/2.+[GlueOnROCsL]/2. + 0.17*mm"  z="[EnvelopT]/2.-[FlexT]-[GlueT]-[WaferT]-[ROChipT]-[GlueT]/2." />
+ </PosPart>
+<PosPart copyNumber="2">
+  <rParent name="PPS_Pixel_Module_2x2_Run3:Envelop"/>
+  <rChild name="PPS_Pixel_Module_2x2_Run3:GlueOnROCs"/>
+  <Translation x="[ROChipW]+[ROChipSpaceW]/2.-[GlueOnROCsW]/2." y="-[EnvelopL]/2.+[GlueOnROCsL]/2. + 0.17*mm"  z="[EnvelopT]/2.-[FlexT]-[GlueT]-[WaferT]-[ROChipT]-[GlueT]/2." />
+ </PosPart>
+-->
+
+
+
+<PosPart copyNumber="1">
+  <rParent name="PPS_Pixel_Module_2x2_Run3:Envelop"/>
+  <rChild name="PPS_Pixel_Module_2x2_Run3:AlSupport"/>
+ <!-- <Translation x="0" y="[EnvelopL]/2.-[AlSupportUshapeTopCenterL]/2."  z="[EnvelopT]/2.-[FlexT]-[GlueT]-[WaferT]-[ROChipT]-[GlueT]-[AlSupportThinWindowT]/2." /> -->
+ <Translation x="0" y="[EnvelopL]/2.-[AlSupportUshapeTopCenterL]/2."  z="[EnvelopT]/2.-[FlexT]-[AlSupportUshapeT]/2." /> 
+ </PosPart>
+
+
+</PosPartSection>
+
+
+</DDDefinition>
diff --git a/Geometry/VeryForwardData/data/dd4hep/cmsExtendedGeometry2021.xml b/Geometry/VeryForwardData/data/dd4hep/cmsExtendedGeometry2021.xml
index 7e43b537e9595..e4ac6d75f7536 100644
--- a/Geometry/VeryForwardData/data/dd4hep/cmsExtendedGeometry2021.xml
+++ b/Geometry/VeryForwardData/data/dd4hep/cmsExtendedGeometry2021.xml
@@ -343,12 +343,12 @@
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2021/Simu/v1/CTPPS_Detectors_Assembly_122.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Sensitive_Dets_TimingHits.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/ppstrackerMaterials.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/PPS_Pixel_Module_2x2_Run3.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v3/PPS_Pixel_Module_2x2_Run3.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/PPS_Pixel_Sens.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v1/CTPPS_Pixel_Assembly_Box_Real_003.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v1/CTPPS_Pixel_Assembly_Box_Real_023.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v1/CTPPS_Pixel_Assembly_Box_Real_103.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v1/CTPPS_Pixel_Assembly_Box_Real_123.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_003.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_023.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_103.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_123.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_2021/RP_Dist_Beam_Cent/Simu/v1/RP_Dist_Beam_Cent.xml'/>
     <Include ref='Geometry/EcalSimData/data/ecalsens.xml'/>
     <Include ref='Geometry/HcalCommonData/data/hcalsens/2021/v1/hcalsenspmf.xml'/>
diff --git a/Geometry/VeryForwardData/python/cmsExtendedGeometry2021XML_cfi.py b/Geometry/VeryForwardData/python/cmsExtendedGeometry2021XML_cfi.py
index 09e627234f5d7..deab27a6f6941 100644
--- a/Geometry/VeryForwardData/python/cmsExtendedGeometry2021XML_cfi.py
+++ b/Geometry/VeryForwardData/python/cmsExtendedGeometry2021XML_cfi.py
@@ -346,12 +346,12 @@
         'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/Simu/v1/CTPPS_Detectors_Assembly_122.xml',
         'Geometry/VeryForwardData/data/CTPPS_Diamond_Sensitive_Dets_TimingHits.xml',
         'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/ppstrackerMaterials.xml',
-        'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/PPS_Pixel_Module_2x2_Run3.xml',
+        'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v3/PPS_Pixel_Module_2x2_Run3.xml',
         'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/PPS_Pixel_Sens.xml',
-        'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v1/CTPPS_Pixel_Assembly_Box_Real_003.xml',
-        'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v1/CTPPS_Pixel_Assembly_Box_Real_023.xml',
-        'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v1/CTPPS_Pixel_Assembly_Box_Real_103.xml',
-        'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v1/CTPPS_Pixel_Assembly_Box_Real_123.xml',
+        'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_003.xml',
+        'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_023.xml',
+        'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_103.xml',
+        'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_123.xml',
         'Geometry/VeryForwardData/data/CTPPS_2021/RP_Dist_Beam_Cent/Simu/v1/RP_Dist_Beam_Cent.xml',
         'Geometry/EcalSimData/data/ecalsens.xml',
         'Geometry/HcalCommonData/data/hcalsens/2021/v1/hcalsenspmf.xml',
diff --git a/Geometry/VeryForwardGeometry/data/dd4hep/v3/geometryRPFromDD_2021.xml b/Geometry/VeryForwardGeometry/data/dd4hep/v3/geometryRPFromDD_2021.xml
new file mode 100644
index 0000000000000..85ecb9391b0f4
--- /dev/null
+++ b/Geometry/VeryForwardGeometry/data/dd4hep/v3/geometryRPFromDD_2021.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0"?>
+<DDDefinition>
+  <open_geometry/>
+  <close_geometry/>
+  
+  <IncludeSection>
+    # common and strip files
+    <Include ref="Geometry/CMSCommonData/data/materials.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/rotations.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/extend/cmsextent.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/cms/2017/v1/cms.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/beampipe/2017/v1/beampipe.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/cmsBeam.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/cmsMother.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/mgnt.xml"/>
+    <Include ref="Geometry/TrackerCommonData/data/trackermaterial/2021/v1/trackermaterial.xml"/>
+    <Include ref="Geometry/TrackerCommonData/data/pixfwdMaterials/2021/v2/pixfwdMaterials.xml"/>
+    <Include ref="Geometry/ForwardCommonData/data/forward.xml"/>
+    <Include ref="Geometry/ForwardCommonData/data/totemRotations.xml"/>
+    <Include ref="Geometry/ForwardCommonData/data/totemMaterials.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Box.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_000.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_001.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_002.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_003.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_004.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_005.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_020.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_021.xml"/>
+    <!--<Include ref="Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_022.xml"/>-->
+    <Include ref="Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_023.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_024.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_025.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_100.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_101.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_102.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_103.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_104.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_105.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_120.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_121.xml"/>
+    <!--<Include ref="Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_122.xml"/>-->
+    <Include ref="Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_123.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_124.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_125.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Hybrid/v2/RP_Hybrid.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Materials/v4/RP_Materials.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Transformations.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Detectors_Assembly.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_000.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_001.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_002.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_004.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_005.xml"/>
+    <!--<Include ref="Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_022.xml"/>-->
+    <Include ref="Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_024.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_025.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_100.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_101.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_102.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_104.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_105.xml"/>
+    <!--<Include ref="Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_122.xml"/>-->
+    <Include ref="Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_124.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_125.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Device.xml"/>
+
+    <Include ref="Geometry/VeryForwardData/data/RP_Vertical_Device/2021/Reco/v2/RP_Vertical_Device.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Horizontal_Device/2021/Reco/v2/RP_Horizontal_Device.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_2021/Stations/Reco/v2/RP_220_Right_Station.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_2021/Stations/Reco/v2/RP_210_Right_Station.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_2021/Stations/Reco/v2/RP_220_Left_Station.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_2021/Stations/Reco/v2/RP_210_Left_Station.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_2021/Stations/Reco/v1/RP_Stations_Assembly.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Sensitive_Dets.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_2021/Cuts_Per_Region/Reco/v1/RP_Cuts_Per_Region.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_2021/RP_Param_Beam_Region/v1/RP_Param_Beam_Region.xml"/>
+
+    # diamond files
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Diamond_Materials.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Diamond_Transformations.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Diamond_X_Distance.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Diamond_Parameters.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Timing_Station_Parameters.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Timing_Horizontal_Pot/v2/CTPPS_Timing_Horizontal_Pot.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Timing_Positive_Station/v1/CTPPS_Timing_Positive_Station.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Timing_Negative_Station/v1/CTPPS_Timing_Negative_Station.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Diamond_2021/Reco/v1/CTPPS_Timing_Stations_Assembly.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern1_Segment1.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern2_Segment1.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern2_Segment2.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment1.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment2.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment3.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment4.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment1.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment2.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment3.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment4.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment5.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane1.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane2.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane3.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane4.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Detector_Assembly/v1/CTPPS_Diamond_Detector_Assembly.xml"/>
+
+    # Totem Timing files
+    <Include ref="Geometry/VeryForwardData/data/TotemTiming/TotemTiming_Dist_Beam_Cent.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/TotemTiming/TotemTiming_DetectorAssembly.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/TotemTiming/TotemTiming_Parameters.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/TotemTiming/TotemTiming_Plane.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/TotemTiming/TotemTiming_Station.xml"/>
+
+    # pixel files
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/ppstrackerMaterials.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v3/PPS_Pixel_Module_2x2_Run3.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/PPS_Pixel_Sens.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_003.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_023.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_103.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_123.xml"/>
+
+    # RP distance
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_2021/RP_Dist_Beam_Cent/Reco/v1/RP_Dist_Beam_Cent.xml"/>    
+            
+  </IncludeSection>
+</DDDefinition> 
diff --git a/Geometry/VeryForwardGeometry/python/dd4hep/v3/geometryRPFromDD_2021_cfi.py b/Geometry/VeryForwardGeometry/python/dd4hep/v3/geometryRPFromDD_2021_cfi.py
new file mode 100644
index 0000000000000..bc2f4549850d9
--- /dev/null
+++ b/Geometry/VeryForwardGeometry/python/dd4hep/v3/geometryRPFromDD_2021_cfi.py
@@ -0,0 +1,18 @@
+import FWCore.ParameterSet.Config as cms
+
+DDDetectorESProducer = cms.ESSource("DDDetectorESProducer",
+                                            confGeomXMLFiles = cms.FileInPath('Geometry/VeryForwardGeometry/data/dd4hep/v3/geometryRPFromDD_2021.xml'),
+                                            appendToDataLabel = cms.string('XMLIdealGeometryESSource_CTPPS')
+)
+
+DDCompactViewESProducer = cms.ESProducer("DDCompactViewESProducer",
+                                            appendToDataLabel = cms.string('XMLIdealGeometryESSource_CTPPS')
+)
+
+ctppsGeometryESModule = cms.ESProducer("CTPPSGeometryESModule",
+    fromDD4hep = cms.untracked.bool(True),
+    isRun2 = cms.bool(False),
+    verbosity = cms.untracked.uint32(1),
+    compactViewTag = cms.string('XMLIdealGeometryESSource_CTPPS')
+)
+
diff --git a/Geometry/VeryForwardGeometry/python/v1/geometryRPFromDD_2021_cfi.py b/Geometry/VeryForwardGeometry/python/v1/geometryRPFromDD_2021_cfi.py
new file mode 100644
index 0000000000000..e283ad5c78756
--- /dev/null
+++ b/Geometry/VeryForwardGeometry/python/v1/geometryRPFromDD_2021_cfi.py
@@ -0,0 +1,142 @@
+import FWCore.ParameterSet.Config as cms
+
+# common and strip files
+totemGeomXMLFiles = cms.vstring(
+    'Geometry/CMSCommonData/data/materials.xml',
+    'Geometry/CMSCommonData/data/rotations.xml',
+    'Geometry/CMSCommonData/data/extend/cmsextent.xml',
+    'Geometry/CMSCommonData/data/cms/2017/v1/cms.xml',
+    'Geometry/CMSCommonData/data/beampipe/2017/v1/beampipe.xml',
+    'Geometry/CMSCommonData/data/cmsBeam.xml',
+    'Geometry/CMSCommonData/data/cmsMother.xml',
+    'Geometry/CMSCommonData/data/mgnt.xml',
+    'Geometry/TrackerCommonData/data/trackermaterial/2021/v1/trackermaterial.xml',
+    'Geometry/TrackerCommonData/data/pixfwdMaterials/2021/v2/pixfwdMaterials.xml',
+    'Geometry/ForwardCommonData/data/forward.xml',
+    'Geometry/ForwardCommonData/data/totemRotations.xml',
+    'Geometry/ForwardCommonData/data/totemMaterials.xml',
+    'Geometry/VeryForwardData/data/RP_Box.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_000.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_001.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_002.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_003.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_004.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_005.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_020.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_021.xml',
+#    'Geometry/VeryForwardData/data/RP_Boxv3//RP_Box_022.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_023.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_024.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_025.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_100.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_101.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_102.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_103.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_104.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_105.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_120.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_121.xml',
+#    'Geometry/VeryForwardData/data/RP_Boxv3//RP_Box_122.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_123.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_124.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_125.xml',
+    'Geometry/VeryForwardData/data/RP_Hybrid/v2/RP_Hybrid.xml',
+    'Geometry/VeryForwardData/data/RP_Materials/v4/RP_Materials.xml',
+    'Geometry/VeryForwardData/data/RP_Transformations.xml',
+    'Geometry/VeryForwardData/data/RP_Detectors_Assembly.xml',
+    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_000.xml',
+    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_001.xml',
+    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_002.xml',
+    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_004.xml',
+    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_005.xml',
+#    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_022.xml',
+    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_024.xml',
+    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_025.xml',
+    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_100.xml',
+    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_101.xml',
+    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_102.xml',
+    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_104.xml',
+    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_105.xml',
+#    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_122.xml',
+    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_124.xml',
+    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_125.xml',
+    'Geometry/VeryForwardData/data/RP_Device.xml',
+    'Geometry/VeryForwardData/data/RP_Vertical_Device/2021/Reco/v2/RP_Vertical_Device.xml',
+    'Geometry/VeryForwardData/data/RP_Horizontal_Device/2021/Reco/v2/RP_Horizontal_Device.xml',
+    'Geometry/VeryForwardData/data/CTPPS_2021/Stations/Reco/v2/RP_220_Right_Station.xml',
+    'Geometry/VeryForwardData/data/CTPPS_2021/Stations/Reco/v2/RP_210_Right_Station.xml',
+    'Geometry/VeryForwardData/data/CTPPS_2021/Stations/Reco/v2/RP_220_Left_Station.xml',
+    'Geometry/VeryForwardData/data/CTPPS_2021/Stations/Reco/v2/RP_210_Left_Station.xml',
+    'Geometry/VeryForwardData/data/CTPPS_2021/Stations/Reco/v1/RP_Stations_Assembly.xml',
+
+    'Geometry/VeryForwardData/data/RP_Sensitive_Dets.xml',
+    'Geometry/VeryForwardData/data/CTPPS_2021/Cuts_Per_Region/Reco/v1/RP_Cuts_Per_Region.xml',
+
+    'Geometry/VeryForwardData/data/CTPPS_2021/RP_Param_Beam_Region/v1/RP_Param_Beam_Region.xml'
+    )
+
+# diamond files
+ctppsDiamondGeomXMLFiles = cms.vstring(
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_Materials.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_Transformations.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_X_Distance.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_Parameters.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Timing_Station_Parameters.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Timing_Horizontal_Pot/v2/CTPPS_Timing_Horizontal_Pot.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Timing_Positive_Station/v1/CTPPS_Timing_Positive_Station.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Timing_Negative_Station/v1/CTPPS_Timing_Negative_Station.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/Reco/v1/CTPPS_Timing_Stations_Assembly.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern1_Segment1.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern2_Segment1.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern2_Segment2.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment1.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment2.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment3.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment4.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment1.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment2.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment3.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment4.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment5.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane1.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane2.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane3.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane4.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Detector_Assembly/v1/CTPPS_Diamond_Detector_Assembly.xml'
+    )
+
+
+# Totem Timing files
+totemTimingGeomXMLFiles = cms.vstring(
+    # UFSDetectors
+    'Geometry/VeryForwardData/data/TotemTiming/TotemTiming_Dist_Beam_Cent.xml',
+    'Geometry/VeryForwardData/data/TotemTiming/TotemTiming_DetectorAssembly.xml',
+    'Geometry/VeryForwardData/data/TotemTiming/TotemTiming_Parameters.xml',
+    'Geometry/VeryForwardData/data/TotemTiming/TotemTiming_Plane.xml',
+    'Geometry/VeryForwardData/data/TotemTiming/TotemTiming_Station.xml',
+    )
+
+# pixel files
+ctppsPixelGeomXMLFiles = cms.vstring(
+    'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/ppstrackerMaterials.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v3/PPS_Pixel_Module_2x2_Run3.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/PPS_Pixel_Sens.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_003.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_023.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_103.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_123.xml'
+    )
+
+XMLIdealGeometryESSource_CTPPS = cms.ESSource("XMLIdealGeometryESSource",
+                                              geomXMLFiles = totemGeomXMLFiles + ctppsDiamondGeomXMLFiles + totemTimingGeomXMLFiles + ctppsPixelGeomXMLFiles,
+                                              rootNodeName = cms.string('cms:CMSE')
+                                              )
+
+# position of RPs
+XMLIdealGeometryESSource_CTPPS.geomXMLFiles.append("Geometry/VeryForwardData/data/CTPPS_2021/RP_Dist_Beam_Cent/Reco/v1/RP_Dist_Beam_Cent.xml")
+
+ctppsGeometryESModule = cms.ESProducer("CTPPSGeometryESModule",
+    verbosity = cms.untracked.uint32(1),
+    isRun2 = cms.bool(False),
+    compactViewTag = cms.string('XMLIdealGeometryESSource_CTPPS')
+)