diff --git a/Dockerfile b/Dockerfile
index d7ce9532f..5d4f93dcf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,7 +30,9 @@ RUN pip3 install --no-cache-dir -r requirements-apache.txt
 # Create data directory, and gather SSH keys for git
 RUN mkdir                  /data && \
     chown -v apache:apache /data && \
-    ssh-keyscan github.com bitbucket.org >> /etc/ssh/ssh_known_hosts
+    ssh-keyscan github.com bitbucket.org >> /etc/ssh/ssh_known_hosts && \
+    git config --global --add safe.directory /data/app/topology && \
+    git config --global --add safe.directory /data/app/contact
 
 # Add fetch-crl cronjob
 # Add daily restart of httpd to load renewed certificates
diff --git a/mappings/project_institution.yaml b/mappings/project_institution.yaml
index 8a4f65dfe..ff97e1dee 100644
--- a/mappings/project_institution.yaml
+++ b/mappings/project_institution.yaml
@@ -58,6 +58,7 @@ OHSU: "Oregon Health & Science University"
 OSU: "The Ohio State University"
 Pitt: "University of Pittsburgh"
 PortlandState: "Portland State University"
+PFW: "Purdue University Fort Wayne"
 PSI: "Planetary Science Institute"
 PSU: "Pennsylvania State University"
 Repertoire: "Repertoire Immune Medicines"
diff --git a/projects/CUBoulder_Piper.yaml b/projects/CUBoulder_Piper.yaml
new file mode 100644
index 000000000..184445a13
--- /dev/null
+++ b/projects/CUBoulder_Piper.yaml
@@ -0,0 +1,10 @@
+Department: INSTAAR
+Description: My role is to expose the community of scientists at CSDMS (https://csdms.colorado.edu)
+  to high-throughput computing. I plan to make a series of demonstration cases, run
+  them through OSG, and write up my experiences to highlight how HTC could be useful
+  for research in this community.
+FieldOfScience: Earth Sciences
+FieldOfScienceID: 40.0601b
+InstitutionID: https://osg-htc.org/iid/gpeckuwpdnrs
+Organization: University of Colorado Boulder
+PIName: Mark Piper
diff --git a/projects/IGWN_Staff.yaml b/projects/IGWN_Staff.yaml
new file mode 100644
index 000000000..30bea14b4
--- /dev/null
+++ b/projects/IGWN_Staff.yaml
@@ -0,0 +1,7 @@
+Department: Physics
+Description: IGWN staff
+FieldOfScience: Gravitational Physics
+FieldOfScienceID: '40.0202'
+InstitutionID: https://osg-htc.org/iid/uvf22j6xjbtv
+Organization: Georgia Institute of Technology
+PIName: James Clark
diff --git a/projects/NCAR_Schuster.yaml b/projects/NCAR_Schuster.yaml
new file mode 100644
index 000000000..53eefc0e1
--- /dev/null
+++ b/projects/NCAR_Schuster.yaml
@@ -0,0 +1,10 @@
+Department: Computational and Information System Lab
+Description: >-
+  We plan to test the capabilities of the OSPool to run climate science
+  research related data analytics workflows using datasets made accessible through
+  NSF NCAR's integration with the Open Science Data Federation.
+FieldOfScience: Atmospheric Sciences
+FieldOfScienceID: '40.0401'
+InstitutionID: https://osg-htc.org/iid/hfo8pge14iwg
+Organization: National Center for Atmospheric Research
+PIName: Douglas Schuster
diff --git a/projects/PFW_Sharma.yaml b/projects/PFW_Sharma.yaml
new file mode 100644
index 000000000..9fcb1458a
--- /dev/null
+++ b/projects/PFW_Sharma.yaml
@@ -0,0 +1,9 @@
+Department: Department of Chemistry and Biochemistry
+Description: 'Investigating protein-protein interactions related to the human immune
+  system. Other projects include immune protein-drug interactions. We mainly use molecular
+  dynamics simulations and molecular coking methodologies for our study. '
+FieldOfScience: Chemistry
+FieldOfScienceID: '40.0511'
+InstitutionID: 'https://osg-htc.org/iid/dgsgv9qbvgce'
+Organization: Purdue University Fort Wayne
+PIName: Arjun Sharma
diff --git a/projects/PSU_Lynch.yaml b/projects/PSU_Lynch.yaml
new file mode 100644
index 000000000..4319511ad
--- /dev/null
+++ b/projects/PSU_Lynch.yaml
@@ -0,0 +1,17 @@
+Department: Plant Science
+Description: "OpenSimRoot is an open-source, 3D functional\u2013structural plant model\
+  \ that simulates root system architecture 3 dimensionally, accounting for interactions\
+  \ between soil physical properties, root growth and associated metabolic costs thus\
+  \ enabling study of the value of root traits for resource acquisition and plant\
+  \ growth. As a research tool it supports experimental designs and mechanistic understanding\
+  \ of underlying processes. We aim to understand plant\u2013soil interactions in\
+  \ a wide range of soil taxa, especially with respect to degraded soils in developing\
+  \ countries, in order to address the knowledge gap that is critical for global food\
+  \ security. https://plantscience.psu.edu/research/labs/roots/methods/computer-analysis-tools\
+  \ https://plantscience.psu.edu/research/labs/roots/publications/overviews/opensimroot-widening-the-scope-and-application-of-root-architectural-models\
+  \ https://rootmodels.gitlab.io/ "
+FieldOfScience: Plant Biology
+FieldOfScienceID: '01.1101'
+InstitutionID: https://osg-htc.org/iid/f1tlj6c19ppg
+Organization: Pennsylvania State University
+PIName: Jonathan  Lynch
diff --git a/projects/SJSU_IT.yaml b/projects/SJSU_IT.yaml
new file mode 100644
index 000000000..779966862
--- /dev/null
+++ b/projects/SJSU_IT.yaml
@@ -0,0 +1,10 @@
+Department: IT/HPC
+Description: Our goals are to explore and learn about the OSG computing environment
+  so we can help and share the knowledge with SJSU researchers to enable them to utilize
+  OSG HPC for their research projects.
+FieldOfScience: Computer and Information Services
+FieldOfScienceID: '11.0101'
+InstitutionID: https://osg-htc.org/iid/0r71ijbk5mbz
+Organization: San Jose State University
+PIName: Atul Pala
+
diff --git a/projects/UCSD_Sfiligoi b/projects/UCSD_Sfiligoi
new file mode 100644
index 000000000..47fe36c7f
--- /dev/null
+++ b/projects/UCSD_Sfiligoi
@@ -0,0 +1,8 @@
+Department: San Diego Supercomputer Center
+Description: The mission of the Global Infrastructure Lab (GIL) is to test and evaluate
+  infrastructure software. This project is used to exercise the OSPool services.
+FieldOfScience: Computer Science
+FieldOfScienceID: '11.0501'
+InstitutionID: https://osg-htc.org/iid/06wup3aye2t7
+Organization: University of California, San Diego
+PIName: Igor Sfiligoi
diff --git a/projects/UMontana_Hansen.yaml b/projects/UMontana_Hansen.yaml
new file mode 100644
index 000000000..69622abc3
--- /dev/null
+++ b/projects/UMontana_Hansen.yaml
@@ -0,0 +1,9 @@
+Department: Division of Biological Sciences
+Description: Study the structure, function, and pharmacology of ligand-gated ion channels.
+  We are interested in running virtual screenings to identify novel ligands with therapeutic
+  potential in brain disorders. Se more at https://hansen-neurolab.com/
+FieldOfScience: Biological and Biomedical Sciences
+FieldOfScienceID: '26.9999'
+InstitutionID: https://osg-htc.org/iid/sdmbw89obfoi
+Organization: University of Montana
+PIName: Kasper Hansen
diff --git a/projects/UNL_Yin.yaml b/projects/UNL_Yin.yaml
new file mode 100644
index 000000000..713a8bae5
--- /dev/null
+++ b/projects/UNL_Yin.yaml
@@ -0,0 +1,10 @@
+Department: Food Science and Technology
+Description: "Our lab is a Bioinformatics and Computational Biology Lab. We have the\
+  \ following major research interests:1. Plant and microbial bioinformatics 2. Genome\
+  \ biology and evolutionary genomics\r\n3. Carbohydrate metabolism and secondary\
+  \ metabolism "
+FieldOfScience: Biological and Biomedical Sciences
+FieldOfScienceID: '26.9999'
+InstitutionID:  'https://osg-htc.org/iid/q9k1b8dfrw25'
+Organization: University of Nebraska - Lincoln
+PIName: Yanbin Yin
diff --git a/projects/UW_Loverde.yaml b/projects/UW_Loverde.yaml
new file mode 100644
index 000000000..a262801c0
--- /dev/null
+++ b/projects/UW_Loverde.yaml
@@ -0,0 +1,12 @@
+Department: Physics
+Description: "The University of Washington Dark Universe Science Center brings experts\
+  \ in dark matter, dark energy, inflation, and gravity together with those who study\
+  \ how these invisible ingredients drive the evolution of the Universe along with\
+  \ the stars, black holes, and galaxies within it. By combining observations of the\
+  \ cosmos with direct measurements of the Universe\u2019s invisible content, we hope\
+  \ to fundamentally change our understanding of Nature. (https://sites.google.com/uw.edu/dusc)"
+FieldOfScience: Physics
+FieldOfScienceID: '40.0202'
+InstitutionID: https://osg-htc.org/iid/8lpmoeouw66o
+Organization: University of Washington
+PIName: Marilena Loverde
diff --git a/requirements-rootless.txt b/requirements-rootless.txt
index 1dea7c264..7fbb8aa7a 100644
--- a/requirements-rootless.txt
+++ b/requirements-rootless.txt
@@ -28,6 +28,6 @@ requests~=2.31.0
 six~=1.16.0
 smmap~=5.0.0
 urllib3~=2.0.2
-Werkzeug~=2.3.4
+Werkzeug~=3.0.3
 WTForms~=3.0.1
 xmltodict~=0.13.0
diff --git a/src/README.md b/src/README.md
index c242dca5e..01c627baa 100644
--- a/src/README.md
+++ b/src/README.md
@@ -522,6 +522,7 @@ Each cache in the list contains the following attributes:
 - `endpoint`: The `<HOST>:<PORT>` of the public (`xrootd@stash-cache`) service
 - `auth_endpoint`: The `<HOST>:<PORT>` of the authenticated (`xrootd@stash-cache-auth`) service
 - `resource`: The resource name of the cache.
+- `production`: true if the resource is in "production" (as opposed to ITB)
 
 The JSON also contains an attribute `namespaces` that is a list of namespaces with the following attributes:
 - `path` is the path of the namespace
@@ -553,11 +554,13 @@ The final result looks like
     {
       "auth_endpoint": "osg-gftp.pace.gatech.edu:8443",
       "endpoint": "osg-gftp.pace.gatech.edu:8000",
+      "production": true,
       "resource": "Georgia_Tech_PACE_GridFTP"
     },
     {
       "auth_endpoint": "osg-gftp2.pace.gatech.edu:8443",
       "endpoint": "osg-gftp2.pace.gatech.edu:8000",
+      "production": true,
       "resource": "Georgia_Tech_PACE_GridFTP2"
     }
   ],
