diff --git a/charts/jupyter-hub-customizations/Chart.yaml b/charts/jupyter-hub-customizations/Chart.yaml
index b5baae7390ed8e559fbf163413e651ab2b5cbea6..ef638f38915e90dc5b414a8f34c769761841e676 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.28
+version: 0.16.29
 # 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 6e61cd864214484814ba1616555819a4af18451c..8c07a1e45247f363985aa7d5e162bce0b8b2f13f 100644
--- a/charts/jupyter-hub-customizations/templates/configmap_custom.yaml
+++ b/charts/jupyter-hub-customizations/templates/configmap_custom.yaml
@@ -422,7 +422,7 @@ data:
         interactivePartitions:
           - LoginNode
         weight: 3
-        {{- with .Values.customConfig.systemsMaxPerUser.JEDI }}
+        {{- with .Values.customConfig.systemsMaxPerUser.JUPITER }}
         maxPerUser:
          {{- toYaml . | nindent 10 }}
         {{- end }}
@@ -554,7 +554,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 "JUDAC" .Values.customConfig.systems)
@@ -847,7 +847,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 "JUDAC" .Values.customConfig.systems)
@@ -874,8 +874,8 @@ data:
       juwels_develbooster: JUWELS
       juwels_gpus: JUWELS
       {{- end }}
-      {{- if has "JEDI" .Values.customConfig.systems }}
-      jedi: JEDI
+      {{- if has "JUPITER" .Values.customConfig.systems }}
+      jupiter_booster: JUPITER
       {{- end }}
       {{- if has "JUSUF" .Values.customConfig.systems }}
       jusuf: JUSUF
@@ -896,7 +896,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 "JUDAC" .Values.customConfig.systems)
@@ -923,8 +923,8 @@ data:
       juwels_develbooster: develbooster
       juwels_gpus: gpus
       {{- end }}
-      {{- if has "JEDI" .Values.customConfig.systems }}
-      jedi: all
+      {{- if has "JUPITER" .Values.customConfig.systems }}
+      jupiter_booster: jureap
       {{- end }}
       {{- if has "JUSUF" .Values.customConfig.systems }}
       jusuf: batch
@@ -1022,7 +1022,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)
       }}
@@ -1047,6 +1047,10 @@ data:
         JEDI:
           host: login.jedi.fz-juelich.de
         {{- end }}
+        {{- if has "JUPITER" .Values.customConfig.systems }}
+        JUPITER:
+          host: login.jupiter.fz-juelich.de
+        {{- end }}
         {{- if has "JUSUF" .Values.customConfig.systems }}
         JUSUF:
           host: jusuf.fz-juelich.de
@@ -1133,7 +1137,7 @@ data:
           allowed_systems:
             - JUWELS
             - JURECA
-            - JEDI
+            - JUPITER
             - JUSUF
             - DEEP
           weight: 23
@@ -1354,7 +1358,7 @@ data:
             - JUWELS
             - JURECA
             - JUSUF
-            - JEDI
+            - JUPITER
             - JSC-Cloud
           compute_only: false
           weight: 19
@@ -1370,7 +1374,7 @@ data:
             - JUWELS
             - JURECA
             - JUSUF
-            - JEDI
+            - JUPITER
             - JSC-Cloud
           compute_only: false
           weight: 18
@@ -1386,7 +1390,7 @@ data:
           allowed_systems:
             - JUWELS
             - JURECA
-            - JEDI
+            - JUPITER
             - JUSUF
             - JSC-Cloud
           compute_only: false