From dd58dc05c283cbb3caca7a8dd76f6d2030951746 Mon Sep 17 00:00:00 2001
From: Matthew Westphall <westphall@wisc.edu>
Date: Tue, 6 Oct 2026 16:43:30 -0500
Subject: [PATCH 1/4] Remove OSG 24 (and 23) from build matrices, add 26

---
 opensciencegrid/access-amie/build-config.json            | 2 +-
 opensciencegrid/contact-sync/build-config.json           | 2 +-
 opensciencegrid/cvmfs-nodeplugin/build-config.json       | 2 +-
 opensciencegrid/default-build-config.json                | 2 +-
 opensciencegrid/git-safe-backup/build-config.json        | 2 +-
 opensciencegrid/gracc-apel/build-config.json             | 2 +-
 opensciencegrid/gwms-factory/Dockerfile                  | 2 +-
 opensciencegrid/koji-builder/Dockerfile                  | 2 +-
 opensciencegrid/koji-builder/build-config.json           | 2 +-
 opensciencegrid/logrotate/build-config.json              | 2 +-
 opensciencegrid/mailchimp-sync/build-config.json         | 2 +-
 opensciencegrid/ospool-static-registry/Dockerfile        | 2 +-
 opensciencegrid/ospool-static-registry/build-config.json | 2 +-
 opensciencegrid/s3-backup/build-config.json              | 2 +-
 opensciencegrid/sssd/build-config.json                   | 2 +-
 opensciencegrid/stompclt/build-config.json               | 2 +-
 opensciencegrid/svn-to-git/build-config.json             | 2 +-
 opensciencegrid/vo-frontend/Dockerfile                   | 4 +---
 osg-htc/nrp-ospool-ep/Dockerfile                         | 1 -
 osg-htc/nrp-ospool-ep/build-config.json                  | 2 +-
 20 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/opensciencegrid/access-amie/build-config.json b/opensciencegrid/access-amie/build-config.json
index 781ae34c..0c0ea484 100644
--- a/opensciencegrid/access-amie/build-config.json
+++ b/opensciencegrid/access-amie/build-config.json
@@ -2,6 +2,6 @@
     "standard_build": true,
     "repo_build": false,
     "base_os": ["el9"],
-    "osg_series": ["23", "24"],
+    "osg_series": ["25", "26"],
     "base_repo": ["release"]
   }
diff --git a/opensciencegrid/contact-sync/build-config.json b/opensciencegrid/contact-sync/build-config.json
index 781ae34c..0c0ea484 100644
--- a/opensciencegrid/contact-sync/build-config.json
+++ b/opensciencegrid/contact-sync/build-config.json
@@ -2,6 +2,6 @@
     "standard_build": true,
     "repo_build": false,
     "base_os": ["el9"],
-    "osg_series": ["23", "24"],
+    "osg_series": ["25", "26"],
     "base_repo": ["release"]
   }
diff --git a/opensciencegrid/cvmfs-nodeplugin/build-config.json b/opensciencegrid/cvmfs-nodeplugin/build-config.json
index 55da6234..a86125ff 100644
--- a/opensciencegrid/cvmfs-nodeplugin/build-config.json
+++ b/opensciencegrid/cvmfs-nodeplugin/build-config.json
@@ -2,6 +2,6 @@
     "standard_build": true,
     "repo_build": false,
     "base_os": ["el9"],
-    "osg_series": ["24"],
+    "osg_series": ["25"],
     "base_repo": ["release"]
   }
diff --git a/opensciencegrid/default-build-config.json b/opensciencegrid/default-build-config.json
index 215e2fed..0c0ea484 100644
--- a/opensciencegrid/default-build-config.json
+++ b/opensciencegrid/default-build-config.json
@@ -2,6 +2,6 @@
     "standard_build": true,
     "repo_build": false,
     "base_os": ["el9"],
-    "osg_series": ["24", "25"],
+    "osg_series": ["25", "26"],
     "base_repo": ["release"]
   }