@@ -567,6 +570,7 @@ The final result looks like
         {
           "auth_endpoint": "rds-cache.sdsc.edu:8443",
           "endpoint": "rds-cache.sdsc.edu:8000",
+          "production": true,
           "resource": "RDS_AUTH_OSDF_CACHE"
         }
       ],
diff --git a/src/stashcache.py b/src/stashcache.py
index 7145706e2..47eb6986d 100644
--- a/src/stashcache.py
+++ b/src/stashcache.py
@@ -564,7 +564,17 @@ def _service_resource_dict(
                 if not is_null(svc, "Details", "auth_endpoint_override"):
                     auth_endpoint = svc["Details"]["auth_endpoint_override"]
                 break
-        return {"endpoint": endpoint, "auth_endpoint": auth_endpoint, "resource": r.name}
+        production = None
+        try:
+            production = bool(r.rg.production)
+        except AttributeError:
+            pass
+        return {
+            "endpoint": endpoint,
+            "auth_endpoint": auth_endpoint,
+            "resource": r.name,
+            "production": production,
+        }
 
     def _cache_resource_dict(r: Resource):
         return _service_resource_dict(r=r, service_name=XROOTD_CACHE_SERVER, auth_port_default=8443, unauth_port_default=8000)
diff --git a/src/tests/test_api.py b/src/tests/test_api.py
index c85d3eb96..a93672c9b 100644
--- a/src/tests/test_api.py
+++ b/src/tests/test_api.py
@@ -769,7 +769,8 @@ class TestEndpointContent:
         },
         'Tags': ['CC*']
     }
-    mock_resource = Resource("AMNH-ARES", mock_resource_information, global_data.get_topology().common_data)
+    mock_resource = Resource("AMNH-ARES", mock_resource_information, global_data.get_topology().common_data,
+                             mock_resource_group)
 
     mock_facility.add_site(mock_site)
     mock_site.add_resource_group(mock_resource_group)
diff --git a/src/tests/test_stashcache.py b/src/tests/test_stashcache.py
index f4573f68c..ac927ed1f 100644
--- a/src/tests/test_stashcache.py
+++ b/src/tests/test_stashcache.py
@@ -1,5 +1,6 @@
 from configparser import ConfigParser
 import copy
+
 import flask
 import pytest
 import re
@@ -279,6 +280,7 @@ def validate_cache_schema(cc):
         assert HOST_PORT_RE.match(cc["auth_endpoint"])
         assert HOST_PORT_RE.match(cc["endpoint"])
         assert cc["resource"] and isinstance(cc["resource"], str)
+        assert "production" in cc and isinstance(cc["production"], (type(None), bool))
 
     @staticmethod
     def validate_namespace_schema(ns):
diff --git a/src/webapp/common.py b/src/webapp/common.py
index cd85ca3d8..da238cfae 100644
--- a/src/webapp/common.py
+++ b/src/webapp/common.py
@@ -222,6 +222,13 @@ def trim_space(s: str) -> str:
     ret = re.sub(r"(?m)^[ \t]+", "", ret)
     return ret
 
