diff --git a/charts/jupyter-hub-customizations/Chart.yaml b/charts/jupyter-hub-customizations/Chart.yaml
index 155825543cbd827f3d4b61ecec95d5fc4785d713..b5baae7390ed8e559fbf163413e651ab2b5cbea6 100644
--- a/charts/jupyter-hub-customizations/Chart.yaml
+++ b/charts/jupyter-hub-customizations/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.16.27
+version: 0.16.28
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
diff --git a/charts/jupyter-hub-customizations/templates/configmap_custom.yaml b/charts/jupyter-hub-customizations/templates/configmap_custom.yaml
index c7fd5f6d69be6829173f0c2cd7b602157577e27d..6e61cd864214484814ba1616555819a4af18451c 100644
--- a/charts/jupyter-hub-customizations/templates/configmap_custom.yaml
+++ b/charts/jupyter-hub-customizations/templates/configmap_custom.yaml
@@ -152,7 +152,7 @@ data:
           {{- if not ( or
             ( has "JUWELS" .Values.customConfig.systems)
             ( has "JURECA" .Values.customConfig.systems)
-            ( has "JEDI" .Values.customConfig.systems)
+            ( has "JUPITER" .Values.customConfig.systems)
             ( has "JUSUF" .Values.customConfig.systems)
             ( has "DEEP" .Values.customConfig.systems)
             ( has "JSC-Cloud" .Values.customConfig.systems)
@@ -201,7 +201,7 @@ data:
             ( or
               (has "JUWELS" .Values.customConfig.systems)
               (has "JURECA" .Values.customConfig.systems)
-              (has "JEDI" .Values.customConfig.systems)
+              (has "JUPITER" .Values.customConfig.systems)
               (has "JUSUF" .Values.customConfig.systems)
             )
           }}
@@ -219,7 +219,7 @@ data:
             ( or
               (has "JUWELS" .Values.customConfig.systems)
               (has "JURECA" .Values.customConfig.systems)
-              (has "JEDI" .Values.customConfig.systems)
+              (has "JUPITER" .Values.customConfig.systems)
               (has "JUSUF" .Values.customConfig.systems)
             )
           }}
@@ -237,7 +237,7 @@ data:
             ( or
               (has "JUWELS" .Values.customConfig.systems)
               (has "JURECA" .Values.customConfig.systems)
-              (has "JEDI" .Values.customConfig.systems)
+              (has "JUPITER" .Values.customConfig.systems)
               (has "JUSUF" .Values.customConfig.systems)
               (has "DEEP" .Values.customConfig.systems)
               (has "JSC-Cloud" .Values.customConfig.systems)
@@ -261,7 +261,6 @@ data:
             ( or
               (has "JUWELS" .Values.customConfig.systems)
               (has "JURECA" .Values.customConfig.systems)
-              (has "JEDI" .Values.customConfig.systems)
               (has "JUSUF" .Values.customConfig.systems)
               (has "DEEP" .Values.customConfig.systems)
               (has "JSC-Cloud" .Values.customConfig.systems)
@@ -285,7 +284,6 @@ data:
             ( or
               ( has "JUWELS" .Values.customConfig.systems )
               ( has "JURECA" .Values.customConfig.systems )
-              ( has "JEDI" .Values.customConfig.systems )
               ( has "JUSUF" .Values.customConfig.systems )
               ( has "DEEP" .Values.customConfig.systems )
               ( has "JSC-Cloud" .Values.customConfig.systems )
@@ -309,7 +307,6 @@ data:
             ( or
               (has "JUWELS" .Values.customConfig.systems)
               (has "JURECA" .Values.customConfig.systems)
-              (has "JEDI" .Values.customConfig.systems)
               (has "JUSUF" .Values.customConfig.systems)
               (has "DEEP" .Values.customConfig.systems)
               (has "JSC-Cloud" .Values.customConfig.systems)
@@ -383,7 +380,7 @@ data:
     {{- if or
       (has "JUWELS" .Values.customConfig.systems)
       (has "JURECA" .Values.customConfig.systems)
-      (has "JEDI" .Values.customConfig.systems)
+      (has "JUPITER" .Values.customConfig.systems)
       (has "JUSUF" .Values.customConfig.systems)
       (has "DEEP" .Values.customConfig.systems)
       (has "JUDAC" .Values.customConfig.systems)
@@ -420,8 +417,8 @@ data:
         {{- end }}
         backendService: outpostUnicore
       {{- end }}
-      {{- if has "JEDI" .Values.customConfig.systems }}
-      JEDI:
+      {{- if has "JUPITER" .Values.customConfig.systems }}
+      JUPITER:
         interactivePartitions:
           - LoginNode
         weight: 3
@@ -645,13 +642,13 @@ data:
             default: 30
             minmax: [10, 1440]
       {{- end }}
-      {{- if has "JEDI" .Values.customConfig.systems }}
-      JEDI:
+      {{- if has "JUPITER" .Values.customConfig.systems }}
+      JUPITER:
         LoginNode: {}
-        all:
+        jureap:
           nodes:
             default: 1
-            minmax: [1, 48]
+            minmax: [1, 4967]
           runtime:
             default: 30
             minmax: [10, 1440]
diff --git a/charts/jupyter-hub-customizations/values.yaml b/charts/jupyter-hub-customizations/values.yaml
index 0a123148e8d2e644fa6abf7ccefaba3670a53088..1a53b8ddecff995d3b719bebfde764fd783399ea 100644
--- a/charts/jupyter-hub-customizations/values.yaml
+++ b/charts/jupyter-hub-customizations/values.yaml
@@ -132,7 +132,7 @@ customConfig:
       default: 5
     JURECA:
       default: 5
-    JUJEDI:
+    JUPITER:
       default: 5
     JUSUF:
       default: 5
@@ -161,7 +161,7 @@ customConfig:
   systems:
     - JURECA
     - JUWELS
-    - JEDI
+    - JUPITER
     - JUSUF
     - DEEP
     - JSC-Cloud
@@ -418,7 +418,7 @@ customConfig:
           systems:
             - JURECA
             - JUWELS
-            - JEDI
+            - JUPITER
             - JUSUF
       "xpra":
         enabled: true
@@ -428,7 +428,7 @@ customConfig:
           systems:
             - JURECA
             - JUWELS
-            - JEDI
+            - JUPITER
             - JUSUF
       "4.3":
         enabled: true
@@ -438,7 +438,7 @@ customConfig:
           systems:
             - JURECA
             - JUWELS
-            - JEDI
+            - JUPITER
             - JUSUF
             - DEEP
             - JSC-Cloud
@@ -450,7 +450,6 @@ customConfig:
           systems:
             - JURECA
             - JUWELS
-            - JEDI
             - JUSUF
             - DEEP
             - JSC-Cloud
@@ -464,7 +463,6 @@ customConfig:
           systems:
             - JURECA
             - JUWELS
-            - JEDI
             - JUSUF
             - DEEP
             - JSC-Cloud