diff --git a/opensciencegrid/git-safe-backup/build-config.json b/opensciencegrid/git-safe-backup/build-config.json
index f7507ed2..0266bdd2 100644
--- a/opensciencegrid/git-safe-backup/build-config.json
+++ b/opensciencegrid/git-safe-backup/build-config.json
@@ -2,6 +2,6 @@
   "standard_build": true,
   "repo_build": false,
   "base_os": ["el9"],
-  "osg_series": ["24"],
+  "osg_series": ["25"],
   "base_repo": ["release"]
 }
diff --git a/opensciencegrid/gracc-apel/build-config.json b/opensciencegrid/gracc-apel/build-config.json
index 55da6234..a86125ff 100644
--- a/opensciencegrid/gracc-apel/build-config.json
+++ b/opensciencegrid/gracc-apel/build-config.json
@@ -2,6 +2,6 @@
     "standard_build": true,
     "repo_build": false,
     "base_os": ["el9"],
-    "osg_series": ["24"],
+    "osg_series": ["25"],
     "base_repo": ["release"]
   }
diff --git a/opensciencegrid/gwms-factory/Dockerfile b/opensciencegrid/gwms-factory/Dockerfile
index f2e3983f..86bee461 100644
--- a/opensciencegrid/gwms-factory/Dockerfile
+++ b/opensciencegrid/gwms-factory/Dockerfile
@@ -1,5 +1,5 @@
 ARG BASE_OS=el9
-ARG BASE_OSG_SERIES=24
+ARG BASE_OSG_SERIES=25
 ARG BASE_YUM_REPO=release
 
 FROM opensciencegrid/software-base:$BASE_OSG_SERIES-$BASE_OS-$BASE_YUM_REPO
diff --git a/opensciencegrid/koji-builder/Dockerfile b/opensciencegrid/koji-builder/Dockerfile
index a949f7e4..28c1d0a3 100644
--- a/opensciencegrid/koji-builder/Dockerfile
+++ b/opensciencegrid/koji-builder/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_OSG_SERIES=24
+ARG BASE_OSG_SERIES=25
 ARG BASE_YUM_REPO=release
 ARG BASE_OS=el9
 
diff --git a/opensciencegrid/koji-builder/build-config.json b/opensciencegrid/koji-builder/build-config.json
index 55da6234..a86125ff 100644
--- a/opensciencegrid/koji-builder/build-config.json
+++ b/opensciencegrid/koji-builder/build-config.json
@@ -2,6 +2,6 @@
     "standard_build": true,
     "repo_build": false,
     "base_os": ["el9"],
-    "osg_series": ["24"],
+    "osg_series": ["25"],
     "base_repo": ["release"]
   }
diff --git a/opensciencegrid/logrotate/build-config.json b/opensciencegrid/logrotate/build-config.json
index 55da6234..a86125ff 100644
--- a/opensciencegrid/logrotate/build-config.json
+++ b/opensciencegrid/logrotate/build-config.json
@@ -2,6 +2,6 @@
     "standard_build": true,
     "repo_build": false,
     "base_os": ["el9"],
-    "osg_series": ["24"],
+    "osg_series": ["25"],
     "base_repo": ["release"]
   }
diff --git a/opensciencegrid/mailchimp-sync/build-config.json b/opensciencegrid/mailchimp-sync/build-config.json
index 781ae34c..0c0ea484 100644
--- a/opensciencegrid/mailchimp-sync/build-config.json
+++ b/opensciencegrid/mailchimp-sync/build-config.json
@@ -2,6 +2,6 @@
     "standard_build": true,
     "repo_build": false,
     "base_os": ["el9"],
-    "osg_series": ["23", "24"],
+    "osg_series": ["25", "26"],
     "base_repo": ["release"]
   }
diff --git a/opensciencegrid/ospool-static-registry/Dockerfile b/opensciencegrid/ospool-static-registry/Dockerfile
index 28f16182..e333c5d8 100644
--- a/opensciencegrid/ospool-static-registry/Dockerfile
+++ b/opensciencegrid/ospool-static-registry/Dockerfile
@@ -1,5 +1,5 @@
 # Specify the opensciencegrid/software-base image tag
-ARG BASE_OSG_SERIES=24
+ARG BASE_OSG_SERIES=25
 ARG BASE_YUM_REPO=release
 
 FROM opensciencegrid/software-base:$BASE_OSG_SERIES-el8-$BASE_YUM_REPO AS builder
diff --git a/opensciencegrid/ospool-static-registry/build-config.json b/opensciencegrid/ospool-static-registry/build-config.json
index 55da6234..a86125ff 100644
--- a/opensciencegrid/ospool-static-registry/build-config.json
+++ b/opensciencegrid/ospool-static-registry/build-config.json
@@ -2,6 +2,6 @@
     "standard_build": true,
     "repo_build": false,
     "base_os": ["el9"],
-    "osg_series": ["24"],
+    "osg_series": ["25"],
     "base_repo": ["release"]
   }
diff --git a/opensciencegrid/s3-backup/build-config.json b/opensciencegrid/s3-backup/build-config.json
index 55da6234..a86125ff 100644
--- a/opensciencegrid/s3-backup/build-config.json
+++ b/opensciencegrid/s3-backup/build-config.json
@@ -2,6 +2,6 @@
     "standard_build": true,
     "repo_build": false,
     "base_os": ["el9"],
-    "osg_series": ["24"],
+    "osg_series": ["25"],
     "base_repo": ["release"]
   }
diff --git a/opensciencegrid/sssd/build-config.json b/opensciencegrid/sssd/build-config.json
index 781ae34c..0c0ea484 100644
--- a/opensciencegrid/sssd/build-config.json
+++ b/opensciencegrid/sssd/build-config.json
@@ -2,6 +2,6 @@
     "standard_build": true,
     "repo_build": false,
     "base_os": ["el9"],
-    "osg_series": ["23", "24"],
+    "osg_series": ["25", "26"],
     "base_repo": ["release"]
   }
diff --git a/opensciencegrid/stompclt/build-config.json b/opensciencegrid/stompclt/build-config.json
index 781ae34c..0c0ea484 100644
--- a/opensciencegrid/stompclt/build-config.json
+++ b/opensciencegrid/stompclt/build-config.json
@@ -2,6 +2,6 @@
     "standard_build": true,
     "repo_build": false,
     "base_os": ["el9"],
-    "osg_series": ["23", "24"],
+    "osg_series": ["25", "26"],
     "base_repo": ["release"]
   }
diff --git a/opensciencegrid/svn-to-git/build-config.json b/opensciencegrid/svn-to-git/build-config.json
index 55da6234..a86125ff 100644
--- a/opensciencegrid/svn-to-git/build-config.json
+++ b/opensciencegrid/svn-to-git/build-config.json
@@ -2,6 +2,6 @@
     "standard_build": true,
     "repo_build": false,
     "base_os": ["el9"],
-    "osg_series": ["24"],
+    "osg_series": ["25"],
     "base_repo": ["release"]
   }
diff --git a/opensciencegrid/vo-frontend/Dockerfile b/opensciencegrid/vo-frontend/Dockerfile
index 902f4595..14122fe9 100644
--- a/opensciencegrid/vo-frontend/Dockerfile
+++ b/opensciencegrid/vo-frontend/Dockerfile
@@ -1,5 +1,5 @@
 ARG BASE_YUM_REPO=release
-ARG BASE_OSG_SERIES=24
+ARG BASE_OSG_SERIES=25
 ARG BASE_OS=el9
 
 FROM opensciencegrid/software-base:$BASE_OSG_SERIES-$BASE_OS-$BASE_YUM_REPO
@@ -53,5 +53,3 @@ ADD image-config.d/*    /etc/osg/image-config.d/
 ADD cron.d/*            /etc/cron.d/
 ADD supervisor.d/*      /etc/supervisord.d/
 ADD condor.d/*          /etc/condor/config.d/
-
-
diff --git a/osg-htc/nrp-ospool-ep/Dockerfile b/osg-htc/nrp-ospool-ep/Dockerfile
index d414e9b5..c44b128f 100644
--- a/osg-htc/nrp-ospool-ep/Dockerfile
+++ b/osg-htc/nrp-ospool-ep/Dockerfile
@@ -77,4 +77,3 @@ ENV ACCEPT_IDLE_MINUTES=20
 # K8S_PROVISIONER_NAME K8S_PROVISIONER_TYPE
 # FORCE_K8SNAMESPACE_MATCHING ADDITIONAL_REQUIREMENTS
 #
-
diff --git a/osg-htc/nrp-ospool-ep/build-config.json b/osg-htc/nrp-ospool-ep/build-config.json
index 215e2fed..0c0ea484 100644
--- a/osg-htc/nrp-ospool-ep/build-config.json
+++ b/osg-htc/nrp-ospool-ep/build-config.json
@@ -2,6 +2,6 @@
     "standard_build": true,
     "repo_build": false,
     "base_os": ["el9"],
-    "osg_series": ["24", "25"],
+    "osg_series": ["25", "26"],
     "base_repo": ["release"]
   }

From 1897b24fb37f8f690b12443c18bdfb51d20991e8 Mon Sep 17 00:00:00 2001
From: Matthew Westphall <westphall@wisc.edu>
Date: Tue, 3 Nov 2026 14:53:21 -0600
Subject: [PATCH 2/4] Add back 24- to all releases that depend on software-base

---
 opensciencegrid/access-amie/build-config.json            | 2 +-
 opensciencegrid/cvmfs-nodeplugin/build-config.json       | 2 +-
 opensciencegrid/default-build-config.json                | 2 +-
 opensciencegrid/gracc-apel/build-config.json             | 2 +-
 opensciencegrid/koji-builder/build-config.json           | 2 +-
 opensciencegrid/ospool-ccb/build-config.json             | 2 +-
 opensciencegrid/ospool-cm/build-config.json              | 2 +-
 opensciencegrid/ospool-static-registry/build-config.json | 2 +-
 opensciencegrid/stompclt/build-config.json               | 2 +-
 opensciencegrid/svn-to-git/build-config.json             | 2 +-
 osg-htc/nrp-ospool-ep/build-config.json                  | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/opensciencegrid/access-amie/build-config.json b/opensciencegrid/access-amie/build-config.json
index 0c0ea484..d0fbe25a 100644
--- a/opensciencegrid/access-amie/build-config.json
+++ b/opensciencegrid/access-amie/build-config.json
@@ -2,6 +2,6 @@
     "standard_build": true,
     "repo_build": false,
     "base_os": ["el9"],
-    "osg_series": ["25", "26"],
+    "osg_series": ["24", "25", "26"],
     "base_repo": ["release"]
   }
diff --git a/opensciencegrid/cvmfs-nodeplugin/build-config.json b/opensciencegrid/cvmfs-nodeplugin/build-config.json
index a86125ff..d0fbe25a 100644
--- a/opensciencegrid/cvmfs-nodeplugin/build-config.json
+++ b/opensciencegrid/cvmfs-nodeplugin/build-config.json
@@ -2,6 +2,6 @@
     "standard_build": true,
     "repo_build": false,
     "base_os": ["el9"],
-    "osg_series": ["25"],
+    "osg_series": ["24", "25", "26"],
     "base_repo": ["release"]
   }
diff --git a/opensciencegrid/default-build-config.json b/opensciencegrid/default-build-config.json
index 0c0ea484..d0fbe25a 100644
--- a/opensciencegrid/default-build-config.json
+++ b/opensciencegrid/default-build-config.json
@@ -2,6 +2,6 @@
     "standard_build": true,
     "repo_build": false,
     "base_os": ["el9"],
-    "osg_series": ["25", "26"],
+    "osg_series": ["24", "25", "26"],
     "base_repo": ["release"]
   }
diff --git a/opensciencegrid/gracc-apel/build-config.json b/opensciencegrid/gracc-apel/build-config.json
index a86125ff..d0fbe25a 100644
--- a/opensciencegrid/gracc-apel/build-config.json
+++ b/opensciencegrid/gracc-apel/build-config.json
@@ -2,6 +2,6 @@
     "standard_build": true,
     "repo_build": false,
     "base_os": ["el9"],
-    "osg_series": ["25"],
+    "osg_series": ["24", "25", "26"],
     "base_repo": ["release"]
   }
diff --git a/opensciencegrid/koji-builder/build-config.json b/opensciencegrid/koji-builder/build-config.json
index a86125ff..d0fbe25a 100644
--- a/opensciencegrid/koji-builder/build-config.json
+++ b/opensciencegrid/koji-builder/build-config.json
@@ -2,6 +2,6 @@
     "standard_build": true,
     "repo_build": false,
     "base_os": ["el9"],
-    "osg_series": ["25"],
+    "osg_series": ["24", "25", "26"],
     "base_repo": ["release"]
   }
diff --git a/opensciencegrid/ospool-ccb/build-config.json b/opensciencegrid/ospool-ccb/build-config.json
index a2bc874e..3eaccfb7 100644
--- a/opensciencegrid/ospool-ccb/build-config.json
+++ b/opensciencegrid/ospool-ccb/build-config.json
@@ -2,6 +2,6 @@
     "standard_build": true,
     "repo_build": false,
     "base_os": ["el9"],
-    "osg_series": ["25"],
+    "osg_series": ["24", "25", "26"],
     "base_repo": ["release"]
 }
diff --git a/opensciencegrid/ospool-cm/build-config.json b/opensciencegrid/ospool-cm/build-config.json
index a2bc874e..3eaccfb7 100644
--- a/opensciencegrid/ospool-cm/build-config.json
+++ b/opensciencegrid/ospool-cm/build-config.json
@@ -2,6 +2,6 @@
     "standard_build": true,
     "repo_build": false,
     "base_os": ["el9"],
-    "osg_series": ["25"],
+    "osg_series": ["24", "25", "26"],
     "base_repo": ["release"]
 }
diff --git a/opensciencegrid/ospool-static-registry/build-config.json b/opensciencegrid/ospool-static-registry/build-config.json
index a86125ff..d0fbe25a 100644
--- a/opensciencegrid/ospool-static-registry/build-config.json
+++ b/opensciencegrid/ospool-static-registry/build-config.json
@@ -2,6 +2,6 @@
     "standard_build": true,
     "repo_build": false,
     "base_os": ["el9"],
-    "osg_series": ["25"],
+    "osg_series": ["24", "25", "26"],
     "base_repo": ["release"]
   }
diff --git a/opensciencegrid/stompclt/build-config.json b/opensciencegrid/stompclt/build-config.json
index 0c0ea484..d0fbe25a 100644
--- a/opensciencegrid/stompclt/build-config.json
+++ b/opensciencegrid/stompclt/build-config.json
@@ -2,6 +2,6 @@
     "standard_build": true,
     "repo_build": false,
     "base_os": ["el9"],
-    "osg_series": ["25", "26"],
+    "osg_series": ["24", "25", "26"],
     "base_repo": ["release"]
   }
diff --git a/opensciencegrid/svn-to-git/build-config.json b/opensciencegrid/svn-to-git/build-config.json
index a86125ff..d0fbe25a 100644
--- a/opensciencegrid/svn-to-git/build-config.json
+++ b/opensciencegrid/svn-to-git/build-config.json
@@ -2,6 +2,6 @@
     "standard_build": true,
     "repo_build": false,
     "base_os": ["el9"],
-    "osg_series": ["25"],
+    "osg_series": ["24", "25", "26"],
     "base_repo": ["release"]
   }
diff --git a/osg-htc/nrp-ospool-ep/build-config.json b/osg-htc/nrp-ospool-ep/build-config.json
index 0c0ea484..d0fbe25a 100644
--- a/osg-htc/nrp-ospool-ep/build-config.json
+++ b/osg-htc/nrp-ospool-ep/build-config.json
@@ -2,6 +2,6 @@
     "standard_build": true,
     "repo_build": false,
     "base_os": ["el9"],
-    "osg_series": ["25", "26"],
+    "osg_series": ["24", "25", "26"],
     "base_repo": ["release"]
   }

From 5689d65f0d34c9d6560d7cc14f44b88d021857c4 Mon Sep 17 00:00:00 2001
From: Matthew Westphall <westphall@wisc.edu>
Date: Tue, 3 Nov 2026 15:03:40 -0600
Subject: [PATCH 3/4] Change non-software-base-based images back to OSG 24

---
 opensciencegrid/contact-sync/build-config.json    | 2 +-
 opensciencegrid/git-safe-backup/build-config.json | 2 +-
 opensciencegrid/logrotate/build-config.json       | 2 +-
 opensciencegrid/mailchimp-sync/build-config.json  | 2 +-
 opensciencegrid/ospool-grafana/Dockerfile         | 2 +-
 opensciencegrid/s3-backup/build-config.json       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/opensciencegrid/contact-sync/build-config.json b/opensciencegrid/contact-sync/build-config.json
index 0c0ea484..55da6234 100644
--- a/opensciencegrid/contact-sync/build-config.json
+++ b/opensciencegrid/contact-sync/build-config.json
@@ -2,6 +2,6 @@
     "standard_build": true,
     "repo_build": false,
     "base_os": ["el9"],
-    "osg_series": ["25", "26"],
+    "osg_series": ["24"],
     "base_repo": ["release"]
   }
diff --git a/opensciencegrid/git-safe-backup/build-config.json b/opensciencegrid/git-safe-backup/build-config.json
index 0266bdd2..f7507ed2 100644
--- a/opensciencegrid/git-safe-backup/build-config.json
+++ b/opensciencegrid/git-safe-backup/build-config.json
@@ -2,6 +2,6 @@
   "standard_build": true,
   "repo_build": false,
   "base_os": ["el9"],
-  "osg_series": ["25"],
+  "osg_series": ["24"],
   "base_repo": ["release"]
 }
diff --git a/opensciencegrid/logrotate/build-config.json b/opensciencegrid/logrotate/build-config.json
index a86125ff..55da6234 100644
--- a/opensciencegrid/logrotate/build-config.json
+++ b/opensciencegrid/logrotate/build-config.json
@@ -2,6 +2,6 @@
     "standard_build": true,
     "repo_build": false,
     "base_os": ["el9"],
-    "osg_series": ["25"],
+    "osg_series": ["24"],
     "base_repo": ["release"]
   }
diff --git a/opensciencegrid/mailchimp-sync/build-config.json b/opensciencegrid/mailchimp-sync/build-config.json
index 0c0ea484..55da6234 100644
--- a/opensciencegrid/mailchimp-sync/build-config.json
+++ b/opensciencegrid/mailchimp-sync/build-config.json
@@ -2,6 +2,6 @@
     "standard_build": true,
     "repo_build": false,
     "base_os": ["el9"],
-    "osg_series": ["25", "26"],
+    "osg_series": ["24"],
     "base_repo": ["release"]
   }
diff --git a/opensciencegrid/ospool-grafana/Dockerfile b/opensciencegrid/ospool-grafana/Dockerfile
index 9845408a..dcc08aa6 100644
--- a/opensciencegrid/ospool-grafana/Dockerfile
+++ b/opensciencegrid/ospool-grafana/Dockerfile
@@ -1,4 +1,4 @@
-FROM grafana/grafana:main-ubuntu
+FROM grafana/grafana:latest-ubuntu
 
 USER root
 RUN apt-get update \
diff --git a/opensciencegrid/s3-backup/build-config.json b/opensciencegrid/s3-backup/build-config.json
index a86125ff..55da6234 100644
--- a/opensciencegrid/s3-backup/build-config.json
+++ b/opensciencegrid/s3-backup/build-config.json
@@ -2,6 +2,6 @@
     "standard_build": true,
     "repo_build": false,
     "base_os": ["el9"],
-    "osg_series": ["25"],
+    "osg_series": ["24"],
     "base_repo": ["release"]
   }

From 5a9bfbe5c220b7ec7b9fec67f4e54e3c5819ade3 Mon Sep 17 00:00:00 2001
From: Matthew Westphall <westphall@wisc.edu>
Date: Tue, 3 Nov 2026 15:03:52 -0600
Subject: [PATCH 4/4] Drop references to OSG 23

---
 opensciencegrid/access-amie/Dockerfile    | 3 +--
 opensciencegrid/frontier-squid/Dockerfile | 2 +-
 opensciencegrid/gracc-apel/Dockerfile     | 2 +-
 opensciencegrid/ospool-ganglia/Dockerfile | 4 +---
 opensciencegrid/sssd/Dockerfile           | 2 +-
 opensciencegrid/stompclt/Dockerfile       | 4 +---
 6 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/opensciencegrid/access-amie/Dockerfile b/opensciencegrid/access-amie/Dockerfile
index 060be82b..dde4e1aa 100644
--- a/opensciencegrid/access-amie/Dockerfile
+++ b/opensciencegrid/access-amie/Dockerfile
@@ -1,5 +1,5 @@
 ARG BASE_YUM_REPO=release
-ARG BASE_OSG_SERIES=23
+ARG BASE_OSG_SERIES=25
 
 FROM opensciencegrid/software-base:$BASE_OSG_SERIES-el9-$BASE_YUM_REPO
 
@@ -25,4 +25,3 @@ COPY . .
 
 # run the app
 CMD ["python3", "/opt/access-amie/lib/Main.py"]
-
diff --git a/opensciencegrid/frontier-squid/Dockerfile b/opensciencegrid/frontier-squid/Dockerfile
index b8062b2b..ca8ea42c 100644
--- a/opensciencegrid/frontier-squid/Dockerfile
+++ b/opensciencegrid/frontier-squid/Dockerfile
@@ -1,5 +1,5 @@
 # Specify the opensciencegrid/software-base image tag
-ARG BASE_OSG_SERIES=23
+ARG BASE_OSG_SERIES=25
 ARG BASE_YUM_REPO=testing
 # The following could be overriden to "upcoming" (for example) to 
 # install the application from upcoming instead of the base yum repo.
diff --git a/opensciencegrid/gracc-apel/Dockerfile b/opensciencegrid/gracc-apel/Dockerfile
index 5021ed63..81f9bbe9 100644
--- a/opensciencegrid/gracc-apel/Dockerfile
+++ b/opensciencegrid/gracc-apel/Dockerfile
@@ -1,5 +1,5 @@
 ARG BASE_OS=el9
-ARG BASE_OSG_SERIES=23
+ARG BASE_OSG_SERIES=25
 ARG BASE_YUM_REPO=release
 
 FROM hub.opensciencegrid.org/opensciencegrid/software-base:$BASE_OSG_SERIES-$BASE_OS-$BASE_YUM_REPO
diff --git a/opensciencegrid/ospool-ganglia/Dockerfile b/opensciencegrid/ospool-ganglia/Dockerfile
index 7ba8d4f5..f32302d1 100644
--- a/opensciencegrid/ospool-ganglia/Dockerfile
+++ b/opensciencegrid/ospool-ganglia/Dockerfile
@@ -1,5 +1,5 @@
 # Specify the opensciencegrid/software-base image tag
-ARG BASE_OSG_SERIES=23
+ARG BASE_OSG_SERIES=25
 ARG BASE_YUM_REPO=release
 
 # has to be el8 for a working ganglia/php combination
@@ -73,5 +73,3 @@ COPY httpd-ganglia.conf /etc/httpd/conf.d/ganglia.conf
 COPY index.php /var/www/html/
 
 ADD ganglia-web-overrides /usr/share/ganglia
-
-
diff --git a/opensciencegrid/sssd/Dockerfile b/opensciencegrid/sssd/Dockerfile
index 6179ff26..fb386886 100644
--- a/opensciencegrid/sssd/Dockerfile
+++ b/opensciencegrid/sssd/Dockerfile
@@ -1,5 +1,5 @@
 ARG BASE_OS=el9
-ARG BASE_OSG_SERIES=23
+ARG BASE_OSG_SERIES=25
 ARG BASE_YUM_REPO=release
 
 # Run sssd via supervisord.
diff --git a/opensciencegrid/stompclt/Dockerfile b/opensciencegrid/stompclt/Dockerfile
index 0f12aa16..2e1e9675 100644
--- a/opensciencegrid/stompclt/Dockerfile
+++ b/opensciencegrid/stompclt/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_OSG_SERIES=23
+ARG BASE_OSG_SERIES=25
 ARG BASE_OS=el9
 ARG BASE_YUM_REPO=development
 
@@ -22,5 +22,3 @@ RUN yum install -y git perl make cpan && \
     perl Makefile.PL &&\
     make &&\
     make install
-
-