diff --git a/config/clusters/2i2c/ucmerced-staging.values.yaml b/config/clusters/2i2c/ucmerced-staging.values.yaml
index 19b3e8aea0..76a70ac0ef 100644
--- a/config/clusters/2i2c/ucmerced-staging.values.yaml
+++ b/config/clusters/2i2c/ucmerced-staging.values.yaml
@@ -12,8 +12,8 @@ jupyterhub:
         description: Start a Python server with JupyterLab and scientific Python stack
         default: true
         kubespawner_override:
-          # From https://github.com/2i2c-org/scipy-notebook-with-nbgitpuller
-          image: quay.io/2i2c/scipy-notebook-with-nbgitpuller:99968bfe6916
+          # From https://github.com/SaiUCM/example-inherit-from-community-image
+          image: quay.io/cirt_ucm/jupyter-scipy-xarray:latest
           # Launch into JupyterLab after the user logs in
           default_url: /lab
       - display_name: R
diff --git a/config/clusters/2i2c/ucmerced.values.yaml b/config/clusters/2i2c/ucmerced.values.yaml
index e9ba657363..aad9a1b1f1 100644
--- a/config/clusters/2i2c/ucmerced.values.yaml
+++ b/config/clusters/2i2c/ucmerced.values.yaml
@@ -12,8 +12,9 @@ jupyterhub:
         description: Start a Python server with JupyterLab and scientific Python stack
         default: true
         kubespawner_override:
-          # From https://github.com/2i2c-org/scipy-notebook-with-nbgitpuller
-          image: quay.io/2i2c/scipy-notebook-with-nbgitpuller:99968bfe6916
+          # From https://github.com/SaiUCM/example-inherit-from-community-image
+          # See https://2i2c.freshdesk.com/a/tickets/1407
+          image: quay.io/cirt_ucm/jupyter-scipy-xarray:e490e37d1ef2
           # Launch into JupyterLab after the user logs in
           default_url: /lab
       - display_name: R
diff --git a/config/clusters/opensci/sciencecore.values.yaml b/config/clusters/opensci/sciencecore.values.yaml
index e3896ffb75..5dfdecadb0 100644
--- a/config/clusters/opensci/sciencecore.values.yaml
+++ b/config/clusters/opensci/sciencecore.values.yaml
@@ -81,6 +81,15 @@ jupyterhub:
                 slug: scipy
                 kubespawner_override:
                   image: quay.io/jupyter/scipy-notebook:2024-06-26
+              school:
+                display_name: TOPST SCHOOL Project
+                description: "quay.io/repository/isciences/tops-school:latest"
+                slug: school
+                kubespawner_override:
+                  image: quay.io/isciences/tops-school:latest
+                  # Launch into RStudio after the user logs in
+                  default_url: /rstudio
+                  working_dir: /home/rstudio
           resources:
             display_name: Resource Allocation
             choices: