diff --git a/binderhub-azimuth/Chart.yaml b/binderhub-azimuth/Chart.yaml
index f6f48b8..42fb852 100644
--- a/binderhub-azimuth/Chart.yaml
+++ b/binderhub-azimuth/Chart.yaml
@@ -11,7 +11,7 @@ keywords: [jupyter, binderhub]
 # https://hub.jupyter.org/helm-chart/#development-releases-binderhub 
 dependencies:
   - name: binderhub
-    version: 1.0.0-0.dev.git.3437.h81a3428 #1.0.0-0.dev.git.3350.he7995d6
+    version: 1.0.0-0.dev.git.3437.h81a3428
     repository: https://jupyterhub.github.io/helm-chart/
 
 annotations:
diff --git a/binderhub-azimuth/values.yaml b/binderhub-azimuth/values.yaml
index 6500ce3..931f58f 100644
--- a/binderhub-azimuth/values.yaml
+++ b/binderhub-azimuth/values.yaml
@@ -22,8 +22,8 @@ registry:
   username: &registry-username registry-user
   password: # Randomly generated within Azimuth UI (see azimuth-ui.schema.yaml)
   nodeport: 31783
-  # storage:
-  #   capacity: '10Gi' # Set in Azimuth UI
+  storage:
+    capacity: # Set in Azimuth UI
   credentialsSecretName: binderhub-registry-creds
   imagePullSecretName: binderhub-registry-image-pull
 
@@ -78,7 +78,7 @@ binderhub:
       allowNamedServers: true
       # Number of servers allowed per user.
       # Set to 0 for no limit.
-      # namedServerLimitPerUser: 0
+      namedServerLimitPerUser:
 
       networkPolicy:
         enabled: false
@@ -289,11 +289,6 @@ binderhub:
       defaultUrl: /lab
       extraEnv:
         JUPYTERHUB_SINGLEUSER_APP: "jupyter_server.serverapp.ServerApp"
-      # cpu:
-      #   limit: 1
-      # memory:
-      #   limit: '2G'
-      
 
   imageBuilderType: pink
   pink:
@@ -316,8 +311,8 @@ binderhub:
   registry:
     url: *registry-url
     username: *registry-username
-    password: 'test' # Set to mirror global registry.password value (see azimuth-ui.schema.yaml)
-    
+    password: # Set to mirror global registry.password value (see azimuth-ui.schema.yaml)
+
   config:
     BinderHub:
       # Auth is handled by Zenith
diff --git a/daskhub-azimuth/values.yaml b/daskhub-azimuth/values.yaml
index bc89ffa..e658384 100644
--- a/daskhub-azimuth/values.yaml
+++ b/daskhub-azimuth/values.yaml
@@ -6,9 +6,6 @@ zenithClient:
 daskhub:
   dask-gateway:
     gateway:
-      # auth:
-      #   jupyterhub:
-      #     apiToken: 448f787268fdef1d96c1054b88a28f405f0e636406996c7bcddcc40aa9e2fc2e
       extraConfig:
         optionHandler: |
           from dask_gateway_server.options import Options, Integer, Float, String
@@ -44,9 +41,6 @@ daskhub:
           enabled: false
 
     hub:
-      # services:
-      #   dask-gateway:
-      #     apiToken: 448f787268fdef1d96c1054b88a28f405f0e636406996c7bcddcc40aa9e2fc2e
       networkPolicy:
         enabled: false
       # Configure the authentication to respect the X-Remote-User header sent by Zenith from Azimuth
@@ -98,7 +92,3 @@ daskhub:
       extraEnv:
         DASK_GATEWAY__CLUSTER__OPTIONS__IMAGE: '{{JUPYTER_IMAGE_SPEC}}'
         JUPYTERHUB_SINGLEUSER_APP: "jupyter_server.serverapp.ServerApp"
-      # cpu:
-      #   limit: 1
-      # memory:
-      #   limit: '10G'
diff --git a/jupyterhub-azimuth/Chart.yaml b/jupyterhub-azimuth/Chart.yaml
index 9607762..0328c70 100644
--- a/jupyterhub-azimuth/Chart.yaml
+++ b/jupyterhub-azimuth/Chart.yaml
@@ -9,7 +9,7 @@ keywords: [jupyter, jupyterhub]
 
 dependencies:
   - name: jupyterhub
-    version: 4.0.0-0.dev.git.6606.he7fe8840
+    version: 3.3.7
     repository: https://jupyterhub.github.io/helm-chart/
 
 annotations:
diff --git a/jupyterhub-azimuth/values.yaml b/jupyterhub-azimuth/values.yaml
index 8bb8698..5e2da9c 100644
--- a/jupyterhub-azimuth/values.yaml
+++ b/jupyterhub-azimuth/values.yaml
@@ -68,7 +68,3 @@ jupyterhub:
     defaultUrl: /lab
     extraEnv:
       JUPYTERHUB_SINGLEUSER_APP: "jupyter_server.serverapp.ServerApp"
-    # cpu:
-    #   limit: 1
-    # memory:
-    #   limit: '2G'
\ No newline at end of file