+
+def fix_newlines(in_str: str) -> str:
+    """Replace Windows newlines with Unix newlines in a string;
+    other CR characters are replaced with a space"""
+    return in_str.replace("\r\n", "\n").replace("\r", " ")
+
+
 def run_git_cmd(cmd: List, dir=None, git_dir=None, ssh_key=None) -> bool:
     """
     Run git command, optionally specifying ssh key and/or git dirs
diff --git a/src/webapp/forms.py b/src/webapp/forms.py
index c2cb96282..b6a7d60f6 100644
--- a/src/webapp/forms.py
+++ b/src/webapp/forms.py
@@ -8,6 +8,7 @@
     TextAreaField, SubmitField, TimeField, DateField
 from wtforms.validators import InputRequired, ValidationError
 
+from .common import fix_newlines, trim_space
 from . import models
 
 UTCOFFSET_CHOICES = [
@@ -350,6 +351,13 @@ def __init__(self, *args, **kwargs):
         self.field_of_science.data = kwargs.get("field_of_science", self.field_of_science.data)
         self.field_of_science_id.data = kwargs.get("field_of_science_id", self.field_of_science_id.data)
         self.description.data = kwargs.get("description", self.description.data)
+        try:
+            self.description.data = trim_space(
+                fix_newlines(
+                    self.description.data.strip())
+            )
+        except (TypeError, AttributeError):
+            pass
 
         self.infos = ""
 
diff --git a/src/webapp/topology.py b/src/webapp/topology.py
index e8ea800e0..bcb9b5671 100644
--- a/src/webapp/topology.py
+++ b/src/webapp/topology.py
@@ -109,7 +109,7 @@ def is_ccstar(self):
         return self._is_ccstar
 
 class Resource(object):
-    def __init__(self, name: str, yaml_data: ParsedYaml, common_data: CommonData):
+    def __init__(self, name: str, yaml_data: ParsedYaml, common_data: CommonData, rg: "ResourceGroup"):
         self.name = name
         self.service_types = common_data.service_types
         self.common_data = common_data
@@ -124,6 +124,7 @@ def __init__(self, name: str, yaml_data: ParsedYaml, common_data: CommonData):
             raise ValueError(f"Resource {name} does not have an FQDN")
         self.fqdn = self.data["FQDN"]
         self.id = self.data["ID"]
+        self.rg = rg
 
     def get_stashcache_files(self, global_data, legacy):
         """Gets a resources Cache files as a dictionary"""
@@ -378,14 +379,14 @@ def __init__(self, name: str, yaml_data: ParsedYaml, site: Site, common_data: Co
         self.support_center = OrderedDict([("ID", scid), ("Name", scname)])
 
         self.resources_by_name = {}
-        for name, res in yaml_data["Resources"].items():
+        for res_name, res in yaml_data["Resources"].items():
             try:
                 if not isinstance(res, dict):
                     raise TypeError("expecting a dict")
-                res_obj = Resource(name, ParsedYaml(res), self.common_data)
-                self.resources_by_name[name] = res_obj
+                res_obj = Resource(res_name, ParsedYaml(res), self.common_data, rg=self)
+                self.resources_by_name[res_name] = res_obj
             except (AttributeError, KeyError, TypeError, ValueError) as err:
-                log.exception("Error with resource %s: %r", name, err)
+                log.exception("Error with resource %s: %r", res_name, err)
                 continue
 
         self.data = yaml_data
diff --git a/topology/Brookhaven National Laboratory/BNL ATLAS Tier1/BNL-ATLAS.yaml b/topology/Brookhaven National Laboratory/BNL ATLAS Tier1/BNL-ATLAS.yaml
index 3738af857..f9c061f92 100644
--- a/topology/Brookhaven National Laboratory/BNL ATLAS Tier1/BNL-ATLAS.yaml	
+++ b/topology/Brookhaven National Laboratory/BNL ATLAS Tier1/BNL-ATLAS.yaml	
@@ -220,14 +220,14 @@ Resources:
           ID: OSG1000212
     Description: An OSG CE resource at BNL, mainly serving USATLAS production jobs,
       not open to general OSG users.
-    FQDN: gridgk07.racf.bnl.gov
+    FQDN: gridgk07.sdcc.bnl.gov
     ID: 438
     Services:
       CE:
         Description: Compute Element
         Details:
           hidden: false
-          sam_uri: htcondor://gridgk07.racf.bnl.gov
+          sam_uri: htcondor://gridgk07.sdcc.bnl.gov
     VOOwnership:
       ATLAS: 100
     WLCGInformation:
@@ -261,14 +261,14 @@ Resources:
           ID: OSG1000212
     Description: This CE will serve grid jobs submitted to the *local* USATLAS resources,
       e.g. for panda queue ANALY_BNL_LOCAL, at BNL.
-    FQDN: gridgk08.racf.bnl.gov
+    FQDN: gridgk08.sdcc.bnl.gov
     ID: 545
     Services:
       CE:
         Description: Compute Element
         Details:
           hidden: false
-          sam_uri: htcondor://gridgk08.racf.bnl.gov
+          sam_uri: htcondor://gridgk08.sdcc.bnl.gov
     VOOwnership:
       ATLAS: 100
     WLCGInformation:
diff --git a/topology/Cardiff University/Cardiff Computing Cluster/CardiffPRPCachingInfrastructure.yaml b/topology/Cardiff University/Cardiff Computing Cluster/CardiffPRPCachingInfrastructure.yaml
index 857cc3811..20979b49e 100644
--- a/topology/Cardiff University/Cardiff Computing Cluster/CardiffPRPCachingInfrastructure.yaml	
+++ b/topology/Cardiff University/Cardiff Computing Cluster/CardiffPRPCachingInfrastructure.yaml	
@@ -17,6 +17,10 @@ Resources:
         Primary:
           Name: Fabio Andrijauskas
           ID: OSG1000162
+      Site Contact:
+        Primary:
+          Name: Duncan MacLeod
+          ID: OSG1000688
     FQDN: stashcache.gravity.cf.ac.uk
     DN: /C=UK/O=eScience/OU=Cardiff/L=WeSC/CN=stashcache.gravity.cf.ac.uk
     Services:
@@ -38,6 +42,10 @@ Resources:
         Primary:
           Name: Fabio Andrijauskas
           ID: OSG1000162
+      Site Contact:
+        Primary:
+          Name: Duncan MacLeod
+          ID: OSG1000688
     FQDN: cf-ac-uk-cache.nationalresearchplatform.org
     DN: /DC=org/DC=incommon/C=US/ST=California/O=University of California, San Diego/CN=cf-ac-uk-cache.nationalresearchplatform.org
     Services:
diff --git a/topology/Cardiff University/Cardiff Computing Cluster/CardiffPRPCachingInfrastructure_downtime.yaml b/topology/Cardiff University/Cardiff Computing Cluster/CardiffPRPCachingInfrastructure_downtime.yaml
index cb1404d6b..28a85b26f 100644
--- a/topology/Cardiff University/Cardiff Computing Cluster/CardiffPRPCachingInfrastructure_downtime.yaml	
+++ b/topology/Cardiff University/Cardiff Computing Cluster/CardiffPRPCachingInfrastructure_downtime.yaml	
@@ -53,3 +53,26 @@
   Services:
   - XRootD cache server
 # ---------------------------------------------------------
+- Class: SCHEDULED
+  ID: 1794218483
+  Description: 'Scheduled power outage'
+  Severity: Outage
+  StartTime: May 01, 2024 12:00 +0100
+  EndTime: May 02, 2024 17:00 +0000
+  CreatedTime: May 01, 2024 11:09 +0100
+  ResourceName: CARDIFF_UK_OSDF_CACHE
+  Services:
+  - XRootD cache server
+# ---------------------------------------------------------
+- Class: UNSCHEDULED
+  ID: 1808101910
+  Description: overloaded
+  Severity: Outage
+  StartTime: May 14, 2024 19:30 +0000
+  EndTime: May 31, 2024 19:30 +0000
+  CreatedTime: May 15, 2024 21:56 +0000
+  ResourceName: CARDIFF_UK_OSDF_CACHE
+  Services:
+  - XRootD cache server
+# ---------------------------------------------------------
+
diff --git a/topology/Clemson University/Clemson-Palmetto/Clemson-Palmetto.yaml b/topology/Clemson University/Clemson-Palmetto/Clemson-Palmetto.yaml
index d2e5d91d7..d160a580d 100644
--- a/topology/Clemson University/Clemson-Palmetto/Clemson-Palmetto.yaml	
+++ b/topology/Clemson University/Clemson-Palmetto/Clemson-Palmetto.yaml	
@@ -3,7 +3,7 @@ GroupID: 212
 Production: true
 Resources:
   Clemson-Connect:
-    Active: true
+    Active: false
     ContactLists:
       Administrative Contact:
         Primary:
@@ -30,7 +30,7 @@ Resources:
           hidden: false
           uri_override: osgconnect@user.palmetto.clemson.edu/pbs
   Clemson-Palmetto:
-    Active: true
+    Active: false
     ContactLists:
       Administrative Contact:
         Primary:
diff --git a/topology/Cybera/Cybera - Edmonton/CyberaEdmonton.yaml b/topology/Cybera/Cybera - Edmonton/CyberaEdmonton.yaml
index 6831e49e2..a16679bfb 100644
--- a/topology/Cybera/Cybera - Edmonton/CyberaEdmonton.yaml	
+++ b/topology/Cybera/Cybera - Edmonton/CyberaEdmonton.yaml	
@@ -4,6 +4,7 @@ GroupID: 519
 GroupDescription: Edmonton branch of Cybera
 Resources:
   CYBERA_EDMONTON:
+    Active: false
     ID: 1032
     Description: Cybera Edmonton CE
     ContactLists:
diff --git a/topology/Franklin and Marshall College/FANDM-ITS/FANDM-ITS_downtime.yaml b/topology/Franklin and Marshall College/FANDM-ITS/FANDM-ITS_downtime.yaml
index a9eb49489..b7f21dc55 100644
--- a/topology/Franklin and Marshall College/FANDM-ITS/FANDM-ITS_downtime.yaml	
+++ b/topology/Franklin and Marshall College/FANDM-ITS/FANDM-ITS_downtime.yaml	
@@ -10,3 +10,16 @@
   Services:
   - CE
 # ---------------------------------------------------------
+- Class: SCHEDULED
+  ID: 1803422265
+  Description: Cluster is now up after maintenance.  We noted before that the partition
+    has changed from osg to nodes.  Please resume sending jobs
+  Severity: No Significant Outage Expected
+  StartTime: May 10, 2024 08:00 +0000
+  EndTime: May 10, 2024 08:00 +0000
+  CreatedTime: May 10, 2024 07:57 +0000
+  ResourceName: FANDM-ITS-CE1
+  Services:
+  - CE
+# ---------------------------------------------------------
+
diff --git a/topology/Georgia Institute of Technology/Georgia Tech/Georgia Tech PACE OSG 2_downtime.yaml b/topology/Georgia Institute of Technology/Georgia Tech/Georgia Tech PACE OSG 2_downtime.yaml
index 633d15c7c..fac08e0e8 100644
--- a/topology/Georgia Institute of Technology/Georgia Tech/Georgia Tech PACE OSG 2_downtime.yaml	
+++ b/topology/Georgia Institute of Technology/Georgia Tech/Georgia Tech PACE OSG 2_downtime.yaml	
@@ -763,3 +763,83 @@
   Services:
   - XRootD cache server
 # ---------------------------------------------------------
+- Class: UNSCHEDULED
+  ID: 1800928693
+  Description: Site Wide Maintenance
+  Severity: Outage
+  StartTime: May 07, 2024 10:00 +0000
+  EndTime: May 11, 2024 03:59 +0000
+  CreatedTime: May 07, 2024 14:41 +0000
+  ResourceName: Georgia_Tech_LIGO_Submit_2
+  Services:
+  - Submit Node
+# ---------------------------------------------------------
+- Class: UNSCHEDULED
+  ID: 1800928694
+  Description: Site Wide Maintenance
+  Severity: Outage
+  StartTime: May 07, 2024 10:00 +0000
+  EndTime: May 11, 2024 03:59 +0000
+  CreatedTime: May 07, 2024 14:41 +0000
+  ResourceName: Georgia_Tech_PACE_CE_2
+  Services:
+  - CE
+  - Squid
+# ---------------------------------------------------------
+- Class: UNSCHEDULED
+  ID: 1800928695
+  Description: Site Wide Maintenance
+  Severity: Outage
+  StartTime: May 07, 2024 10:00 +0000
+  EndTime: May 11, 2024 03:59 +0000
+  CreatedTime: May 07, 2024 14:41 +0000
+  ResourceName: Georgia_Tech_PACE_CE_ICECUBE
+  Services:
+  - CE
+# ---------------------------------------------------------
+- Class: UNSCHEDULED
+  ID: 1800928696
+  Description: Site Wide Maintenance
+  Severity: Outage
+  StartTime: May 07, 2024 10:00 +0000
+  EndTime: May 11, 2024 03:59 +0000
+  CreatedTime: May 07, 2024 14:41 +0000
+  ResourceName: Georgia_Tech_PACE_CE_LIGO
+  Services:
+  - CE
+# ---------------------------------------------------------
+- Class: UNSCHEDULED
+  ID: 1800928697
+  Description: Site Wide Maintenance
+  Severity: Outage
+  StartTime: May 07, 2024 10:00 +0000
+  EndTime: May 11, 2024 03:59 +0000
+  CreatedTime: May 07, 2024 14:41 +0000
+  ResourceName: Georgia_Tech_PACE_CE_OSG
+  Services:
+  - CE
+# ---------------------------------------------------------
+- Class: UNSCHEDULED
+  ID: 1800928698
+  Description: Site Wide Maintenance
+  Severity: Outage
+  StartTime: May 07, 2024 10:00 +0000
+  EndTime: May 11, 2024 03:59 +0000
+  CreatedTime: May 07, 2024 14:41 +0000
+  ResourceName: Georgia_Tech_PACE_GridFTP2
+  Services:
+  - GridFtp
+  - XRootD cache server
+# ---------------------------------------------------------
+- Class: UNSCHEDULED
+  ID: 1800928699
+  Description: Site Wide Maintenance
+  Severity: Outage
+  StartTime: May 07, 2024 10:00 +0000
+  EndTime: May 11, 2024 03:59 +0000
+  CreatedTime: May 07, 2024 14:41 +0000
+  ResourceName: Georgia_Tech_PACE_perfSONAR_BW
+  Services:
+  - net.perfSONAR.Bandwidth
+# ---------------------------------------------------------
+
diff --git a/topology/Internet2/Internet2Boise/I2BoiseInfrastructure_downtime.yaml b/topology/Internet2/Internet2Boise/I2BoiseInfrastructure_downtime.yaml
index 4310cdc07..a10db4b36 100644
--- a/topology/Internet2/Internet2Boise/I2BoiseInfrastructure_downtime.yaml
+++ b/topology/Internet2/Internet2Boise/I2BoiseInfrastructure_downtime.yaml
@@ -20,3 +20,14 @@
   Services:
   - XRootD cache server
 # ---------------------------------------------------------
+- Class: UNSCHEDULED
+  ID: 1806272100
+  Description: '#toPelican'
+  Severity: Outage
+  StartTime: May 12, 2024 19:30 +0000
+  EndTime: May 18, 2024 06:59 +0000
+  CreatedTime: May 13, 2024 19:06 +0000
+  ResourceName: BOISE_INTERNET2_OSDF_CACHE
+  Services:
+  - XRootD cache server
+# ---------------------------------------------------------
diff --git a/topology/Internet2/Internet2Chicago/I2ChicagoInfrastructure.yaml b/topology/Internet2/Internet2Chicago/I2ChicagoInfrastructure.yaml
index 456cf92dc..56b02345f 100644
--- a/topology/Internet2/Internet2Chicago/I2ChicagoInfrastructure.yaml
+++ b/topology/Internet2/Internet2Chicago/I2ChicagoInfrastructure.yaml
@@ -18,7 +18,7 @@ Resources:
           Name: Fabio Andrijauskas 
           ID: OSG1000162
     FQDN: osg-chicago-stashcache.nrp.internet2.edu
-    DN: /DC=org/DC=incommon/C=US/ST=Michigan/O=University Corporation For Advanced Internet Development/CN=osg-chicago-stashcache.nrp.internet2.edu
+    DN: /CN=osg-chicago-stashcache.nrp.internet2.edu
     Services:
       XRootD cache server:
         Description: Internet2 Chicago Cache
diff --git a/topology/Internet2/Internet2Chicago/I2ChicagoInfrastructure_downtime.yaml b/topology/Internet2/Internet2Chicago/I2ChicagoInfrastructure_downtime.yaml
index 4bbac9456..30bf616a9 100644
--- a/topology/Internet2/Internet2Chicago/I2ChicagoInfrastructure_downtime.yaml
+++ b/topology/Internet2/Internet2Chicago/I2ChicagoInfrastructure_downtime.yaml
@@ -20,3 +20,14 @@
   Services:
   - XRootD cache server
 # ---------------------------------------------------------
+- Class: UNSCHEDULED
+  ID: 1800341180
+  Description: Hardware issues RAID problem
+  Severity: Outage
+  StartTime: May 06, 2024 19:30 +0000
+  EndTime: May 10, 2024 19:30 +0000
+  CreatedTime: May 06, 2024 22:21 +0000
+  ResourceName: Stashcache-Chicago
+  Services:
+  - XRootD cache server
+# ---------------------------------------------------------
diff --git a/topology/Internet2/Internet2Cincinnati/I2CincinnatiInfrastructure_downtime.yaml b/topology/Internet2/Internet2Cincinnati/I2CincinnatiInfrastructure_downtime.yaml
new file mode 100644
index 000000000..c46c939ab
--- /dev/null
+++ b/topology/Internet2/Internet2Cincinnati/I2CincinnatiInfrastructure_downtime.yaml
@@ -0,0 +1,11 @@
+- Class: UNSCHEDULED
+  ID: 1807071908
+  Description: '#toPelican'
+  Severity: Outage
+  StartTime: May 14, 2024 07:01 +0000
+  EndTime: May 17, 2024 19:30 +0000
+  CreatedTime: May 14, 2024 17:19 +0000
+  ResourceName: CINCINNATI_INTERNET2_OSDF_CACHE
+  Services:
+  - XRootD cache server
+# ---------------------------------------------------------
diff --git a/topology/Internet2/Internet2Denver/I2DenverInfrastructure.yaml b/topology/Internet2/Internet2Denver/I2DenverInfrastructure.yaml
index fef5e0dff..f8b67752e 100644
--- a/topology/Internet2/Internet2Denver/I2DenverInfrastructure.yaml
+++ b/topology/Internet2/Internet2Denver/I2DenverInfrastructure.yaml
@@ -21,5 +21,8 @@ Resources:
     Services:
       XRootD cache server:
         Description: Internet2 Denver Cache
+        Details:
+          endpoint_override: dtn-pas.denv.nrp.internet2.edu:8443
+          auth_endpoint_override: dtn-pas.denv.nrp.internet2.edu:8443
     AllowedVOs:
       - ANY
diff --git a/topology/Internet2/Internet2Denver/I2DenverInfrastructure_downtime.yaml b/topology/Internet2/Internet2Denver/I2DenverInfrastructure_downtime.yaml
index 0d858c7a4..6a1cc3a33 100644
--- a/topology/Internet2/Internet2Denver/I2DenverInfrastructure_downtime.yaml
+++ b/topology/Internet2/Internet2Denver/I2DenverInfrastructure_downtime.yaml
@@ -31,3 +31,14 @@
   Services:
   - XRootD cache server
 # ---------------------------------------------------------
+- Class: UNSCHEDULED
+  ID: 1801868080
+  Description: toPelican
+  Severity: Outage
+  StartTime: May 08, 2024 00:01 +0000
+  EndTime: May 10, 2024 19:30 +0000
+  CreatedTime: May 08, 2024 16:46 +0000
+  ResourceName: DENVER_INTERNET2_OSDF_CACHE
+  Services:
+  - XRootD cache server
+# ---------------------------------------------------------
diff --git a/topology/Massachusetts Green High Performance Computing Center/NRP/MGHPCCCachingInfrastructure_downtime.yaml b/topology/Massachusetts Green High Performance Computing Center/NRP/MGHPCCCachingInfrastructure_downtime.yaml
index c40db5431..a41d58815 100644
--- a/topology/Massachusetts Green High Performance Computing Center/NRP/MGHPCCCachingInfrastructure_downtime.yaml	
+++ b/topology/Massachusetts Green High Performance Computing Center/NRP/MGHPCCCachingInfrastructure_downtime.yaml	
@@ -20,3 +20,14 @@
   Services:
   - XRootD cache server
 # ---------------------------------------------------------
+- Class: UNSCHEDULED
+  ID: 1806232660
+  Description: HW issue
+  Severity: Outage
+  StartTime: May 12, 2024 19:30 +0000
+  EndTime: Jul 31, 2024 19:30 +0000
+  CreatedTime: May 13, 2024 18:01 +0000
+  ResourceName: MGHPCC_NRP_OSDF_CACHE
+  Services:
+  - XRootD cache server
+# ---------------------------------------------------------
diff --git a/topology/National Center for Atmospheric Research/NCAR-Wyoming Supercomputing Center/NCAR-OSDF_downtime.yaml b/topology/National Center for Atmospheric Research/NCAR-Wyoming Supercomputing Center/NCAR-OSDF_downtime.yaml
new file mode 100644
index 000000000..3188d26fd
--- /dev/null
+++ b/topology/National Center for Atmospheric Research/NCAR-Wyoming Supercomputing Center/NCAR-OSDF_downtime.yaml	
@@ -0,0 +1,11 @@
+- Class: UNSCHEDULED
+  ID: 1801069641
+  Description: Firewall issues
+  Severity: Outage
+  StartTime: May 07, 2024 19:30 +0000
+  EndTime: May 31, 2024 19:30 +0000
+  CreatedTime: May 07, 2024 18:36 +0000
+  ResourceName: NCAR_OSDF_ORIGIN
+  Services:
+  - XRootD origin server
+# ---------------------------------------------------------
diff --git a/topology/Riga Technical University/RTU-CMS/SITE.yaml b/topology/Riga Technical University/RTU-CMS/SITE.yaml
new file mode 100644
index 000000000..e00f816b8
--- /dev/null
+++ b/topology/Riga Technical University/RTU-CMS/SITE.yaml	
@@ -0,0 +1,12 @@
+LongName: Riga Technical University CMS Tier-2
+Description: CMS Tier-2 site hosted by the Latvia CMS Tier-2 Federation in Riga Technical University
+
+AddressLine1: 6A Kipsalas Street
+City: Riga
+Country: Latvia
+### State (optional) is the state or province the site is located in
+# State: Wisconsin
+Zipcode: "LV-1048"
+
+Latitude: 56.9539
+Longitude: 23.8959
diff --git a/topology/Swinburne University of Technology/SUT - OzStar/SUT-OzStar_downtime.yaml b/topology/Swinburne University of Technology/SUT - OzStar/SUT-OzStar_downtime.yaml
new file mode 100644
index 000000000..9cd6f2b4c
--- /dev/null
+++ b/topology/Swinburne University of Technology/SUT - OzStar/SUT-OzStar_downtime.yaml	
@@ -0,0 +1,11 @@
+- Class: UNSCHEDULED
+  ID: 1801866975
+  Description: Hardware migration
+  Severity: Outage
+  StartTime: May 08, 2024 19:30 +0000
+  EndTime: May 24, 2024 19:30 +0000
+  CreatedTime: May 08, 2024 16:44 +0000
+  ResourceName: SUT-STASHCACHE
+  Services:
+  - XRootD cache server
+# ---------------------------------------------------------
diff --git a/topology/Universidade Estadual Paulista/SPRACE/SPRACE_downtime.yaml b/topology/Universidade Estadual Paulista/SPRACE/SPRACE_downtime.yaml
index a882e331c..eff8c25ae 100644
--- a/topology/Universidade Estadual Paulista/SPRACE/SPRACE_downtime.yaml	
+++ b/topology/Universidade Estadual Paulista/SPRACE/SPRACE_downtime.yaml	
@@ -3258,3 +3258,157 @@
   Services:
   - Squid
 # ---------------------------------------------------------
+- Class: UNSCHEDULED
+  ID: 1803572631
+  Description: network outage - fiber cut
+  Severity: Outage
+  StartTime: May 10, 2024 16:00 +0000
+  EndTime: May 10, 2024 22:00 +0000
+  CreatedTime: May 10, 2024 16:07 +0000
+  ResourceName: BR-Sprace BW
+  Services:
+  - net.perfSONAR.Bandwidth
+# ---------------------------------------------------------
+- Class: UNSCHEDULED
+  ID: 1803572632
+  Description: network outage - fiber cut
+  Severity: Outage
+  StartTime: May 10, 2024 16:00 +0000
+  EndTime: May 10, 2024 22:00 +0000
+  CreatedTime: May 10, 2024 16:07 +0000
+  ResourceName: BR-Sprace LT
+  Services:
+  - net.perfSONAR.Latency
+# ---------------------------------------------------------
+- Class: UNSCHEDULED
+  ID: 1803572633
+  Description: network outage - fiber cut
+  Severity: Outage
+  StartTime: May 10, 2024 16:00 +0000
+  EndTime: May 10, 2024 22:00 +0000
+  CreatedTime: May 10, 2024 16:07 +0000
+  ResourceName: SPRACE
+  Services:
+  - CE
+# ---------------------------------------------------------
+- Class: UNSCHEDULED
+  ID: 1803572634
+  Description: network outage - fiber cut
+  Severity: Outage
+  StartTime: May 10, 2024 16:00 +0000
+  EndTime: May 10, 2024 22:00 +0000
+  CreatedTime: May 10, 2024 16:07 +0000
+  ResourceName: SPRACE-SE
+  Services:
+  - SRMv2
+# ---------------------------------------------------------
+- Class: UNSCHEDULED
+  ID: 1803572635
+  Description: network outage - fiber cut
+  Severity: Outage
+  StartTime: May 10, 2024 16:00 +0000
+  EndTime: May 10, 2024 22:00 +0000
+  CreatedTime: May 10, 2024 16:07 +0000
+  ResourceName: SPRACE_OSDF_CACHE
+  Services:
+  - XRootD cache server
+# ---------------------------------------------------------
+- Class: UNSCHEDULED
+  ID: 1803572636
+  Description: network outage - fiber cut
+  Severity: Outage
+  StartTime: May 10, 2024 16:00 +0000
+  EndTime: May 10, 2024 22:00 +0000
+  CreatedTime: May 10, 2024 16:07 +0000
+  ResourceName: T2_BR_SPRACE-squid1
+  Services:
+  - Squid
+# ---------------------------------------------------------
+- Class: UNSCHEDULED
+  ID: 1803572637
+  Description: network outage - fiber cut
+  Severity: Outage
+  StartTime: May 10, 2024 16:00 +0000
+  EndTime: May 10, 2024 22:00 +0000
+  CreatedTime: May 10, 2024 16:07 +0000
+  ResourceName: T2_BR_SPRACE-squid2
+  Services:
+  - Squid
+# ---------------------------------------------------------
+- Class: UNSCHEDULED
+  ID: 1803788879
+  Description: network outage - fiber cut
+  Severity: Outage
+  StartTime: May 10, 2024 22:07 +0000
+  EndTime: May 11, 2024 11:30 +0000
+  CreatedTime: May 10, 2024 22:08 +0000
+  ResourceName: BR-Sprace BW
+  Services:
+  - net.perfSONAR.Bandwidth
+# ---------------------------------------------------------
+- Class: UNSCHEDULED
+  ID: 1803788880
+  Description: network outage - fiber cut
+  Severity: Outage
+  StartTime: May 10, 2024 22:07 +0000
+  EndTime: May 11, 2024 11:30 +0000
+  CreatedTime: May 10, 2024 22:08 +0000
+  ResourceName: BR-Sprace LT
+  Services:
+  - net.perfSONAR.Latency
+# ---------------------------------------------------------
+- Class: UNSCHEDULED
+  ID: 1803788881
+  Description: network outage - fiber cut
+  Severity: Outage
+  StartTime: May 10, 2024 22:07 +0000
+  EndTime: May 11, 2024 11:30 +0000
+  CreatedTime: May 10, 2024 22:08 +0000
+  ResourceName: SPRACE
+  Services:
+  - CE
+# ---------------------------------------------------------
+- Class: UNSCHEDULED
+  ID: 1803788882
+  Description: network outage - fiber cut
+  Severity: Outage
+  StartTime: May 10, 2024 22:07 +0000
+  EndTime: May 11, 2024 11:30 +0000
+  CreatedTime: May 10, 2024 22:08 +0000
+  ResourceName: SPRACE-SE
+  Services:
+  - SRMv2
+# ---------------------------------------------------------
+- Class: UNSCHEDULED
+  ID: 1803788883
+  Description: network outage - fiber cut
+  Severity: Outage
+  StartTime: May 10, 2024 22:07 +0000
+  EndTime: May 11, 2024 11:30 +0000
+  CreatedTime: May 10, 2024 22:08 +0000
+  ResourceName: SPRACE_OSDF_CACHE
+  Services:
+  - XRootD cache server
+# ---------------------------------------------------------
+- Class: UNSCHEDULED
+  ID: 1803788884
+  Description: network outage - fiber cut
+  Severity: Outage
+  StartTime: May 10, 2024 22:07 +0000
+  EndTime: May 11, 2024 11:30 +0000
+  CreatedTime: May 10, 2024 22:08 +0000
+  ResourceName: T2_BR_SPRACE-squid1
+  Services:
+  - Squid
+# ---------------------------------------------------------
+- Class: UNSCHEDULED
+  ID: 1803788885
+  Description: network outage - fiber cut
+  Severity: Outage
+  StartTime: May 10, 2024 22:07 +0000
+  EndTime: May 11, 2024 11:30 +0000
+  CreatedTime: May 10, 2024 22:08 +0000
+  ResourceName: T2_BR_SPRACE-squid2
+  Services:
+  - Squid
+# ---------------------------------------------------------
diff --git a/topology/Universidade do Estado do Rio de Janeiro/T2_BR_UERJ/UERJ_downtime.yaml b/topology/Universidade do Estado do Rio de Janeiro/T2_BR_UERJ/UERJ_downtime.yaml
index 78a8c7671..c75f02d58 100644
--- a/topology/Universidade do Estado do Rio de Janeiro/T2_BR_UERJ/UERJ_downtime.yaml	
+++ b/topology/Universidade do Estado do Rio de Janeiro/T2_BR_UERJ/UERJ_downtime.yaml	
@@ -1401,4 +1401,59 @@
   Services:
   - Squid
 # ---------------------------------------------------------
+- Class: UNSCHEDULED
+  ID: 1801899214
+  Description: We're migrating our storage
+  Severity: Outage
+  StartTime: May 07, 2024 17:50 +0000
+  EndTime: May 27, 2024 14:00 +0000
+  CreatedTime: May 08, 2024 17:38 +0000
+  ResourceName: UERJ_CE
+  Services:
+  - CE
+# ---------------------------------------------------------
+- Class: UNSCHEDULED
+  ID: 1801899600
+  Description: We're migrating our storage and will update our workernodes to EL8
+  Severity: Outage
+  StartTime: May 07, 2024 17:50 +0000
+  EndTime: May 27, 2024 14:00 +0000
+  CreatedTime: May 08, 2024 17:39 +0000
+  ResourceName: UERJ_CE_2
+  Services:
+  - CE
+# ---------------------------------------------------------
+- Class: UNSCHEDULED
+  ID: 1801899685
+  Description: We're migrating our storage and will update our workernodes to EL8
+  Severity: Outage
+  StartTime: May 07, 2024 17:50 +0000
+  EndTime: May 27, 2024 14:00 +0000
+  CreatedTime: May 08, 2024 17:39 +0000
+  ResourceName: UERJ_SE
+  Services:
+  - SRMv2
+# ---------------------------------------------------------
+- Class: UNSCHEDULED
+  ID: 1801899756
+  Description: We're migrating our storage and will update our workernodes to EL8
+  Severity: Outage
+  StartTime: May 07, 2024 17:50 +0000
+  EndTime: May 27, 2024 14:00 +0000
+  CreatedTime: May 08, 2024 17:39 +0000
+  ResourceName: UERJ_SQUID
+  Services:
+  - Squid
+# ---------------------------------------------------------
+- Class: UNSCHEDULED
+  ID: 1801899851
+  Description: We're migrating our storage and will update our workernodes to EL8
+  Severity: Outage
+  StartTime: May 07, 2024 17:50 +0000
+  EndTime: May 27, 2024 14:00 +0000
+  CreatedTime: May 08, 2024 17:39 +0000
+  ResourceName: UERJ_SQUID_2
+  Services:
+  - Squid
+# ---------------------------------------------------------
 
diff --git a/topology/University of Alabama in Huntsville/FACILITY.yaml b/topology/University of Alabama in Huntsville/FACILITY.yaml
new file mode 100644
index 000000000..c6eea5eb0
--- /dev/null
+++ b/topology/University of Alabama in Huntsville/FACILITY.yaml	
@@ -0,0 +1 @@
+ID: 10217
diff --git a/topology/University of Alabama in Huntsville/UAH - CSPAR/SITE.yaml b/topology/University of Alabama in Huntsville/UAH - CSPAR/SITE.yaml
new file mode 100644
index 000000000..c4939e69b
--- /dev/null
+++ b/topology/University of Alabama in Huntsville/UAH - CSPAR/SITE.yaml	
@@ -0,0 +1,7 @@
+AddressLine1: 301 Sparkman Drive
+Country: United States
+Description: University of Alabama in Huntsville
+Latitude: 34.72525
+Longitude: -86.64045
+State: Alabama
+Zipcode: '35899'
diff --git a/topology/University of Alabama in Huntsville/UAH - CSPAR/UAH-Voyager.yaml b/topology/University of Alabama in Huntsville/UAH - CSPAR/UAH-Voyager.yaml
new file mode 100644
index 000000000..a95308190
--- /dev/null
+++ b/topology/University of Alabama in Huntsville/UAH - CSPAR/UAH-Voyager.yaml	
@@ -0,0 +1,25 @@
+Production: true
+SupportCenter: Self Supported
+
+GroupDescription: The University of Alabama in Huntsville
+
+Resources:
+  UAH-Voyager-CE1:
+    Active: true
+    Description: Hosted CE serving UAH
+    ContactLists:
+      Administrative Contact:
+        Primary:
+          Name: Jeffrey Michael Dost
+          ID: 3a8eb6436a8b78ca50f7e93bb2a4d1f0141212ba
+      Security Contact:
+        Primary:
+          Name: Jeffrey Michael Dost
+          ID: 3a8eb6436a8b78ca50f7e93bb2a4d1f0141212ba
+
+    FQDN: uah-voyager-ce1.svc.opensciencegrid.org
+    Services:
+      CE:
+        Description: Hosted CE
+    Tags:
+      - CC*
diff --git a/topology/University of Amsterdam/AmsterdamPRP/AmsterdamPRPCachingInfrastructure_downtime.yaml b/topology/University of Amsterdam/AmsterdamPRP/AmsterdamPRPCachingInfrastructure_downtime.yaml
index 4aef89e59..d2680ecf2 100644
--- a/topology/University of Amsterdam/AmsterdamPRP/AmsterdamPRPCachingInfrastructure_downtime.yaml	
+++ b/topology/University of Amsterdam/AmsterdamPRP/AmsterdamPRPCachingInfrastructure_downtime.yaml	
@@ -64,3 +64,14 @@
   Services:
   - XRootD cache server
 # ---------------------------------------------------------
+- Class: UNSCHEDULED
+  ID: 1808103764
+  Description: overloaded
+  Severity: Outage
+  StartTime: May 14, 2024 19:30 +0000
+  EndTime: May 31, 2024 19:30 +0000
+  CreatedTime: May 15, 2024 21:59 +0000
+  ResourceName: Stashcache-UofA
+  Services:
+  - XRootD cache server
+# ---------------------------------------------------------
diff --git a/topology/University of California San Diego/San Diego Supercomputer Center/SDSC-NRP.yaml b/topology/University of California San Diego/San Diego Supercomputer Center/SDSC-NRP.yaml
index d41d79203..1180bc778 100644
--- a/topology/University of California San Diego/San Diego Supercomputer Center/SDSC-NRP.yaml	
+++ b/topology/University of California San Diego/San Diego Supercomputer Center/SDSC-NRP.yaml	
@@ -72,8 +72,8 @@ Resources:
       XRootD origin server:
         Description: SDSC NRP OSDF Origin
         Details:
-          endpoint_override: sdsc-s3-origin.nationalresearchplatform.org:50123
-          auth_endpoint_override: sdsc-s3-origin.nationalresearchplatform.org:50123
+          endpoint_override: sdsc-s3-origin.nationalresearchplatform.org:8444
+          auth_endpoint_override: sdsc-s3-origin.nationalresearchplatform.org:8444
     AllowedVOs:
       - ANY
   SDSC_NRP_FDP_OSDF_CACHE:
@@ -98,6 +98,6 @@ Resources:
         Description: SDSC NRP FDP OSDF cache
         Details:
           endpoint_override: fdp-cache.nationalresearchplatform.org:8443
-          auth_endpoint_override: sdsc-s3-origin.nationalresearchplatform.org:8443
+          auth_endpoint_override: fdp-cache.nationalresearchplatform.org:8443
     AllowedVOs:
       - ANY
diff --git a/topology/University of California San Diego/San Diego Supercomputer Center/SDSC-NRP_downtime.yaml b/topology/University of California San Diego/San Diego Supercomputer Center/SDSC-NRP_downtime.yaml
index 4635145ce..430431ba7 100644
--- a/topology/University of California San Diego/San Diego Supercomputer Center/SDSC-NRP_downtime.yaml	
+++ b/topology/University of California San Diego/San Diego Supercomputer Center/SDSC-NRP_downtime.yaml	
@@ -42,3 +42,25 @@
   Services:
   - XRootD cache server
 # ---------------------------------------------------------
+- Class: UNSCHEDULED
+  ID: 1808852858
+  Description: HW issue
+  Severity: Outage
+  StartTime: May 13, 2024 19:30 +0000
+  EndTime: May 25, 2024 19:30 +0000
+  CreatedTime: May 16, 2024 18:48 +0000
+  ResourceName: SDSC_NRP_OSDF_CACHE
+  Services:
+  - XRootD cache server
+# ---------------------------------------------------------
+- Class: UNSCHEDULED
+  ID: 1808853650
+  Description: HW issue
+  Severity: Outage
+  StartTime: May 13, 2024 19:30 +0000
+  EndTime: May 25, 2024 19:30 +0000
+  CreatedTime: May 16, 2024 18:49 +0000
+  ResourceName: SDSC_NRP_OSDF_S3_ORIGIN
+  Services:
+  - XRootD origin server
+# ---------------------------------------------------------
diff --git a/topology/University of Edinburgh/Scotgrid ECDF/UKI-SCOTGRID-CDF_downtime.yaml b/topology/University of Edinburgh/Scotgrid ECDF/UKI-SCOTGRID-CDF_downtime.yaml
new file mode 100644
index 000000000..098cc9ba1
--- /dev/null
+++ b/topology/University of Edinburgh/Scotgrid ECDF/UKI-SCOTGRID-CDF_downtime.yaml	
@@ -0,0 +1,11 @@
+- Class: UNSCHEDULED
+  ID: 1802159541
+  Description: offline - checking with the admin
+  Severity: Outage
+  StartTime: May 08, 2024 08:00 +0000
+  EndTime: May 17, 2024 19:30 +0000
+  CreatedTime: May 09, 2024 00:52 +0000
+  ResourceName: UKI-SCOTGRID-ECDF-STASHCACHE
+  Services:
+  - XRootD cache server
+# ---------------------------------------------------------
diff --git a/topology/University of Michigan/AGLT2/AGLT2_downtime.yaml b/topology/University of Michigan/AGLT2/AGLT2_downtime.yaml
index efd3c2a72..6a6107776 100644
--- a/topology/University of Michigan/AGLT2/AGLT2_downtime.yaml	
+++ b/topology/University of Michigan/AGLT2/AGLT2_downtime.yaml	
@@ -1326,7 +1326,7 @@
   Description: UPS repair work
   Severity: Outage
   StartTime: May 01, 2024 12:00 +0000
-  EndTime: May 01, 2024 23:00 +0000
+  EndTime: May 01, 2024 15:20 +0000
   CreatedTime: Apr 25, 2024 21:05 +0000
   ResourceName: AGLT2_SL7
   Services:
@@ -1337,7 +1337,7 @@
   Description: UPS repair work
   Severity: Outage
   StartTime: May 01, 2024 12:00 +0000
-  EndTime: May 01, 2024 23:00 +0000
+  EndTime: May 01, 2024 15:20 +0000
   CreatedTime: Apr 25, 2024 21:06 +0000
   ResourceName: AGLT2_CE_2
   Services:
@@ -1348,7 +1348,7 @@
   Description: UPS repair work
   Severity: Outage
   StartTime: May 01, 2024 12:00 +0000
-  EndTime: May 01, 2024 23:00 +0000
+  EndTime: May 01, 2024 15:20 +0000
   CreatedTime: Apr 25, 2024 21:07 +0000
   ResourceName: AGLT2_CE_3
   Services:
@@ -1359,7 +1359,7 @@
   Description: UPS repair work
   Severity: Outage
   StartTime: May 01, 2024 12:00 +0000
-  EndTime: May 01, 2024 23:00 +0000
+  EndTime: May 01, 2024 15:20 +0000
   CreatedTime: Apr 25, 2024 21:07 +0000
   ResourceName: AGLT2_CE_4
   Services:
@@ -1370,7 +1370,7 @@
   Description: UPS repair work
   Severity: Outage
   StartTime: May 01, 2024 12:00 +0000
-  EndTime: May 01, 2024 23:00 +0000
+  EndTime: May 01, 2024 15:20 +0000
   CreatedTime: Apr 25, 2024 21:07 +0000
   ResourceName: AGLT2_XRootD_door
   Services:
@@ -1381,7 +1381,7 @@
   Description: UPS repair work
   Severity: Outage
   StartTime: May 01, 2024 12:00 +0000
-  EndTime: May 01, 2024 23:00 +0000
+  EndTime: May 01, 2024 15:20 +0000
   CreatedTime: Apr 25, 2024 21:08 +0000
   ResourceName: AGLT2_SE
   Services:
@@ -1392,7 +1392,7 @@
   Description: UPS repair work
   Severity: Outage
   StartTime: May 01, 2024 12:00 +0000
-  EndTime: May 01, 2024 23:00 +0000
+  EndTime: May 01, 2024 15:20 +0000
   CreatedTime: Apr 25, 2024 21:08 +0000
   ResourceName: AGLT2-squid-2
   Services:
@@ -1403,7 +1403,7 @@
   Description: UPS repair work
   Severity: Outage
   StartTime: May 01, 2024 12:00 +0000
-  EndTime: May 01, 2024 23:00 +0000
+  EndTime: May 01, 2024 15:20 +0000
   CreatedTime: Apr 25, 2024 21:09 +0000
   ResourceName: AGLT2-squid-3
   Services:
@@ -1414,7 +1414,7 @@
   Description: UPS repair work
   Severity: Outage
   StartTime: May 01, 2024 12:00 +0000
-  EndTime: May 01, 2024 23:00 +0000
+  EndTime: May 01, 2024 15:20 +0000
   CreatedTime: Apr 25, 2024 21:09 +0000
   ResourceName: AGLT2-squid-4
   Services:
diff --git a/topology/University of Washington/University of Washington Research Computing/UW-IT_downtime.yaml b/topology/University of Washington/University of Washington Research Computing/UW-IT_downtime.yaml
new file mode 100644
index 000000000..29fe24a0e
--- /dev/null
+++ b/topology/University of Washington/University of Washington Research Computing/UW-IT_downtime.yaml	
@@ -0,0 +1,11 @@
+- Class: UNSCHEDULED
+  ID: 1807207062
+  Description: Maintenance
+  Severity: Outage
+  StartTime: May 14, 2024 21:04 +0000
+  EndTime: May 16, 2024 04:59 +0000
+  CreatedTime: May 14, 2024 21:05 +0000
+  ResourceName: UW-IT-CE1
+  Services:
+  - CE
+# ---------------------------------------------------------
diff --git a/topology/University of Wisconsin/CHTC/CHTC-ITB.yaml b/topology/University of Wisconsin/CHTC/CHTC-ITB.yaml
index cc1a8b17f..a7af50742 100644
--- a/topology/University of Wisconsin/CHTC/CHTC-ITB.yaml	
+++ b/topology/University of Wisconsin/CHTC/CHTC-ITB.yaml	
@@ -403,14 +403,14 @@ Resources:
         Tertiary:
           ID: OSG1000003
           Name: Brian Lin
-    FQDN: itb-osdf-pelican-origin.osgdev.chtc.io
-    DN: /CN=itb-osdf-pelican-origin.osgdev.chtc.io
+    FQDN: itb-osdf-pelican-origin.osdf-dev.chtc.io
+    DN: /CN=itb-osdf-pelican-origin.osdf-dev.chtc.io
     Services:
       XRootD origin server:
         Description: ITB OSDF Pelican Origin
         Details:
-          endpoint_override: itb-osdf-pelican-origin.osgdev.chtc.io:8443
-          auth_endpoint_override: itb-osdf-pelican-origin.osgdev.chtc.io:8443
+          endpoint_override: itb-osdf-pelican-origin.osdf-dev.chtc.io:8443
+          auth_endpoint_override: itb-osdf-pelican-origin.osdf-dev.chtc.io:8443
     AllowedVOs:
       - GLOW
 
diff --git a/topology/University of Wisconsin/CHTC/CHTC.yaml b/topology/University of Wisconsin/CHTC/CHTC.yaml
index 63084d7a4..9818d27f1 100644
--- a/topology/University of Wisconsin/CHTC/CHTC.yaml	
+++ b/topology/University of Wisconsin/CHTC/CHTC.yaml	
@@ -526,15 +526,25 @@ Resources:
       - ap2007.chtc.wisc.edu 
       - ospool-ap2040.chtc.wisc.edu
       - ap40.chtc.wisc.edu
+      - ospool-2140.chtc.wisc.edu
+    DN: /CN=ospool-ap2140.chtc.wisc.edu
     Services:
       Submit Node:
         Description: OS Pool access point
         Details:
           hidden: false
+      XRootD origin server:
+        Description: OSDF Pelican origin
+        Details:
+          hidden: false
+          endpoint_override: ospool-ap2140.chtc.wisc.edu:8443
+          auth_endpoint_override: ospool-ap2140.chtc.wisc.edu:8443          
     Tags:
       - OSPool
     VOOwnership:
       OSG: 100
+    AllowedVOs:
+      - OSG
 
   CHTC-ospool-eht:
     Active: true
diff --git a/topology/University of Wisconsin/GLOW/GLOW_downtime.yaml b/topology/University of Wisconsin/GLOW/GLOW_downtime.yaml
index 0a78852df..a9288377b 100644
--- a/topology/University of Wisconsin/GLOW/GLOW_downtime.yaml	
+++ b/topology/University of Wisconsin/GLOW/GLOW_downtime.yaml	
@@ -3061,3 +3061,212 @@
   Services:
   - CE
 # ---------------------------------------------------------
+- Class: SCHEDULED
+  ID: 1808793267
+  Description: Updating our Hadoop File System on our data nodes and name nodes
+  Severity: Severe
+  StartTime: May 20, 2024 13:00 +0000
+  EndTime: May 20, 2024 22:00 +0000
+  CreatedTime: May 16, 2024 17:08 +0000
+  ResourceName: GLOW
+  Services:
+  - CE
+# ---------------------------------------------------------
+- Class: SCHEDULED
+  ID: 1808793268
+  Description: Updating our Hadoop File System on our data nodes and name nodes
+  Severity: Severe
+  StartTime: May 20, 2024 13:00 +0000
+  EndTime: May 20, 2024 22:00 +0000
+  CreatedTime: May 16, 2024 17:08 +0000
+  ResourceName: GLOW-CMS
+  Services:
+  - CE
+# ---------------------------------------------------------
+- Class: SCHEDULED
+  ID: 1808793269
+  Description: Updating our Hadoop File System on our data nodes and name nodes
+  Severity: Severe
+  StartTime: May 20, 2024 13:00 +0000
+  EndTime: May 20, 2024 22:00 +0000
+  CreatedTime: May 16, 2024 17:08 +0000
+  ResourceName: GLOW-CMS-SE
+  Services:
+  - SRMv2
+# ---------------------------------------------------------
+- Class: SCHEDULED
+  ID: 1808793270
+  Description: Updating our Hadoop File System on our data nodes and name nodes
+  Severity: Severe
+  StartTime: May 20, 2024 13:00 +0000
+  EndTime: May 20, 2024 22:00 +0000
+  CreatedTime: May 16, 2024 17:08 +0000
+  ResourceName: GLOW-CONDOR-CE
+  Services:
+  - CE
+# ---------------------------------------------------------
+- Class: SCHEDULED
+  ID: 1808793271
+  Description: Updating our Hadoop File System on our data nodes and name nodes
+  Severity: Severe
+  StartTime: May 20, 2024 13:00 +0000
+  EndTime: May 20, 2024 22:00 +0000
+  CreatedTime: May 16, 2024 17:08 +0000
+  ResourceName: GLOW-OSG
+  Services:
+  - CE
+# ---------------------------------------------------------
+- Class: SCHEDULED
+  ID: 1808793272
+  Description: Updating our Hadoop File System on our data nodes and name nodes
+  Severity: Severe
+  StartTime: May 20, 2024 13:00 +0000
+  EndTime: May 20, 2024 22:00 +0000
+  CreatedTime: May 16, 2024 17:08 +0000
+  ResourceName: GLOW_SQUID
+  Services:
+  - Squid
+# ---------------------------------------------------------
+- Class: SCHEDULED
+  ID: 1808793273
+  Description: Updating our Hadoop File System on our data nodes and name nodes
+  Severity: Severe
+  StartTime: May 20, 2024 13:00 +0000
+  EndTime: May 20, 2024 22:00 +0000
+  CreatedTime: May 16, 2024 17:08 +0000
+  ResourceName: GLOW_SQUID1
+  Services:
+  - Squid
+# ---------------------------------------------------------
+- Class: SCHEDULED
+  ID: 1808793274
+  Description: Updating our Hadoop File System on our data nodes and name nodes
+  Severity: Severe
+  StartTime: May 20, 2024 13:00 +0000
+  EndTime: May 20, 2024 22:00 +0000
+  CreatedTime: May 16, 2024 17:08 +0000
+  ResourceName: GLOW_SQUID2
+  Services:
+  - Squid
+# ---------------------------------------------------------
+- Class: SCHEDULED
+  ID: 1808793275
+  Description: Updating our Hadoop File System on our data nodes and name nodes
+  Severity: Severe
+  StartTime: May 20, 2024 13:00 +0000
+  EndTime: May 20, 2024 22:00 +0000
+  CreatedTime: May 16, 2024 17:08 +0000
+  ResourceName: GLOW_SQUID3
+  Services:
+  - Squid
+# ---------------------------------------------------------
+- Class: SCHEDULED
+  ID: 1808793276
+  Description: Updating our Hadoop File System on our data nodes and name nodes
+  Severity: Severe
+  StartTime: May 20, 2024 13:00 +0000
+  EndTime: May 20, 2024 22:00 +0000
+  CreatedTime: May 16, 2024 17:08 +0000
+  ResourceName: GLOW_SQUID4
+  Services:
+  - Squid
+# ---------------------------------------------------------
+- Class: SCHEDULED
+  ID: 1808793277
+  Description: Updating our Hadoop File System on our data nodes and name nodes
+  Severity: Severe
+  StartTime: May 20, 2024 13:00 +0000
+  EndTime: May 20, 2024 22:00 +0000
+  CreatedTime: May 16, 2024 17:08 +0000
+  ResourceName: GLOW_SUBMIT1
+  Services:
+  - Submit Node
+# ---------------------------------------------------------
+- Class: SCHEDULED
+  ID: 1808793278
+  Description: Updating our Hadoop File System on our data nodes and name nodes
+  Severity: Severe
+  StartTime: May 20, 2024 13:00 +0000
+  EndTime: May 20, 2024 22:00 +0000
+  CreatedTime: May 16, 2024 17:08 +0000
+  ResourceName: GLOW_SUBMIT2
+  Services:
+  - Submit Node
+# ---------------------------------------------------------
+- Class: SCHEDULED
+  ID: 1808793279
+  Description: Updating our Hadoop File System on our data nodes and name nodes
+  Severity: Severe
+  StartTime: May 20, 2024 13:00 +0000
+  EndTime: May 20, 2024 22:00 +0000
+  CreatedTime: May 16, 2024 17:08 +0000
+  ResourceName: GLOW_SUBMIT3
+  Services:
+  - Submit Node
+# ---------------------------------------------------------
+- Class: SCHEDULED
+  ID: 1808793280
+  Description: Updating our Hadoop File System on our data nodes and name nodes
+  Severity: Severe
+  StartTime: May 20, 2024 13:00 +0000
+  EndTime: May 20, 2024 22:00 +0000
+  CreatedTime: May 16, 2024 17:08 +0000
+  ResourceName: GLOW_SUBMIT4
+  Services:
+  - Submit Node
+# ---------------------------------------------------------
+- Class: SCHEDULED
+  ID: 1808793281
+  Description: Updating our Hadoop File System on our data nodes and name nodes
+  Severity: Severe
+  StartTime: May 20, 2024 13:00 +0000
+  EndTime: May 20, 2024 22:00 +0000
+  CreatedTime: May 16, 2024 17:08 +0000
+  ResourceName: GLOW_SUBMIT5
+  Services:
+  - Submit Node
+# ---------------------------------------------------------
+- Class: SCHEDULED
+  ID: 1808793282
+  Description: Updating our Hadoop File System on our data nodes and name nodes
+  Severity: Severe
+  StartTime: May 20, 2024 13:00 +0000
+  EndTime: May 20, 2024 22:00 +0000
+  CreatedTime: May 16, 2024 17:08 +0000
+  ResourceName: GLOW_SUBMIT6
+  Services:
+  - Submit Node
+# ---------------------------------------------------------
+- Class: SCHEDULED
+  ID: 1808793283
+  Description: Updating our Hadoop File System on our data nodes and name nodes
+  Severity: Severe
+  StartTime: May 20, 2024 13:00 +0000
+  EndTime: May 20, 2024 22:00 +0000
+  CreatedTime: May 16, 2024 17:08 +0000
+  ResourceName: GLOW_SUBMIT_CERN
+  Services:
+  - Submit Node
+# ---------------------------------------------------------
+- Class: SCHEDULED
+  ID: 1808793284
+  Description: Updating our Hadoop File System on our data nodes and name nodes
+  Severity: Severe
+  StartTime: May 20, 2024 13:00 +0000
+  EndTime: May 20, 2024 22:00 +0000
+  CreatedTime: May 16, 2024 17:08 +0000
+  ResourceName: US-Wisconsin BW
+  Services:
+  - net.perfSONAR.Bandwidth
+# ---------------------------------------------------------
+- Class: SCHEDULED
+  ID: 1808793285
+  Description: Updating our Hadoop File System on our data nodes and name nodes
+  Severity: Severe
+  StartTime: May 20, 2024 13:00 +0000
+  EndTime: May 20, 2024 22:00 +0000
+  CreatedTime: May 16, 2024 17:08 +0000
+  ResourceName: US-Wisconsin LT
+  Services:
+  - net.perfSONAR.Latency
+# ---------------------------------------------------------
diff --git a/virtual-organizations/NRP.yaml b/virtual-organizations/NRP.yaml
index a2f495adb..4010b14b3 100644
--- a/virtual-organizations/NRP.yaml
+++ b/virtual-organizations/NRP.yaml
@@ -72,6 +72,17 @@ DataFederations:
           - SDSC_NRP_OSDF_ORIGIN
         AllowedCaches:
           - ANY
+      - Path: /nrp/fdp/gyrokinetic
+        Authorizations:
+          - PUBLIC
+          - SciTokens:
+              Issuer: https://t.nationalresearchplatform.org/gyrokinetic
+              Base Path: /nrp/fdp/gyrokinetic/
+              Map Subject: False
+        AllowedOrigins:
+          - SDSC_NRP_OSDF_ORIGIN
+        AllowedCaches:
+          - ANY
       - Path: /knightlab
         Authorizations:
           - PUBLIC
diff --git a/virtual-organizations/OSG.yaml b/virtual-organizations/OSG.yaml
index 5899c5dc2..740c2d462 100644
--- a/virtual-organizations/OSG.yaml
+++ b/virtual-organizations/OSG.yaml
@@ -256,6 +256,23 @@ DataFederations:
           Issuer: https://osg-htc.org/ospool
           MaxScopeDepth: 4
 
+      - Path: /ospool/ap40/data
+        Authorizations:
+          - SciTokens:
+              Issuer: https://ospool-ap2140.chtc.wisc.edu:8443
+              Base Path: /ospool/ap40
+              Map Subject: True
+        AllowedOrigins:
+          - CHTC-ap40
+        AllowedCaches:
+          - ANY
+        Writeback: https://ospool-ap2140.chtc.wisc.edu:8443
+        DirList: https://ospool-ap2140.chtc.wisc.edu:8443
+        CredentialGeneration:
+          Strategy: OAuth2
+          Issuer: https://ospool-ap2140.chtc.wisc.edu:8443
+          MaxScopeDepth: 4
+
       # SciTokens issuer for ap20
       - Path: /ospool/ap20/.well-known
         Authorizations: