diff --git a/config/clusters/nmfs-openscapes/common.values.yaml b/config/clusters/nmfs-openscapes/common.values.yaml
index 3cd6ab730..fdc661a44 100644
--- a/config/clusters/nmfs-openscapes/common.values.yaml
+++ b/config/clusters/nmfs-openscapes/common.values.yaml
@@ -164,72 +164,79 @@ jupyterhub:
           display_name: Resource Allocation
           choices:
               # choices generated by combining:
-              # - deployer generate resource-allocation choices r7i.xlarge
-              # - deployer generate resource-allocation choices r7i.4xlarge --num-allocations=2
-            mem_1_9:
-              display_name: 1.9 GB RAM, upto 3.7 CPUs
+              # - deployer generate resource-allocation choices r5.xlarge:5
+              # - deployer generate resource-allocation choices r5.4xlarge:2
+            mem_2_gb:
+              display_name: ~2 GB RAM, ~0.2 CPUs
+              description: Up to ~4 CPUs when available
               kubespawner_override:
-                mem_guarantee: 1991244775
-                mem_limit: 1991244775
-                cpu_guarantee: 0.2328125
-                cpu_limit: 3.725
+                mem_guarantee: 1951419879
+                mem_limit: 1951419879
+                cpu_guarantee: 0.22815625
+                cpu_limit: 3.6505
                 node_selector:
                   node.kubernetes.io/instance-type: r5.xlarge
-              default: true
-            mem_3_7:
-              display_name: 3.7 GB RAM, upto 3.7 CPUs
+            mem_4_gb:
+              display_name: ~4 GB RAM, ~0.5 CPUs
+              description: Up to ~4 CPUs when available
               kubespawner_override:
-                mem_guarantee: 3982489550
-                mem_limit: 3982489550
-                cpu_guarantee: 0.465625
-                cpu_limit: 3.725
+                mem_guarantee: 3902839759
+                mem_limit: 3902839759
+                cpu_guarantee: 0.4563125
+                cpu_limit: 3.6505
                 node_selector:
                   node.kubernetes.io/instance-type: r5.xlarge
-            mem_7_4:
-              display_name: 7.4 GB RAM, upto 3.7 CPUs
+            mem_7_gb:
+              display_name: ~7 GB RAM, ~0.9 CPUs
+              description: Up to ~4 CPUs when available
               kubespawner_override:
-                mem_guarantee: 7964979101
-                mem_limit: 7964979101
-                cpu_guarantee: 0.93125
-                cpu_limit: 3.725
+                mem_guarantee: 7805679519
+                mem_limit: 7805679519
+                cpu_guarantee: 0.912625
+                cpu_limit: 3.6505
                 node_selector:
                   node.kubernetes.io/instance-type: r5.xlarge
-            mem_14_8:
-              display_name: 14.8 GB RAM, upto 3.7 CPUs
+            mem_15_gb:
+              display_name: ~15 GB RAM, ~1.8 CPUs
+              description: Up to ~4 CPUs when available
               kubespawner_override:
-                mem_guarantee: 15929958203
-                mem_limit: 15929958203
-                cpu_guarantee: 1.8625
-                cpu_limit: 3.725
+                mem_guarantee: 15611359038
+                mem_limit: 15611359038
+                cpu_guarantee: 1.82525
+                cpu_limit: 3.6505
                 node_selector:
                   node.kubernetes.io/instance-type: r5.xlarge
-            mem_29_7:
-              display_name: 29.7 GB RAM, upto 3.7 CPUs
+            mem_29_gb:
+              display_name: ~29 GB RAM, ~4 CPUs
+              description: ~4 CPUs always available
               kubespawner_override:
-                mem_guarantee: 31859916406
-                mem_limit: 31859916406
-                cpu_guarantee: 3.725
-                cpu_limit: 3.725
+                mem_guarantee: 31222718077
+                mem_limit: 31222718077
+                cpu_guarantee: 3.6505
+                cpu_limit: 3.6505
                 node_selector:
                   node.kubernetes.io/instance-type: r5.xlarge
-            mem_60_6:
-              display_name: 60.6 GB RAM, upto 15.6 CPUs
+            mem_60_gb:
+              display_name: ~60 GB RAM, ~8 CPUs
+              description: Up to ~15 CPUs when available
               kubespawner_override:
-                mem_guarantee: 65094448840
-                mem_limit: 65094448840
-                cpu_guarantee: 7.8475
-                cpu_limit: 15.695
+                mem_guarantee: 64020707016
+                mem_limit: 64020707016
+                cpu_guarantee: 7.69055
+                cpu_limit: 15.3811
                 node_selector:
                   node.kubernetes.io/instance-type: r5.4xlarge
-            mem_121_2:
-              display_name: 121.2 GB RAM, upto 15.6 CPUs
+            mem_119_gb:
+              display_name: ~119 GB RAM, ~15 CPUs
+              description: ~15 CPUs always available
               kubespawner_override:
-                mem_guarantee: 130188897681
-                mem_limit: 130188897681
-                cpu_guarantee: 15.695
-                cpu_limit: 15.695
+                mem_guarantee: 128041414033
+                mem_limit: 128041414033
+                cpu_guarantee: 15.3811
+                cpu_limit: 15.3811
                 node_selector:
                   node.kubernetes.io/instance-type: r5.4xlarge
+
     - display_name: NVIDIA Tesla T4, ~16 GB, ~4 CPUs
       description: Start a container on a dedicated node with a GPU
       slug: gpu
diff --git a/config/clusters/nmfs-openscapes/enc-workshop.secret.values.yaml b/config/clusters/nmfs-openscapes/enc-workshop.secret.values.yaml
index 1e5df69ac..c30e27f7a 100644
--- a/config/clusters/nmfs-openscapes/enc-workshop.secret.values.yaml
+++ b/config/clusters/nmfs-openscapes/enc-workshop.secret.values.yaml
@@ -2,13 +2,13 @@ jupyterhub:
   hub:
     config:
       DummyAuthenticator:
-        password: ENC[AES256_GCM,data:tmG28nvsupQ/rQ==,iv:Z7iSLzLsaEJdEVuWqTYsfHBusbmInwX/OMsfB6yotbM=,tag:ke/Y5WbbW+ryuq5XD/zgsA==,type:str]
+        password: ENC[AES256_GCM,data:kBckoImW4hFNEXM4vw==,iv:KT2iIj7dfK8Mhet/e/bXYuVN4qOOk87SnpxymDackVY=,tag:7tyLmXAlLYEYCWqx57kjsw==,type:str]
 sops:
   gcp_kms:
   - resource_id: projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs
     created_at: '2025-01-09T15:19:55Z'
     enc: CiUA4OM7eGez8KDuQZXma3aE2ZS9b3HenoeE9zJDAt9k+DMfqFVMEkkAnGhyNvSoFbF+zxcX/4id6Slvrld7haauv8LWoKhnKNroAKcT7U9aEqy80YJrXAMKJeuaWBgcTZUtpulxNqhb5FltsbNX8eY1
-  lastmodified: '2025-06-12T13:36:31Z'
-  mac: ENC[AES256_GCM,data:0pzOTziH6pxw+q0K5pXnOeR4u6yGZOxFM32OqkmMQqwf3W/X3Vg/kop7bazFUtMQ842aBeMxFX4wk9DATVDn8c9YtomPzwMQxUJj5rP9pwiwfpt+jFTbSYmi2pB+W21EVylpDi690yco6D9dpA2gvYbiM3uZSnnWtXYK8XOEh7E=,iv:nbhdnaRlKPEmr871LVgHyamK5SGIR+ppNd2mkkHest8=,tag:FhGBYacFHC/mRIGH1ykxWA==,type:str]
+  lastmodified: '2025-10-08T15:49:44Z'
+  mac: ENC[AES256_GCM,data:+ZakdR8RIyvezuefwHMFlbzCAmMfQZr9AI9OU67vEmiVpOZ5A5KBlAKrzlE0KBOVgt93CMGcFViFe8iXK3RB1Ew4iK5Eq/GbN1fKs9I3k7EWhFLjjLXTOjkZ8hk5wYrel9oGoB/TtOAszqN6ZNWso52FvoxIUJj9JNCNjxaJJqU=,iv:ukPta6Znz9FDVVijuOQZI+GVqBSrjUQEAGkN3z5lt0s=,tag:bDdVEeCbBX29Urvs8YHH1Q==,type:str]
   unencrypted_suffix: _unencrypted
   version: 3.10.2
diff --git a/config/clusters/nmfs-openscapes/workshop.values.yaml b/config/clusters/nmfs-openscapes/workshop.values.yaml
index f6fb5ea67..d2df9a9d3 100644
--- a/config/clusters/nmfs-openscapes/workshop.values.yaml
+++ b/config/clusters/nmfs-openscapes/workshop.values.yaml
@@ -53,151 +53,6 @@ jupyterhub:
       PERSISTENT_BUCKET: s3://nmfs-openscapes-persistent-workshop/$(JUPYTERHUB_USER)
       GH_SCOPED_CREDS_CLIENT_ID: Iv23liopQ2cWF2zW212t
       GH_SCOPED_CREDS_APP_URL: https://github.com/apps/nmfs-openscapes-workshop-github
