diff --git a/topology/California Institute of Technology/Caltech CMS Tier2/CIT_CMS_T2.yaml b/topology/California Institute of Technology/Caltech CMS Tier2/CIT_CMS_T2.yaml
index a90a758b8..d527e32f4 100644
--- a/topology/California Institute of Technology/Caltech CMS Tier2/CIT_CMS_T2.yaml	
+++ b/topology/California Institute of Technology/Caltech CMS Tier2/CIT_CMS_T2.yaml	
@@ -1,6 +1,7 @@
 GroupDescription: (No resource group description)
 GroupID: 10
 Production: true
+SupportCenter: USCMS_Tier2
 Resources:
   CIT_CMS_T2:
     Active: true
@@ -143,7 +144,68 @@ Resources:
       KSI2KMin: 0
       StorageCapacityMax: 0
       StorageCapacityMin: 0
-  CIT_CMS_T2L:
+  CIT_CMS_T2_Squid:
+    Active: true
+    ContactLists:
+      Administrative Contact:
+        Primary:
+          ID: 6895284f54fb41f9daafc4b6d0a7ea42c57e31be
+          Name: Justas Balcas
+        Secondary:
+          ID: 5e2a78ef254d5b584751f4de9cd490287301e8e7
+          Name: Andres Moya Ignatov
+        Tertiary:
+          ID: OSG1000240
+          Name: Sravya Uppalapati
+      Security Contact:
+        Primary:
+          ID: 6895284f54fb41f9daafc4b6d0a7ea42c57e31be
+          Name: Justas Balcas
+        Secondary:
+          ID: 5e2a78ef254d5b584751f4de9cd490287301e8e7
+          Name: Andres Moya Ignatov
+        Tertiary:
+          ID: OSG1000240
+          Name: Sravya Uppalapati
+    Description: Squid service for frontier and cvmfs
+    FQDN: proxy-1.ultralight.org
+    ID: 688
+    Services:
+      Squid:
+        Description: Generic squid service
+    VOOwnership:
+      CMS: 100
+  CIT_CMS_T2_2_Squid:
+    ContactLists:
+      Administrative Contact:
+        Primary:
+          ID: 6895284f54fb41f9daafc4b6d0a7ea42c57e31be
+          Name: Justas Balcas
+        Secondary:
+          ID: 5e2a78ef254d5b584751f4de9cd490287301e8e7
+          Name: Andres Moya Ignatov
+        Tertiary:
+          ID: OSG1000240
+          Name: Sravya Uppalapati
+      Security Contact:
+        Primary:
+          ID: 6895284f54fb41f9daafc4b6d0a7ea42c57e31be
+          Name: Justas Balcas
+        Secondary:
+          ID: 5e2a78ef254d5b584751f4de9cd490287301e8e7
+          Name: Andres Moya Ignatov
+        Tertiary:
+          ID: OSG1000240
+          Name: Sravya Uppalapati
+    Description: Second Squid service for frontier and cvmfs
+    FQDN: proxy-2.ultralight.org
+    ID: 225
+    Services:
+      Squid:
+        Description: Generic squid service
+    VOOwnership:
+      CMS: 100
+  CIT_CMS_T2-L1:
     Active: true
     ContactLists:
       Administrative Contact:
@@ -167,14 +229,14 @@ Resources:
           ID: OSG1000240
           Name: Sravya Uppalapati
     Description: Scheduler for Local users of Caltech CMS Group
-    FQDN: login-1.tier2
-    ID: 1055
+    FQDN: login-1.ultralight.org
+    ID: 1481
     Services:
       Submit Node:
         Description: Schedd for Local Users of Caltech CMS Group
         Details:
           hidden: false
-          sam_uri: htcondor://login-1.tier2
+          sam_uri: htcondor://login-1.ultralight.org
     VOOwnership:
       CMS: 100
     WLCGInformation:
@@ -188,7 +250,7 @@ Resources:
       KSI2KMin: 0
       StorageCapacityMax: 0
       StorageCapacityMin: 0
-  CIT_CMS_T2L1:
+  CIT_CMS_T2-L2:
     Active: true
     ContactLists:
       Administrative Contact:
@@ -212,14 +274,14 @@ Resources:
           ID: OSG1000240
           Name: Sravya Uppalapati
     Description: Scheduler for Local users of Caltech CMS Group
-    FQDN: login-1.hep.caltech.edu
-    ID: 1064
+    FQDN: login-2.ultralight.org
+    ID: 1482
     Services:
       Submit Node:
         Description: Schedd for Local Users of Caltech CMS Group
         Details:
           hidden: false
-          sam_uri: htcondor://login-1.tier2
+          sam_uri: htcondor://login-2.ultralight.org
     VOOwnership:
       CMS: 100
     WLCGInformation:
@@ -233,7 +295,7 @@ Resources:
       KSI2KMin: 0
       StorageCapacityMax: 0
       StorageCapacityMin: 0
-  CIT_CMS_T2L2:
+  CIT_CMS_T2-L3:
     Active: true
     ContactLists:
       Administrative Contact:
@@ -257,14 +319,14 @@ Resources:
           ID: OSG1000240
           Name: Sravya Uppalapati
     Description: Scheduler for Local users of Caltech CMS Group
-    FQDN: login-2.hep.caltech.edu
-    ID: 1062
+    FQDN: login-3.ultralight.org
+    ID: 1483
     Services:
       Submit Node:
         Description: Schedd for Local Users of Caltech CMS Group
         Details:
           hidden: false
-          sam_uri: htcondor://login-2.tier2
+          sam_uri: htcondor://login-3.ultralight.org
     VOOwnership:
       CMS: 100
     WLCGInformation:
@@ -278,8 +340,143 @@ Resources:
       KSI2KMin: 0
       StorageCapacityMax: 0
       StorageCapacityMin: 0
-  CIT_CMS_T2L3:
+
+  CIT_CMS_T2_K8s_Redir:
+    Active: true
+    ContactLists:
+      Administrative Contact:
+        Primary:
+          ID: 6895284f54fb41f9daafc4b6d0a7ea42c57e31be
+          Name: Justas Balcas
+        Secondary:
+          ID: 5e2a78ef254d5b584751f4de9cd490287301e8e7
+          Name: Andres Moya Ignatov
+        Tertiary:
+          ID: OSG1000240
+          Name: Sravya Uppalapati
+      Security Contact:
+        Primary:
+          ID: 6895284f54fb41f9daafc4b6d0a7ea42c57e31be
+          Name: Justas Balcas
+        Secondary:
+          ID: 5e2a78ef254d5b584751f4de9cd490287301e8e7
+          Name: Andres Moya Ignatov
+        Tertiary:
+          ID: OSG1000240
+          Name: Sravya Uppalapati
+    Description: Xrootd Redirector
+    FQDN: k8s-redir.ultralight.org
+    ID: 1484
+    Services:
+      XRootD component:
+        Description: Xrootd Redirector for Read Operations
+        Details:
+          hidden: false
+          uri_override: k8s-redir.ultralight.org:1094
+  CIT_CMS_T2_K8s_Redir_Stageout:
+    Active: true
+    ContactLists:
+      Administrative Contact:
+        Primary:
+          ID: 6895284f54fb41f9daafc4b6d0a7ea42c57e31be
+          Name: Justas Balcas
+        Secondary:
+          ID: 5e2a78ef254d5b584751f4de9cd490287301e8e7
+          Name: Andres Moya Ignatov
+        Tertiary:
+          ID: OSG1000240
+          Name: Sravya Uppalapati
+      Security Contact:
+        Primary:
+          ID: 6895284f54fb41f9daafc4b6d0a7ea42c57e31be
+          Name: Justas Balcas
+        Secondary:
+          ID: 5e2a78ef254d5b584751f4de9cd490287301e8e7
+          Name: Andres Moya Ignatov
+        Tertiary:
+          ID: OSG1000240
+          Name: Sravya Uppalapati
+    Description: Xrootd Redirector
+    FQDN: k8s-redir-stageout.ultralight.org
+    ID: 1485
+    Services:
+      XRootD component:
+        Description: Xrootd Redirector for Write Operations
+        Details:
+          hidden: false
+          uri_override: k8s-redir-stageout.ultralight.org:1094
+  Caltech PerfSonar Bandwidth K8s:
     Active: true
+    ContactLists:
+      Administrative Contact:
+        Primary:
+          ID: 6895284f54fb41f9daafc4b6d0a7ea42c57e31be
+          Name: Justas Balcas
+        Secondary:
+          ID: 5e2a78ef254d5b584751f4de9cd490287301e8e7
+          Name: Andres Moya Ignatov
+        Tertiary:
+          ID: OSG1000240
+          Name: Sravya Uppalapati
+      Security Contact:
+        Primary:
+          ID: 6895284f54fb41f9daafc4b6d0a7ea42c57e31be
+          Name: Justas Balcas
+        Secondary:
+          ID: 5e2a78ef254d5b584751f4de9cd490287301e8e7
+          Name: Andres Moya Ignatov
+        Tertiary:
+          ID: OSG1000240
+          Name: Sravya Uppalapati
+    Description: Bandwidth PerfSonar node
+    FQDN: perfsonar-01-v2001.ultralight.org
+    ID: 1486
+    Services:
+      net.perfSONAR.Bandwidth:
+        Description: PerfSonar Bandwidth monitoring node
+        Details:
+          endpoint: perfsonar-01-v2001.ultralight.org
+    VOOwnership:
+      CMS: 100
+  Caltech PerfSonar Latency K8s:
+    Active: true
+    ContactLists:
+      Administrative Contact:
+        Primary:
+          ID: 6895284f54fb41f9daafc4b6d0a7ea42c57e31be
+          Name: Justas Balcas
+        Secondary:
+          ID: 5e2a78ef254d5b584751f4de9cd490287301e8e7
+          Name: Andres Moya Ignatov
+        Tertiary:
+          ID: OSG1000240
+          Name: Sravya Uppalapati
+      Security Contact:
+        Primary:
+          ID: 6895284f54fb41f9daafc4b6d0a7ea42c57e31be
+          Name: Justas Balcas
+        Secondary:
+          ID: 5e2a78ef254d5b584751f4de9cd490287301e8e7
+          Name: Andres Moya Ignatov
+        Tertiary:
+          ID: OSG1000240
+          Name: Sravya Uppalapati
+    Description: Latency host for PerfSonar.
+    FQDN: perfsonar-02-v2001.ultralight.org
+    ID: 1487
+    Services:
+      net.perfSONAR.Latency:
+        Description: PerfSonar Latency monitoring node
+        Details:
+          endpoint: perfsonar-02-v2001.ultralight.org
+    VOOwnership:
+      CMS: 100
+# =================================================================================================
+# The following below are non active old resources. Not deleting them - as instructed by OSG Team.
+# All of them are set to Active: false
+# =================================================================================================
+  CIT_CMS_T2L:
+    Active: false
     ContactLists:
       Administrative Contact:
         Primary:
@@ -302,14 +499,14 @@ Resources:
           ID: OSG1000240
           Name: Sravya Uppalapati
     Description: Scheduler for Local users of Caltech CMS Group
-    FQDN: login-3.hep.caltech.edu
-    ID: 1063
+    FQDN: login-1.tier2
+    ID: 1055
     Services:
       Submit Node:
         Description: Schedd for Local Users of Caltech CMS Group
         Details:
           hidden: false
-          sam_uri: htcondor://login-3.tier2
+          sam_uri: htcondor://login-1.tier2
     VOOwnership:
       CMS: 100
     WLCGInformation:
@@ -323,8 +520,8 @@ Resources:
       KSI2KMin: 0
       StorageCapacityMax: 0
       StorageCapacityMin: 0
-  CIT_CMS_T2_Squid:
-    Active: true
+  CIT_CMS_T2L1:
+    Active: false
     ContactLists:
       Administrative Contact:
         Primary:
@@ -346,15 +543,30 @@ Resources:
         Tertiary:
           ID: OSG1000240
           Name: Sravya Uppalapati
-    Description: Squid service for frontier and cvmfs
-    FQDN: proxy-1.ultralight.org
-    ID: 688
+    Description: Scheduler for Local users of Caltech CMS Group
+    FQDN: login-1.hep.caltech.edu
+    ID: 1064
     Services:
-      Squid:
-        Description: Generic squid service
+      Submit Node:
+        Description: Schedd for Local Users of Caltech CMS Group
+        Details:
+          hidden: false
+          sam_uri: htcondor://login-1.tier2
     VOOwnership:
       CMS: 100
-  CIT_CMS_T2_2_Squid:
+    WLCGInformation:
+      APELNormalFactor: 13.64
+      AccountingName: T2_US_Caltech
+      HEPSPEC: 100408
+      InteropAccounting: true
+      InteropBDII: false
+      InteropMonitoring: true
+      KSI2KMax: 0
+      KSI2KMin: 0
+      StorageCapacityMax: 0
+      StorageCapacityMin: 0
+  CIT_CMS_T2L2:
+    Active: false
     ContactLists:
       Administrative Contact:
         Primary:
@@ -376,16 +588,75 @@ Resources:
         Tertiary:
           ID: OSG1000240
           Name: Sravya Uppalapati
-    Description: Second Squid service for frontier and cvmfs
-    FQDN: proxy-2.ultralight.org
-    ID: 225
+    Description: Scheduler for Local users of Caltech CMS Group
+    FQDN: login-2.hep.caltech.edu
+    ID: 1062
     Services:
-      Squid:
-        Description: Generic squid service
+      Submit Node:
+        Description: Schedd for Local Users of Caltech CMS Group
+        Details:
+          hidden: false
+          sam_uri: htcondor://login-2.tier2
     VOOwnership:
       CMS: 100
+    WLCGInformation:
+      APELNormalFactor: 13.64
+      AccountingName: T2_US_Caltech
+      HEPSPEC: 100408
+      InteropAccounting: true
+      InteropBDII: false
+      InteropMonitoring: true
+      KSI2KMax: 0
+      KSI2KMin: 0
+      StorageCapacityMax: 0
+      StorageCapacityMin: 0
+  CIT_CMS_T2L3:
+    Active: false
+    ContactLists:
+      Administrative Contact:
+        Primary:
+          ID: 6895284f54fb41f9daafc4b6d0a7ea42c57e31be
+          Name: Justas Balcas
+        Secondary:
+          ID: 5e2a78ef254d5b584751f4de9cd490287301e8e7
+          Name: Andres Moya Ignatov
+        Tertiary:
+          ID: OSG1000240
+          Name: Sravya Uppalapati
+      Security Contact:
+        Primary:
+          ID: 6895284f54fb41f9daafc4b6d0a7ea42c57e31be
+          Name: Justas Balcas
+        Secondary:
+          ID: 5e2a78ef254d5b584751f4de9cd490287301e8e7
+          Name: Andres Moya Ignatov
+        Tertiary:
+          ID: OSG1000240
+          Name: Sravya Uppalapati
+    Description: Scheduler for Local users of Caltech CMS Group
+    FQDN: login-3.hep.caltech.edu
+    ID: 1063
+    Services:
+      Submit Node:
+        Description: Schedd for Local Users of Caltech CMS Group
+        Details:
+          hidden: false
+          sam_uri: htcondor://login-3.tier2
+    VOOwnership:
+      CMS: 100
+    WLCGInformation:
+      APELNormalFactor: 13.64
+      AccountingName: T2_US_Caltech
+      HEPSPEC: 100408
+      InteropAccounting: true
+      InteropBDII: false
+      InteropMonitoring: true
+      KSI2KMax: 0
+      KSI2KMin: 0
+      StorageCapacityMax: 0
+      StorageCapacityMin: 0
   Caltech PerfSonar Bandwidth:
-    Active: true
+    Active: false
     ContactLists:
       Administrative Contact:
         Primary:
@@ -418,7 +689,7 @@ Resources:
     VOOwnership:
       CMS: 100
   Caltech PerfSonar Latency:
-    Active: true
+    Active: false
     ContactLists:
       Administrative Contact:
         Primary:
@@ -451,7 +722,7 @@ Resources:
     VOOwnership:
       CMS: 100
   CIT-CMS-T2-XRD:
-    Active: true
+    Active: false
     ContactLists:
       Administrative Contact:
         Primary:
@@ -483,7 +754,7 @@ Resources:
           hidden: false
           uri_override: xrootd.ultralight.org:1094
   CIT_CMS_T2_XRD_Ceph:
-    Active: true
+    Active: false
     ContactLists:
       Administrative Contact:
         Primary:
@@ -514,4 +785,3 @@ Resources:
         Details:
           hidden: false
           uri_override: xrootd-redir.ultralight.org:1094
-SupportCenter: USCMS_Tier2