-    profileList:
-    - display_name: Default
-      description: Choose image and resource allocation
-      default: true
-      profile_options:
-        image:
-          display_name: Image
-          choices:
-            python:
-              display_name: Py - NASA Openscapes Python, Dask Gateway 07980b9
-              slug: python
-              kubespawner_override:
-                image: openscapes/python:07980b9
-            cefi:
-              display_name: Py-R - CEFI image latest
-              slug: cefi
-              kubespawner_override:
-                image: ghcr.io/nmfs-opensci/cefi-image:latest
-            asar:
-              display_name: R - ASAR Stock Assessment
-              slug: asar
-              kubespawner_override:
-                image: ghcr.io/nmfs-opensci/container-images/asar:latest
-            pyrgeo2:
-              display_name: Py-R - Geospatial + QGIS, Panoply, CWUtils - py-rocket-geospatial-2 latest
-              slug: pyrgeo2
-              default: true
-              kubespawner_override:
-                image: ghcr.io/nmfs-opensci/container-images/py-rocket-geospatial-2:latest
-            ohw:
-              display_name: OceanHackWeek latest
-              slug: ohw
-              kubespawner_override:
-                image: ghcr.io/oceanhackweek/python:latest
-            coastwatch:
-              display_name: Py-R - CoastWatch - coastwatch latest
-              slug: coastwatch
-              kubespawner_override:
-                image: ghcr.io/nmfs-opensci/container-images/coastwatch:latest
-            aomlomics:
-              display_name: Py - Tourmaline Snakemake workflow for QIIME 2 v.2023.5
-              slug: aomlomics
-              kubespawner_override:
-                image: ghcr.io/nmfs-opensci/container-images/aomlomics-jh:latest
-            iorocker:
-              display_name: R - Geospatial w sdmTMB - r-geospatial-sdm latest
-              slug: rgeospatialsdm
-              kubespawner_override:
-                image: ghcr.io/nmfs-opensci/container-images/r-geospatial-sdm:latest
-            echopype:
-              display_name: Py - Echopype with pangeo - image-acoustics latest
-              slug: echopype
-              kubespawner_override:
-                image: ghcr.io/nmfs-opensci/image-acoustics:latest
-            arcgis:
-              display_name: Py - ArcGIS Python 3.9
-              slug: arcgis
-              kubespawner_override:
-                image: ghcr.io/nmfs-opensci/container-images/arcgis:latest
-            vast:
-              display_name: R - VAST with TMB - vast latest
-              kubespawner_override:
-                image: ghcr.io/nmfs-opensci/container-images/vast:latest
-            pace:
-              display_name: Py - PACE image with OCSSW tools
-              slug: pace
-              kubespawner_override:
-                image: ghcr.io/nasa/oceandata-notebooks:912dae9bd439
-          unlisted_choice:
-            enabled: true
-            display_name: Custom image
-            validation_regex: ^.+:.+$
-            validation_message: Must be a publicly available docker image, of form <image-name>:<tag>
-            kubespawner_override:
-              image: '{value}'
-        requests:
-          display_name: Resource Allocation
-          choices:
-              # choices generated by combining:
-              # - deployer generate resource-allocation choices r7i.xlarge
-              # - deployer generate resource-allocation choices r7i.4xlarge --num-allocations=2
-            mem_1_9:
-              display_name: 1.9 GB RAM, upto 3.7 CPUs
-              kubespawner_override:
-                mem_guarantee: 1991244775
-                mem_limit: 1991244775
-                cpu_guarantee: 0.2328125
-                cpu_limit: 3.725
-                node_selector:
-                  node.kubernetes.io/instance-type: r5.xlarge
-              default: true
-            mem_3_7:
-              display_name: 3.7 GB RAM, upto 3.7 CPUs
-              kubespawner_override:
-                mem_guarantee: 3982489550
-                mem_limit: 3982489550
-                cpu_guarantee: 0.465625
-                cpu_limit: 3.725
-                node_selector:
-                  node.kubernetes.io/instance-type: r5.xlarge
-            mem_7_4:
-              display_name: 7.4 GB RAM, upto 3.7 CPUs
-              kubespawner_override:
-                mem_guarantee: 7964979101
-                mem_limit: 7964979101
-                cpu_guarantee: 0.93125
-                cpu_limit: 3.725
-                node_selector:
-                  node.kubernetes.io/instance-type: r5.xlarge
-            mem_14_8:
-              display_name: 14.8 GB RAM, upto 3.7 CPUs
-              kubespawner_override:
-                mem_guarantee: 15929958203
-                mem_limit: 15929958203
-                cpu_guarantee: 1.8625
-                cpu_limit: 3.725
-                node_selector:
-                  node.kubernetes.io/instance-type: r5.xlarge
-            mem_29_7:
-              display_name: 29.7 GB RAM, upto 3.7 CPUs
-              kubespawner_override:
-                mem_guarantee: 31859916406
-                mem_limit: 31859916406
-                cpu_guarantee: 3.725
-                cpu_limit: 3.725
-                node_selector:
-                  node.kubernetes.io/instance-type: r5.xlarge
-            mem_60_6:
-              display_name: 60.6 GB RAM, upto 15.6 CPUs
-              kubespawner_override:
-                mem_guarantee: 65094448840
-                mem_limit: 65094448840
-                cpu_guarantee: 7.8475
-                cpu_limit: 15.695
-                node_selector:
-                  node.kubernetes.io/instance-type: r5.4xlarge
-            mem_121_2:
-              display_name: 121.2 GB RAM, upto 15.6 CPUs
-              kubespawner_override:
-                mem_guarantee: 130188897681
-                mem_limit: 130188897681
-                cpu_guarantee: 15.695
-                cpu_limit: 15.695
-                node_selector:
-                  node.kubernetes.io/instance-type: r5.4xlarge
 
 jupyterhub-home-nfs:
   eks: