diff --git a/base-values/extraConfig.yaml b/base-values/extraConfig.yaml
index cd4fba32f78fcc1ff53c090e26aa0f3fc9ac10db..9a2d20d3f0e116debee53abb0e0df9bde0cc9e29 100644
--- a/base-values/extraConfig.yaml
+++ b/base-values/extraConfig.yaml
@@ -128,33 +128,53 @@ hub:
       # juypterhub upgrade-db
       #  --db=postgresql://$SQL_USER:$SQL_PASSWORD@$SQL_HOST:$SQL_PORT/$SQL_DATABASE 
       ## Static files + Templates
-      from forwardbasespawner.api_events import user_cancel_message
       # Call update incidents once to fill incidents dictionary
       jsc_custom.misc.update_incidents_now()
       c.JupyterHub.template_paths = ["/mnt/shared-data/share/jupyterhub/templates"]
 
-      # Load flavors in template_vars at runtime
-      from outpostspawner.api_flavors_update import sync_get_flavors
-      def get_flavors(user):
-          logger = logging.getLogger(logged_logger_name)
-          ret = sync_get_flavors(logger, user)
+
+      from jsc_custom.misc import get_reservations
+      from jsc_custom.misc import get_custom_config
+      def frontendCollection(user=None):
+          custom_config = get_custom_config()
+          ret = {      
+              "hostname": jhub_hostname,
+              "incidentCheck": custom_config.get("incidentCheck", {}),
+              "systemConfig": custom_config.get("systems", {}),
+              "mapSystems": {},
+              "mapPartitions": {},
+              "defaultPartitions": {},
+              "serviceConfig": {},
+              "userModules": {},
+              "resourcesConfig": {},
+              "backendServices": {},
+              "incidents": {},
+              "reservations": {},
+              "decrypted_user_options": {}
+          }
+          if user:
+              ret.update({
+                  "mapSystems": custom_config.get("mapSystems", {}),
+                  "mapPartitions": custom_config.get("mapPartitions", {}),
+                  "defaultPartitions": custom_config.get("defaultPartitions", {}),
+                  "serviceConfig": custom_config.get("services", {}),
+                  "userModules": custom_config.get("userModules", {}),
+                  "resourcesConfig": custom_config.get("resources", {}),
+                  "backendServices": custom_config.get("backendServices", {}),
+                  "incidents": jsc_custom.misc.get_incidents(user),
+                  "reservations": get_reservations(),
+                  "decrypted_user_options": jsc_custom.spawner.utils.decrypted_user_options(user)
+              })
           return ret
+          
 
       c.JupyterHub.template_vars = {
-          "spawn_progress_update_url": "users/progress/events",
-          "user_cancel_message": user_cancel_message,
-          "hostname": jhub_hostname,
-          "custom_config": jsc_custom.misc.filter_custom_config_by_auth_state_keys,
-          "incidents": jsc_custom.misc.get_incidents,
-          "outpostflavors": get_flavors,
-          "decrypted_user_options": jsc_custom.spawner.utils.decrypted_user_options,
+          "frontendCollection": frontendCollection
       }
       c.JupyterHub.data_files_path = "/mnt/shared-data/share/jupyterhub/static"
 
       ## SSL
       c.JupyterHub.trusted_alt_names = [
-          "DNS:localhost",
-          "DNS:127.0.0.1",
           f"DNS:hub",
           f"DNS:proxy-public",
           f"DNS:proxy-public.{namespace}.svc",
@@ -299,8 +319,9 @@ hub:
       ## Spawner
       c.JupyterHub.spawner_class = jsc_custom.spawner.CustomJSCSpawner
 
+      ssh_system_list = ["deNBI-Cloud", "TUD", "TUD-Staging", "LRZ", "LRZ-Staging", "HLRS", "HLRS-Staging", "MPCDF"]
       def ssh_during_startup(spawner):
-          if spawner.user_options.get("system", "") in ["LRZ", "LRZ-Staging", "HLRS", "HLRS-Staging", "MPCDF", "Dummy"]:
+          if spawner.user_options.get("system", "") in ssh_system_list:
               return True
           return False
 
@@ -310,45 +331,6 @@ hub:
       c.CustomJSCSpawner.ssh_custom_forward_remove = jsc_custom.spawner.ssh_custom_forward_remove
       c.CustomJSCSpawner.custom_port = jsc_custom.spawner.custom_port
 
-      async def custom_misc(spawner, user_options):
-          if user_options.get("profile", "") in ["JupyterLab/custom", "JupyterLab/repo2docker"]:
-              return {
-                "cmd": ['/bin/sh', '-c'],
-                "args": [
-                    '''
-                    #!/bin/sh
-                    # Get the current jupyterhub-singleuser version
-                    version=$(jupyterhub-singleuser --version || echo "0.0.0")
-
-                    # Set the desired version range
-                    min_version="4.0.0"
-                    max_version="5.0.0"
-                    target_version="4.1.6"
-
-                    # Function to check if the version is in range
-                    in_range() {
-                        [ "$(printf '%s\n' "$min_version" "$1" | sort -V | head -n1)" = "$min_version" ] && \
-                        [ "$(printf '%s\n' "$1" "$max_version" | sort -V | head -n1)" = "$1" ]
-                    }
-
-                    # Check if the current version is within the range
-                    if ! in_range "$version"; then
-                        echo "Installing jupyterhub-singleuser $target_version as version $version is not within $min_version - $max_version."
-                        pip install "jupyterhub==$target_version"
-                    else
-                        echo "jupyterhub-singleuser $version is within the required version range."
-                    fi
-
-                    # Start the jupyterhub-singleuser
-                    exec jupyterhub-singleuser
-                    '''
-                ]
-              }
-              # return { "cmd": "jupyterhub-singleuser" }
-          return {}
-
-      c.CustomJSCSpawner.custom_misc = custom_misc
-
       c.CustomJSCSpawner.pre_spawn_hook = jsc_custom.spawner.pre_spawn_hook
       c.CustomJSCSpawner.pre_poll_hook = jsc_custom.spawner.pre_poll_hook
       c.CustomJSCSpawner.post_spawn_request_hook = jsc_custom.spawner.post_spawn_request_hook
@@ -364,7 +346,7 @@ hub:
       ## Override request_timeout for start request
       def request_kwargs_start(spawner, user_options):
           request_kwargs_start = jsc_custom.spawner.request_kwargs(spawner, user_options)
-          if user_options.get("system", "None") in ["LRZ", "LRZ-Staging", "HLRS", "HLRS-Staging"]:
+          if user_options.get("system", "None") in ssh_system_list:
               request_kwargs_start["request_timeout"] = 1200
           return request_kwargs_start
 
@@ -372,6 +354,7 @@ hub:
 
       c.CustomJSCSpawner.request_url = jsc_custom.spawner.request_url
       c.CustomJSCSpawner.public_api_url = f"https://{jhub_hostname}{base_url}hub/api"
+
       c.CustomJSCSpawner.custom_env = jsc_custom.spawner.custom_env
       c.CustomJSCSpawner.show_first_default_event = False
       c.CustomJSCSpawner.filter_events = jsc_custom.spawner.filter_events
@@ -463,8 +446,8 @@ hub:
         return transport_kwargs
 
       async def transport_preferences(spawner):
-        account = spawner.user_options.get("account", False)
-        project = spawner.user_options.get("project", False)
+        account = spawner.user_options.get("hpc", {}).get("account", False)
+        project = spawner.user_options.get("hpc", {}).get("project", False)
         if account and project:
           preference = f"uid:{account},group:{project}"
           spawner.log.info(f"{spawner._log_name} - Set preference: {preference}")
diff --git a/base-values/image.yaml b/base-values/image.yaml
index 1cb96f96f2d4687916427c279bc8e35a9a79731d..98ba1924687ca79cc87cad6f50798656f49819c0 100644
--- a/base-values/image.yaml
+++ b/base-values/image.yaml
@@ -14,4 +14,4 @@ hub:
   image:
     pullPolicy: "Always"
     name: registry.jsc.fz-juelich.de/jupyterjsc/k8s/images/jhub
-    tag: 3.3.8.post11
+    tag: 3.3.8.post30
diff --git a/base-values/image_prod.yaml b/base-values/image_prod.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..1220783792efb5b4663c3d968c6ec5df408752e8
--- /dev/null
+++ b/base-values/image_prod.yaml
@@ -0,0 +1,12 @@
+hub:
+  image:
+    pullPolicy: "Always"
+    name: registry.jsc.fz-juelich.de/jupyterjsc/k8s/images/jhub
+    tag: 3.3.8.post30
+  resources:
+    requests:
+      cpu: 100m
+      memory: 1024Mi
+    limits:
+      cpu: 1000m
+      memory: 4096Mi
\ No newline at end of file
diff --git a/base-values/maintenance.yaml b/base-values/maintenance.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..5d48c2f5ff2aaf6c33950be5f1d0fa37914d9730
--- /dev/null
+++ b/base-values/maintenance.yaml
@@ -0,0 +1,2 @@
+ingress:
+  enabled: false
\ No newline at end of file
diff --git a/coec/custom/fleet.yaml b/coec/custom/fleet.yaml
index ec343e5925a596bb749c999ba02c1cfc39d11533..d8453dcb4fab3c9ac22e085727dba3ac0f9c4726 100644
--- a/coec/custom/fleet.yaml
+++ b/coec/custom/fleet.yaml
@@ -14,7 +14,7 @@ helm:
   releaseName: coec-custom
   repo: https://kaas.pages.jsc.fz-juelich.de/helm-charts
   chart: jupyter-hub-customizations
-  version: 0.15.38
+  version: 0.16.19
   values:
     fullnameOverride: coec-custom
     global:
@@ -50,7 +50,7 @@ targetCustomizations:
     clusterSelector:
       matchLabels:
         stage: production
-        prep: "false"
+        maintenance: "false"
     helm:
       values:
         global:
@@ -69,16 +69,16 @@ targetCustomizations:
     clusterSelector:
       matchLabels:
         stage: production
-        prep: "true"
+        maintenance: "true"
     helm:
       values:
         ingress:
           certmanager: false
         global:
-          hostname: zam12185.zam.kfa-juelich.de
+          hostname: zam12154.zam.kfa-juelich.de
           # hostname: jupyter-coec.jsc.fz-juelich.de
           baseUrl: /coec/
           loggerName: CoeC
-          tlssecretname: zam12185
+          tlssecretname: zam12154
         nfs:
           path: /nfs/hubs/rke2/production/coec
\ No newline at end of file
diff --git a/coec/specific-secrets/overlays/production/frontend-git.yaml b/coec/specific-secrets/overlays/production/frontend-git.yaml
index b8ff529a78d8e23e80b2ae0d87ed16e7e203f3f0..abf96805df11e0aac8d7fe354267c5820786f6a3 100644
--- a/coec/specific-secrets/overlays/production/frontend-git.yaml
+++ b/coec/specific-secrets/overlays/production/frontend-git.yaml
@@ -7,12 +7,10 @@ metadata:
   namespace: coec
 spec:
   encryptedData:
-    SHARE_BASE_GIT_BRANCH: AgBCsjkxAkQbmqKNwuVaj905+hXa6WTbhJzi6xMSw9WDCrwjnHNDvePxXgQl57aw4JhbimAamuqc2azuRqH27kDBM+a0O4BHb4wduGF46xoGsYj0putWcy+jbHV2ccFvlN7cWsbu/Eh7nxzuO+7LpzJwrRW6TJUhXsZfXeLgDJcNwgfvHyAd0ksLGgqw4sOKUBqxAfT27e0kdsHGHJENVVh7Ldd7nH5pPvXR69MNrwW6pyci8TDL+Ctf3+V27O5RiZVsHBsjaiOezUboDxceTY4DbGSBC8dHAG3ZaIxK8MPQTEwCYlp0ROuWy7vhVDnccycOI3VGLOaXFHnmoGXQ2LMR9/Lx2SMBByqj0sIBvQ1YnqNlRTSyGs/038s4n/ERljk1L0c0BHdpYzgFCkgGi4Yx0CC2WhsdQ66aMyMC1P26+sBNY8Vo7Pg71UIt3U7CJiBQBdOlvcW/n8ApXL1/NrLPotqaEvOb3XXjSU/tRsLa3lnwN0U/LZ8jhXtegXvXu9yll1LylXBtnol+6+H5uBYZX1IHbzYz75bps3d4megEd0FfprIs6PI0HLoOfAsg53TXVnz2M2tobMuA89mOsB9pDA4WR1FxO8uR8j7eeHvXYD/wWXj27jJYfZdfamfsYkDIJKoLZJeM52Ti+daftbq5DKzX6nsWpik8XJeAnx3e1bN6VpLMJPMcuw4mu/V0hrAUS3TSWiTiVg/coKQtRrhn+GqKYl/xC9tOSR1proz+Nw==
-    SHARE_BASE_GIT_PASSWORD: AgBFYtTIoWHsu4YIbDTERO+xq+AmOBeFfWqOH9axhH5EwXbKzIHHdlL1VAgvqjkGSPEHAQn96HdukTdSsPutcbzrCilNM9Zal60FAgQ7PPhXy9Jli5OlkzlSmJ6HqcpaDowiVVD47UnYKxdmKUB6f/oyGi8suBUHXUu1PlnaPPmx9FKzRE9jswkFrZ/BXMPt5zGGq29tV9VZZjbSptSJ1v3juC7JaOkWCLitTpIRTr7YBhEeW3mJdreYpdDiNsXomY1eHuoE1dFu4HgS3wHiyPMj59u+qaCqFVpNa8Wu+RjEYXHGORbX5PJKMii3k+TuCvpVP9c4bRgDOSM3jBeI/WI+DXuQT+meaOXVPQpVMYWu4x8yTf4ZJBbi+Y+WJPAvQ1BtRIUe1NiT0yBg60T1AXuZ3jXiWkBuCxMTWzSKvMv/cXl8nMM8u2zm2gUbowxiu6SPLDkTA8QXqUDHaK0/p2lub+MgHr7rTeBnwGVm/IcR2amtYuF51ykurpr9y/p6573ZEdsmAJ4pGiahUgNx2px63QF5wpX6gQB2vGh5SAvIpjNRcV7fAomy06WUKMJI7HhZag4nUs7cf3tRL8p2h5aAeHB3COEmsdpfzayzQWF97KD6WBbqWqEe14NJj04l7OetbjlA4Eb3o1BrrJ9xisMD9V4gSQ9lbVEXkVo8ZYrYRpigmF+w2VpinkO6x9P8Pg+ea266gfmqGrttsGxtu1JGXmsOBQ==
-    SHARE_BASE_GIT_REPO: AgAcRFGdlzSf+qnW6WS4vSS2DBE4yBER6Bf9NpoDOuVatxYZJUZX++Am7S89C9Plu2QYmdjp9UIzU2wPXeDk5fkRTbAK+38DpN90YtxjCVl4T8Se0KxnWC3ILasyhZhz3/qCgwd2dWmv6Aszwi/e1PYca0bLk5pm1oMY0Dyc+hyDFXe3gWCktuB8M9TmYVrb+H/r0VwM31ScLDYsr5e3KsT3KfI0loYvurqyt6T4zuIqK4ZLsOllyxVtZzKA5KTGQSvHtA0ux9ElTUSdUct9jmXDTpUitJHuJqFW0GZ4Ee25KmVqdz/lidzpiUyqqZoDtKMATzTr1qDhiGOsSBmrICr4pXapiBh/Cyx8U1wBhBr2LcgfGtRSpWQocvd5PBxjJ5rofE3RUcwPw1AFc+STrriGYRNBghg3dn8glGem4EV23H6aQ3xBq0/ITExco5PaiQlPSxfuQvVascMRUbKIae4u11zK5QHYVZ+QrsQO28mWLaIyHTlzP7YGuD643NBv0HpF+APlOhAvx7U1P57wwQjwtnSJ4zAPSIbVizUFLN7QhZb3syLmiwhtc+sLFKJ7VCuOUVFGocHIObRSyy8UL328LBQtr2It2R8LbbvawDRNeS0RioBaJ+9gIOFBz8lNpqzcQCO80KZN19c6fwxiJAOC+lptV8q5asGLL8b+9JZ6CQvFMYQBEEeNobKCKVJTlKoawmGsYSptg83j84hls0mrsKbbJqNcA48JB20/H8V0EqQxdNTIByfWNU3GBrFSZieiP+zpa/lCk8OA
-    SHARE_BASE_GIT_USERNAME: AgAr/X3pVY1tHvyY8UFcB6Zoshj8nTHBYS2kPNDY9SNQ2mHKZXS3d8Y/0HiJ9tz3RViaI4OhmO2N8DhipcIvqGNSWRtitX60d9eOn2YxhXYks0i0ycEiOuY70g+qbhfa45eqYzf8UbTaczJoF2iZgBPebNNyCs6OyivOBo4t4bBaHkWj8ZGLWc1XeoZcycdIar/dDodnCiu8e0aTpSYNOYxW2VqyG4w3AGl1ikBLfToSElEir7quFMG1XDty5hXm1uuRetl9u386Kn7vi/MuM7RhAix4TWqSXY8a99uaoh2/W0nGmtqh5k2A2/kvh4VFRPURf9dqZ2Wst3uq+I5H8U5cBwKXIls6rhda36GHolzEAj4I6y2W6YbHrJrzwN1ezYhj8FtK5UjGWO8OoF30/q+UaNQik2QzlSFHUVuFHQQsvxI1eC41H5zMTTjdfVJkP+a3KOb01LwXET9TavmMt8IPdLhFdFqI86iwmPHmMgCpVXp2xOKqcFQgrsqgp/FyjUFxHT9sEM+IU14b/GaF4HRjf4d/fHf2JwxzMt+q4pRKfDG1et5qeHo1xy9WmPYLJbtZkzBidbrkeiFzPjp8H1lSK8x1h9VPpeKzvOKgxasxKUCB3MFxKzjyDs4FqwmewvU9zPGkFwFookxhVVyEttVFTUPY5MdQg6CSDmkCibf3RusWHh29JUFQDbIOhjz0wAadkUJ9xLmmXZXvQhRDBqlXrAk=
-    SHARE_OVERLAYS_GIT_BRANCH: AgBXbJAbGy45OZLxdHOVwaVT7TPnhwJyxYihfwq6wn6ZEawPm88RN8SY8eItBKj/NBRYVhzjFleMVFgXI6yNbShmmIfGoZ47gxY9QbIpWIY+dzQhVvAii7d+4WJxYDtgxdmTeotWDOBUPX1pneh7bpcVFCrEu5ctXzTSBlh9/qksheedxhSO55bRXqCrt3LcNF7DL17IBZFwRow1zdZ9Cqg0f8argXl1VSixBem7OCZo/hIrUB/ul37MZ5pJOVqbsEuo0oT72NSTntYkaXLgcSVuNJaU1ICZpPp2xXmBd4v/PBZEWM/sRXOrA69VU0Nlwn//TwxTO7jDR/ccTza436MgXxZA4ZToKr8y/crOZZwh06CbbSZftVB1hGqyEFrz8SZW7rp7/tnH8Afw98vdnIjsmdVQ4TdEwU98N1grtJWdPH/rxEHyFryJgXg9KIlnKnKVHFBlRP/NxbA1po2ED0kjnzUlua12l8tPdrDZyi5rRZZjcjPlQk6iOYb7/NQXhcBxTQflCbbILyBFsHpYHZLesPxqk1+vWh7zdU2MrYZGSOuKLn15CyIwIzTID6dFBTG5iOlegfFhPz9W2MAmpirpgR2zg0UrHIDJP9jotGhB6LC+raQM5J6OVvBId5ckkbmhKP2OLxwBRCuj+P1paDFk0/g8z8fYCyBBuk/Kk5kFfOQF870U1XqdtxO32XBcAKqQw0EUiYHl6TVo
-    SHARE_OVERLAYS_GIT_REPO: AgCUU1h8xcSPcrq19EVet/dc1TytoaXHox5JaM+ZJqIJMCg1mRIrYZN0WAGBDPPJjnBi5SqnmCN7+zlGWYwCrvWr7x2JOvrvmrMAoh0HE+Qvdbkpqu4BPXVpg8wpTlEqaghRY3UeKEI0ZgyyrRZZZnjyxbl6FDyDCnLlBbPEGThrWTe0AEtRnLRBySosr4oExppg5WQHEc6ESTsezxzHUbOjP5sWjPib9JHjiWZ2eQ6cofKZ2lL0iejFxAyRMqoLxaSfqPcVbHhmlCpyVdEUy8Pbp4j0RMAHTdizdoFCkV1WoCr1vh2bdDVgxQgmdvO6TptqFhI85tz77VuYzBhY3paq0f7WleNH5mAU6lW42XmXCQlgZwKu4wh/f9LAx51NfNx4wWjNdHt2xscHbDWj2CqVouHv5/O3w/KNWpNmTNykesgbYXanuKH4haebHQezTK3+VOwYhkmU46bHBPBUxvj0GlMVhPCQdxhyGsCKY5ISzNGidONXhM01qxJBmHPVtaqvNl0nWMXw+573JWJt5aoTQjx1AYWGxESrzmlzCF9Mmrppp1JDT0QCJtbuAXDsyyJ27TJh7LJSJEVlg/M97oS4iGV6WgEnPJ7tCQMFoIIBwo+vpcpfl4BKGM/Q0vMfTGBkSUys+1GeyXJybAj/nbhTyclKBEh07+tv17gfsyRgPDeEnbinohIl+8vKqHkV11qD1FG08nNnoZmyDENzArQDE2DpEoUS0/1r9pCc/tbwuczht06QFC7ASfUf1QI=
+    SHARE_BASE_GIT_BRANCH: AgB6j20Q8xXHOnDwwQaIgwGb+1Exsq6ELcX9Caz0oFTGadyBjZF0+9+GCXf8hEh4ORtf1gv3Qtt33tkLsrZnrxtRQKwiCvZVZWpWlUMhPFCIzK6WpyKkvBz1TKcwHjvNXd1MxoHG7UHiHnQIBQekM4020dSmSkMXdLiK6yLqwn5Z/Tu6oqCmqffJtUv9rrxpk9uHXJKOLuCk3Jc+2mp0tbEOIAj4xkChiZw3MnpJ09w85VBWg9UvD427VGNQ7tHr1A6fgVLILylrmk+tyip8TPbnJBF9p8uHzHeZY1HhgzM89NdMYPkke3Q49F78Rz0+3oZPaYfnHxbb+7ejWjdgaBWnsBd92BIBh8GeewETTlt16iD/7iBcBkz08l1fJz4UNUh6I79odpvexkWDAAbmhscKvZB5ktEXbx+3gBMOmPs6vwVXzJtXkRSHObCCfBr4UYXaRkAY73fv55e3xJLRFaDowoKpZR/5B4QvXgHB6UKYToe+pbC7EaxPxfepKKZq9uKqDUU+LRYtfVgDbG9h7T1YPLPvUwxqe3ryv7XjY45uN/t2k2zmnWbwv4aGmjVrQL/1fRZbTrAcGdb+hqIvbevlyyY6eEJ7PHzwN/m3FVY37JJ2EO4nWp4MNNKj3KJ6XTKVqApOc4SsTufmiSQi5mKPCVM/Ud3tMu546iwH3P+2LViF89fu/GBdWZ4dFjqec+7w0AF5yEFL7dXY
+    SHARE_BASE_GIT_REPO: AgAs9HrVqlAIuhWZm80Sw31yTSkgYjOfZE8WT5nRU6cYGooGHZtlWB7/A0+G7fOFah8K79TZIXnH1kolJbfNV8Ff55ol8jvIf9UKCRbuc/LJkZ8cAj8sMYG2Jc0hosjZJQa++Y0+2/6/IdMxQH9Ytf5YCP73jaJSvckrMS54qezxA+R5hxNSKoxs3T/sN82yAy67bOTtKg7E/B3+z/rR3MGmBYy2XsIDzs47ag2Bu2ny9uARHmK6L9rjSJj2a9Lak3/NB+TJ/gCUEsV4UOFfMLORQbaE9KDTD29b5ejwn4/mp11bSCVfu2CT6bypH72HmjmcdJmzL1EhLPYAklEaE/kBOTe/3d8OaFL78oKok2CAuC/mVGdYpXvDdrCglwgY7scXqZKV1ZzBqMAGc4JRIpERHlyShGYx11RkfMRuDHl4pqjHii1khx6GjszNTJTozULeZp+D7zyrxll97GVl3LVvIPy6Ks69Qia+6dB176WsbjigblnJn47sLCev6YTKePzJPIWJ8clBrkY4mz00roEc2ruC7tVpFPhSABiX0teOSo8WjE+0zTZyqgrWP10/LLnTctzytAXfs11B4EJ4kb9fws/5pq/0AAVxmfovGKLT1x7nis2iEThhgud4+5cUjEMv8eV0nRAH7cbkCJbw0U4zCboiamdTrUTuirO/XEofzrEpgkqXns9rcOujiEo+QzplHiiFcAvNa2dfE8A8toQbhdlGwYFlu8XeXFx+DxN0gnn8l+o6Asd6w/9ddA==
+    SHARE_OVERLAYS_GIT_BRANCH: AgAnUqu+IVz5yFCqcf4wEFcc3nMU3XJXzyL7QMf9FmMfMZkLhWQIzCaHW+QuI3qesTL7GhMmGGE140n0+lZIzx/cxMpdg+ToahlpM6kqdqwMozN1Azm+RE93Ih7w6qFY/is73XqGloaeNUgZKMfb1kqGuxvAC7WhRBVoMDN123NMemEuYZl2b37yAVKMUtY+3Aqhp7Zf0WBCXdEW83VNxBT3nnNrtk6Yq7Z1/bGVM88EEss6BzDTT9WGZ8qPBpdPin6XOvWFK+ph+SjS9ODCI8WlzHHDyCtmQA4X3mul9HtVFWL20EIhQ7LRgmqY5fCoE1DtFOMUSoziD0MiYT8xLi7Pn3sZGUVtR2FFcKRGGyCgBXJ9JOJUDb6hveFYTSq436MuDuY0pi1Tig4G4ilNN5gT3ABxqw0lVCnHPN5Jcb6W6/HIe69zyzARv/4rLWrgu1IRpFbMEoLD5srgUvwgc1e3imqUbhiaS6jysOIOfYGUlPm//QEvK0G89Ji/eyIKFdC15MuD0mkyIp2gp6w2vvZ9A4bfAZ+UgqVzL/d7Q6lSHgZgbkv2ulqyiUFf8mFjfZUVmmRRaXy1ZnUGQENDnomxEmlkDyWerEjviwWX//kbRKq2Rczbg23q8wj+MT4x1dLYqYTy4ml/mLQ8swY944DHQkQnFC1MhVs//38D3I2XCMnKDhJMg02QU+XxHwLrZA9V80YLEMtYDJyN
+    SHARE_OVERLAYS_GIT_REPO: AgBCKAXTS7A9GCNuAuYD03PCjKocTcguGK/boIMNw9Fvthmt/Li7wS8sDcfTFJMPA53A01gfeKFFQi7CQLJBedImsAjEfzOUyPVJZ1QliDWk/XKuDHKmdH9m+WC/HSQm8qef8jhI4hY4/0U0IIC/fPBZOtZ3DtLoOFeDElzS178UyS1N2U0YaowMAhDkFpu8elqEkK4+P9I5fHmIHtlncfTyvcl+SS4EPOw+J5Bbq+MWgb4ruh8I/ZoYfcBUW5YeMpNjX8G9PJTYZgankfI7NnqP88NJhwK+MhT+jJcNZNqj2WE6DZTKlbALYDciWSLJZcEG5uSESQWHfg9zlC3OnQul7aTx4i5c7cASvC6o8vtmoHU2/H5QwVJ+nIn4jW1Jez+VitUBvn/DM7oLDT7JSM9wE+iC60StlRIeL4w/o+1hDztvjydXwmD8DWagystvtQTao7ph6YrUUNJrQ8LUhAZod54prCqkASib0I5p8FPmisBQRRscIcsXDV2nrOeTjQdueTr+zZm5lY/OstVPntmOr/p6vm/4uvtvhDrtWoy7RLhe7iBBVz4BTfn3M5cMXd55PlCTGt7xF5sQU1hS3w1b8An2lfW47jCVkRxLjt1ArsW+BC9xE3T4f8tX3+Hni93tYlpF9WawCW+59J9/KyZeuioAni4EUX7Jg3OYh3X4Q+/N9/qVODPtmLP2lEU/sKISUtvYJx2dRxlL3TbpXKMh4aqgYdmSwkR5H1EC1GO7copbwB2O+Zxwwm70Zg==
   template:
     metadata:
       creationTimestamp: null
diff --git a/coec/z2jh/fleet.yaml b/coec/z2jh/fleet.yaml
index 3c93a881e8f155f1b2e2770dcc75fd54cfbe856f..de615cb3157da3f9a56bf61a0053a94e1abc5c00 100644
--- a/coec/z2jh/fleet.yaml
+++ b/coec/z2jh/fleet.yaml
@@ -13,10 +13,6 @@ dependsOn:
       matchLabels:
         app: postgres-operator
         component: namespaces
-  - selector:
-      matchLabels:
-        app: postgres-operator
-        component: databases
 
 kustomize:
   dir: ./kustomize
@@ -26,11 +22,6 @@ helm:
   # chart: jupyterhub
   # version: 3.1.0
   chart: https://github.com/jupyterhub/helm-chart/raw/gh-pages/jupyterhub-3.3.8.tgz
-  values:
-    ingress:
-      # Set JupyterHub in maintenance:
-      #   Set enabled here to false, update ingress in maintenance/fleet.yaml
-      enabled: true
   valuesFiles:
     - ../../base-values/extraConfig.yaml
     - ../../base-values/image.yaml
@@ -49,8 +40,16 @@ targetCustomizations:
     clusterSelector:
       matchLabels:
         stage: production
+        maintenance: "false"
+    helm:
+      valuesFiles:
+        - ../../base-values/image_prod.yaml
+  - name: production
+    clusterSelector:
+      matchLabels:
+        stage: production
+        maintenance: "true"
     helm:
       valuesFiles:
-        - ../../base-values/image_fixed.yaml
-    kustomize:
-      dir: ./kustomize
\ No newline at end of file
+        - ../../base-values/image_prod.yaml
+        - ../../base-values/maintenance.yaml
\ No newline at end of file
diff --git a/coeraise/custom/fleet.yaml b/coeraise/custom/fleet.yaml
index eeb90d36cfef1ac1fb0481b6f4e9eaa28ad6d812..9a7bda4cf5a506665546ed04c16a92ba26f7b95b 100644
--- a/coeraise/custom/fleet.yaml
+++ b/coeraise/custom/fleet.yaml
@@ -14,7 +14,7 @@ helm:
   releaseName: coeraise-custom
   repo: https://kaas.pages.jsc.fz-juelich.de/helm-charts
   chart: jupyter-hub-customizations
-  version: 0.15.38
+  version: 0.16.19
   values:
     fullnameOverride: coeraise-custom
     global:
@@ -50,7 +50,7 @@ targetCustomizations:
     clusterSelector:
       matchLabels:
         stage: production
-        prep: "false"
+        maintenance: "false"
     helm:
       values:
         global:
@@ -69,16 +69,16 @@ targetCustomizations:
     clusterSelector:
       matchLabels:
         stage: production
-        prep: "true"
+        maintenance: "true"
     helm:
       values:
         ingress:
           certmanager: false
         global:
-          hostname: zam12185.zam.kfa-juelich.de
+          hostname: zam12154.zam.kfa-juelich.de
           # hostname: jupyter.coe-raise.eu
           baseUrl: /coeraise/
           loggerName: CoeRaise
-          tlssecretname: zam12185
+          tlssecretname: zam12154
         nfs:
           path: /nfs/hubs/rke2/production/coeraise
\ No newline at end of file
diff --git a/coeraise/specific-secrets/overlays/production/frontend-git.yaml b/coeraise/specific-secrets/overlays/production/frontend-git.yaml
index cedf6759357ee1e1c169475d796722d992be88fa..ccbd140315cf8879ca7d567e050bb45772951cb1 100644
--- a/coeraise/specific-secrets/overlays/production/frontend-git.yaml
+++ b/coeraise/specific-secrets/overlays/production/frontend-git.yaml
@@ -7,14 +7,12 @@ metadata:
   namespace: coeraise
 spec:
   encryptedData:
-    SHARE_BASE_GIT_BRANCH: AgAJUsXXoQAISLf5Ne4WKhCilVATCm/eEEedqTxiKJl+pVSgj5s2jf8FBItzsrKWXOQFRuQN4UDpn7hDqUYi7Q5SA/64OBFMVaRnNd+MRvdkieHtoZw1Vr1rsb22cmZ2tyn3OoVqbH0xor7Xqoe7g7a9fTNr41ydXFfezdiyjGMjwHVqjiBU0NtdP9sok8DtuBU5dDbJOiQoX/BsWUrZ7FifFlM0RN017nuv0Jl0+TomYPCy0AWF9zsXe6pqdYvokaoaAJ96BJ8/SmcPEkXEaldHcXpM6AbNU29ey+ZUJlTWVC0YPxj60MVc8Wr4zfsdLX2ZHw39n/eh26FD03azmcVk4AkgNl2VVZjifvC7er1FkXj8YlHblRqw/fSaxwn0dZrQW4Lp5rnATuD1QvvfcpTGIzMuGUKlVKlJFAAqyR/wI/TzlYAgmvjo+3Ueue0HnwVfjmzRBp5FOXinV/eiqa+n7/QCZZ/RKEP7WEDW0YE3oPRrYp2o0EsDUYpZ0jYGcKnzVarPFZQTBjY87NEs3jW5U0QmgyyQeShjBa2qSl3m1z3b1oSMkDvTZZ+BCPP3I4u5p8/nE6FIa6Ifb8yQrIW/rpmvl2PAZxLBzPmoFMOeGWYS7c1zLa3MifVDX4fIhe3Ubq8Lkq2FOrvjH4jTcxPmsKOlZl76fj6cq4DYpX8jUCywEn1CDYhvU5R4p/+biFhJD0IlfDrhw6V9irtw/03Ix1pMBF4nm2ZMg0eVu1icfw==
-    SHARE_BASE_GIT_PASSWORD: AgBjvfZUBZs6852xOK4Ah/zmZrpu8itsjnXOJ8y3oUgGrtxKXHPAkz1J+Rt9LiKD3Syd+LEq6slt2bSw+NSFsIiudc+tUzgi7mJSyaY9d+12kC1nycT6AG3yuKT6oTE/Zepr+EsuxCyHawbVlk48w9eDXAR/oZFFr4ree5fE/oMpPHAbkob21b1/gLOX1ozVhBmpLZszK1sBnLqmjJFOgDCSKN5sFfEmiM/q9O+CzR7cyQYfzOYG3WnHQq/SNQ2G5zduQA3hc/jIfq593Ux5j/Neq7Thb98SkosqFzMqOdTwYBM4+242RzP6GDyDUttD1gVaHQMuSvsi/ToviUv0ud5m/LsyWe2qo9JyLglGhHzMx9UFaMeQgjL71/WA9VnLP+QRNCkC8erYEtOk2QUJgP9uGg5eCmJ0rPJK5m8GqbkDX3uVrbIlHTVLjD6v+ae/RoEiWUbkhE2Sz+CxJCxQ1SngHycKkXYI32LtjnnfK3SxL0JG2Dw0jgurwL+TGVgl8QkcXstZDXJGpQYoqIAGzGcyg7QID9fcHikWzSCns6Q1kAIk9hBNC4ipUJ3mzHHPnHz349gcisOUVxeocHxnEWn01XYFczSO0+eIY4j+9CqxetRJ0w4sTBIYn22QUoNGGEf9qG+n7jRS3fYq5sHHmBA0Tn9aqn9siSkBM0h+BLnyiWzGeS/7lMoPh3NiKMzUha0/6g2Jmi2O/PosqAvR+aA1+3aA2A==
-    SHARE_BASE_GIT_REPO: AgAeklMgekeeP1S4dPNE1CtpiWxH1h+W2zowl1ZEPiNIjqf2HZ6lvwQHYQylLZfPLd6xob+m/2Nyx4iYHYAVecVP7vULQZUyXfE2XJrhl8t2GbRodiLZuIS6kLxUvxlSaeWBsTgHsA/h57bjVhyxLUYLGGF4ykJR6zn8DdoPuqcVRe6aJZMaH23Nk2TdN0EULIotlFgFPenGitU1JYkN+RnsFOePhxbeCR0SeNQgNCbw/xFss9tUFCGovlhqSUrTA0Qb68l1vUvqUdw2YXYliTtcbkPNmMo9LOSJj0H8d+yHKFHbaX/z+Ld2W68KT+1uC9maLMIhkczcDZrI8xRH1S41+MYha7itv19NbHL8QBSdPjXq2p1+zniuAGbLZTvgXC1xYK0d+h1l2F7DhUfBIfltaka1kzMRaB0gbhRfH3h7FDuXlcFLT7SipprbBz/TLhHvRpKqoILojeNrGh/kDGABNlfKr0+BOnmVvHshZBVYqByZ4TvAXlztf3gD9VwBGrNn03ZMFZrQrHg2OH/VuBnTh+khm5ARuHyso5IAuxXn5P6BBThrNtwBIDsjwelYj49ektdUgP1ft3P3goaro8PMCi0WkDb2Z7/0X1gn4LjIbfC7FOp7/VLeOXKGuUoA5ZQkICF4v7t3K0AFK+mRRbqVdJGc3cyNCr2oYBBoH+oiIT8q2wk0jt/DUmsFHpYZRKlcV/49Ml+IWVub6sXaTi5COVVNITbzHoUHWG7VI3vWc/Mqh/uhwcglxaa9hekCiuN7C7dptezUDIwx
-    SHARE_BASE_GIT_USERNAME: AgCdT4h/ZW/Adej2qKFTvZB3eYNyA5BjKgOfYNJ+BK+dP3f4Eo2ZiBY+fo/tFwlRr9E/e77dGqcltp/H7+fEEhhmHliBKfosYeA4U0GJHMKu4jnYKM+7RKXgc1b5iDDbbJtwN0x6M17cze77N3fIkvLpFMqsVmxD87RoXDsV6aGONcOcd1ORRs+FCqKqcN8GRncxxP4pBVJy/0KgSNECRu3IBLqlNfKys2Iq6OaBEzqXLIyiqVAuM065menxoLjPXpLfNiDro+OzFXdB1IE7zIAPBjd+CDcNVRzsS/pyjC7uSo5lC6SZGa1qbU0w1AFBsm3IUCGCODT0RwxlBxedMG6dIHHyfL/nzB04fdMdSfSXJCVkhHHhcAQlPXYAODfweLq9vivnEFTX7oFAvZ0l7EgdltZoBe1J75K0BtAc75Wn6IvcLyBJqy7hOdbV2yky4/luY6OXdeku5UXvHsXgLHSPxQD2DUeJLXYlzQs4lKJtEg19Wop4Afs5WtNXXqU3h4/p6BlLv6zi2v2quG5eKu3UFJSMJ28j72wsP2O2w317xGl3QnG7FWwh+PI0oEcvD5NLelBIm8GS43aX9FLv7sXAhPbnop13bItWrrbZ31S+ZccH0eU0m2mAFj+Tp6IbmG/suCI6NksJkKqNK1vmVLssJNQKQfEKtP6Ge1N0Pk8sTwInY0t+ZYbjfEE1rPWpG7c9lPFNZr4dc/SY1akdM0tAbMg=
-    SHARE_OVERLAYS_GIT_BRANCH: AgCXZ70Xqophg1QKDq8eMJFm8oLCwzM3rHnamUgVB+3igOoNwVBt5EtsfyL47wiMOI/r3pipa9cuWJ+8eeqgoa4lfp2v24h0QEvCAC6hZLSZvnVM+7mDqHS83leBR3HMEgaAOg/eP2jMH8FgEFYC0j2fx4/r5T4iB9uQ0hE8ByoYiOn8jAK1GvONcWU0Ixee6mtR479iwIYQPJ1LzBzwYgBBxelVgPkq4yawe55TBWA/7xLxN6M7HqsC0aUbXmE+HXS5ukVV4hsudXqHUkh/m29XXkHr5UVLQAbzLTG8drRS1Lxf+d1w8VlbVn6bUh/Hw/AeZo/OttKblLJwSqTBUH0ZL36tX85sjkq1izApPKLnaxo54QPLPL3uwyOSGzuXLcIrUHzmFezorv+84aSiGTSuOZ/HW4npl3gALAc51vLxqWhU6Ia9PclIKyI8p+qa1GMxXIq/8c/NzZN+ecvqckCeMpHvWI3TbOfZ0TqlGXH7nbbglvB+cfZ+wzzUZz3GqXr6nXomMrPo39ISYWb/Yn0nFlWafCfwpLypAPEmHC7GI/mnGaImMK6OwsZvNxXzWaeDcsUL6QtWOxd+MV824OTdLDEFEZ4uODswYuh4Fqv+1DF0hcwC4sXvKkszEGm91RZMgon0gJ3lJnsjH25oIOab90o8H3oLWn+6k0qWgyXIsc0/niAcWo2nI1MB+XWOd5tVstQ89Tq3cYzP
-    SHARE_OVERLAYS_GIT_PASSWORD: AgB2dOYgevqd+7+Ytr/Wj5UgfZbejfILXjr3dNwm38IGToDwYQQ4ppSF4lm8HznDbLAYozfF2lkXszXcy6s4nS73lqec22hi3Ds6mBDUV3rvtOuNXZW8Nyu5k9m7KfW46Ow7ZXVyy3tTj53kuU6Lkh59Zn3dW/X0Fk+D5nB1pUrRQGMN0wo0a2KTl1coGdmKy8dZNlWrfzJ5jRaIQQA/ETz+5zCYqSuVQgBRG21Cmz2PDQjXS0U+FWrmlP2/O3NfHipNZ/vbghTU33RzK17yspc/C5PPACGaQG3EOzMUHus0efHqCzVrK4sZubEYH4d1M/ZvFqLzxv5AQIUUUa4DC0OvQxVxGww+OJI3ER0X0BKa1WVBSKYBmQuPIQYW5FLJDtHmFM7RuzmqFWAMb+SxEZHcXcunZEMXp2uL2hkTzjqQ/+cLDFP3hWPVSuhqc1uGezdebwCvY1uC1IPaD3/FHAY4r6AH27V0Lb/cPFVAoiOXfWX/I21eje1Xlhogug1rV6kaXF0yjG7gadqAu6x7iDKD3WjGeVz3dRAUJcogvyKsCk6O7mFmZf0HRRBNZ00y7ceiT6Bitz15hnehEmmp6y7i8j7AO5FGFoOc2vCA5G68z+zy86B9KxahKHFAtx2MXxW79zbN70Ul78jBt91RsQqkNZ3S2zxFK2aEja15JveBWAw+A40wpMPZML0UyL6VmO9xnMgA5PzrbMdkmeOn9XXBl5SjL16SDZ0AwRRMAkwLpcvGaVs3MOFX
-    SHARE_OVERLAYS_GIT_REPO: AgCCuZmSuKKF71s549g9UdRruSijR3pHpCt6yz9Cuptcg2wpGKHWlCT+C1mk1ydS+LYiuPv1o4HVvuYB0DKMSYYfE2Owzyj0JId6jc1yNHp/WpqJI5+rLHzs5aUIhFJWROyGp6QOXcHHWhKO3ff4v+6OHBFnyG2YWj3Y2/6J33BJ05/Meex433Iu1oE2GIzgmTE7PHZbj9vvjRfG6sEWS3a+DHmhs+BEUbRIOiDufCUosdBiBOlwvgrXo20nKbKq1IdLjenfhldQ4LmKATzkPCTq6m5hO/k1+RwKcPXv/gHqGjJG/2JbLvscAOr94hJ4+26OpQeGPqiDwbg4TIpraEKfe9Fgj5J7FIQLkPqj6zUC1YpItmRr3FooDurSHupfEusnxxs5sXVOK+rnpmxDpvMM5VC0SgyS07WLp/F0CuoV2x+DsUCxoY1WEmLDZUYf2qn50IlkfmYDTCULFWuUolyfK1UodqALkME1RrWSoqS+/WkWdFQA5t3fLYg+6HedxhjV3NE+Y6BTJdPr77dJ39OWgXklb6TGkItllV8PWgXbkQ7ei9G49qmVhL7yaaPAtrJR0rGS37Ffx9JqsfEloSC61TRM3QP3WxNUtsvKnhGTkRNJT2ZP+4yJv/Shr1hPSVIwblj0WDIiH5Py/Lh6hXphSoJdEEPr99Nk/SgOBSP3ngWrAbgVOp1FsYdZfC3vnzYCQcBYq6B14InJ5WaCblgtG/CI6i6vW6oRtFZFZ+IUggd/doT7CUY12re8tpiXcvQ=
-    SHARE_OVERLAYS_GIT_USERNAME: AgBOAgkuDHOoRyismbD1jWEJ/SuE10UCHPTSYGzi0C5LrtsRINZ0NZkQkxtsGl44jNkKlEKNraQKZcnnxozxeHDEiW37zST4uuZuh9G5WV6klHjEXdYM5OwSQw3lP/oNXbKpg7q/p7TdZ3OciCm6gOiTLEhKtJyV5o+J0vTN5wR97Vrr4U1N9iP/58WY2++Oh2OG1Ht5WNGfGqhutAmhxzXh5UQdLgjYNiyPH8MwMMoO0k7CYuh6p5Kn0nL5YyXO+yYrbkxsh8YfD7RTLWA68Q4c2rnSLpMFm4GTzB2Gq9/j5NY5OrgZliZomK1/Df3zvZj2eT32Rlp9iP9HW+TnXuKTZxpUKCotfnyy6ETMWN6nkHRmCCyd1mnkRMSWWex8CSysqM8JiUpeLoOWosAHdmPy4Ll7X53aIZBPVpwmIZst1nI5Wwy8MEXCNKK8Z1KM0d+1l6ximB+Ns3qv3zhbNo8KX93KtIG5/b0ndYQbIVdWdemGlIpqZIVaw2b0Dhk5uk4eVqCV3o2LApaf+PvlH9hyAgIRVIrhNUIeQzfIqZemTI5V9r7UKlYGk4Rk2/mTj60ZnfYR21HtK/KABWY6aL6LwMCercf1u/KxBn9h6puSRg24EL+xIy2dGV2k3etPgCEDJhZZOzV//oTT3qr2BHF8Uib/FIP6ErzMBIsLIus0IF9Z0d7ONT0hlfHmICtpjkAZTnzkN30fTA==
+    SHARE_BASE_GIT_BRANCH: AgCaQ39Izcc5ivlSQX6wiKrYbDdy7F3ie+8m2vgWlrMewjU1Om6FkQTTexS6M7zd30QcgTYRXJFG4VzPZ0XjW2sYNFIMj+vmJ1g5C8DP4RoxCy5XX96dFYUgJufW3kvz+XABB019xAuWKeCwyYEqRSutrUNtfpTk2xuJWol4FIBa8R8nnsSdRGtkJE8exn0TIkMJXouS0Cx9dFlq6RqJTwdzP4DJ+qLkZMkuQwxo+82X6OexZdyu43CxjIjzxrzAcMS9PU4ewL79HtCon2hHCB06ys3MOyYJluIEEOXGHfRjYkix4iJ2uT+M9QVczegvhjN9+EMFGD0TYrcceDkvm4ka/kgWiimW6hOxcNDn/BOWEyWBuzB4P6j68DZfzrwnZtJM//FLs2oFRSTSaxs6xFM1/gNvrdUL2GgnK+4eeovdCzWVLRlloGlbJY2fC39AIexfkfXa1WvGoRXXdNCdTqOKGOxrO5snBi2ygM09S+My0+1nahUrab0xSUoByvOSdfeOBSLauygdI4EhpbeAeUEzroWejpRl7PrgOrh7FFYVUmJsMsQyyeSsV8mGDvBTnIIzRASDdSZp9Pis0JKe9LyRek5V2++xU4iZ4io1f1cnhxO8vMC2HZMn2hhSrkCz7NqHnFCTuyBC0pWZrC2rwzVXGtH5ozRJOokJby0zD8lBvdxobsvy9UeZfO8XbaaUKq0bXOyvwC96orak
+    SHARE_BASE_GIT_REPO: AgAv3EB/gfRl/p3NaTcjD/hDbD8V7OVYv/yq3sCLK/dxTycniSLfbXMPxQWDHHtcqHkmfpf6uy3/btxI1U0V3umW/IpZ9XEeucF6RcC4wftAyazO1s+nwrWDio1UqUjMxdvvQYrXR6MleGGiCCElBDO/OxCEmAIHW87kGjHkgpfnUs1s8C1AHJWj203qAatzNKJlzr1ZEd+CR88dsIXrAMbxErgre0tgXg9m2cob+XNMI26NSg4LoMDgVTJhtBv8kae9O37VT3b19xkA840BQ5yJDNVJhLR2j/24F5nLeP54Be9AXr37E/jGf5KQL4lKvJoduM+p+NwX4Sp5O52SoeRgJrS/2n/c7GtOY2ncYbJ7AB2OUePt7Uure5XA4OlEklrQvCpjU3vcjUlH3Z/VkTRpFCmZuvwxlSWhNj9RTIbqGZAOSamUPMfQmNzdV/Qwe2q1suPAJxyUG7i7XKS25naI3ubMNnIN6Z+BP8qjncXcZ/7QSFUtc/AwysRN9Nmc1e8ulqExzIn4woPcdHPh7WAcbymEJSRAxosDoqWb+FECw3FqWYrNGLaYoQnzhZB+ppye89/F5zi9cywr74ximPyzOjUt3CQ488F59AxJy8MHJjX4bk9reXXF2U4nOTG5XDqG2uEcjvWB/TZ1BpqoMF5AEncFEkkdpe3gY8ySmsVPfuOm1EATHgaBYIuQMcAoDiTWcxJWtA3LArQvGMaZKTwSsACz+ZEx2DdFCeDAJt9FBGOIVcEDBayIhl9hmA==
+    SHARE_OVERLAYS_GIT_BRANCH: AgBeoJke21sbKeCCJ7nfzI3d9L4WZeyF5XRIYpU/24y9Q/uewKSeVkIOEp9wIx8R/F0v72JDhDFAoB6WnVPFCn3jXYLoz9m3TB5lbD96Jj9HSxTqOqEJVaBjzRkvZh7J+kqZSDJj5D0HTRTUExJb6N8ns8o7WIvujC7/lzgQ/N/575ckdlnurSFHnVW8F2/jc1puteuAM/XdRb12LRV4Pc5nDg+nj3oQtCiEXDGOOJcmaVWawB6W5897KU92GByyYjuM6qTK+r/Q5h7WdkOxRZkwDKqAQSfuKYVjg1UupELZ0xPRnv2iyosm+4CON9JZ0yFkUNkNXFnqe8tATP0K1qn6m105nOQSOCzeMKtgMmW2QULx/7Q0IO2SlF4I10YhI7u1Apdd0sSXu5vTYmvD41XzsRjjXHTncPrvunEiLedi14tsSGcwaxIFscnN+427HQISpfDe1n1NDVlO9/UqCY4yvqzWWA4UvKILXkfnm/sKF2ovUsJtfnVGaK80YABFNAr1S1OuJwToym6U+uCsct8i/9uWbkyWPS9cdEXFvKS9Rm6pL1/P6hNEto6ceKTEfbWY47Ki1VJSxOjKXq70eUoTbg3GVu4NMcD/Y5LWY5tUDA3A2QHq579zU2uWJlo3XpSBZ0i71S8Q4xs2JEI8BRK2oS5YNQN9RaYmoyBVmrk5930lrqWB8S6xzwNCpiur79GynLveRzyjNoAw
+    SHARE_OVERLAYS_GIT_PASSWORD: AgAWi1MIFEqPQ2upet1naH6npIIY4o3L/46xOLvtRHvXEzmejNXdI5tMFAY882s76laUpJ4gO8+HRy+Qx8+LBBmQoWKNJCZGnzI0x69f2X4hoiVtJBUSf9Ckj6v2Y8aCA4jq4ApGcEX6wHhH0xyMfROdRBHSCzjV4hC3u1oTKTLOUDp9IVY54VJVlKJQd6NsIohW4ls/sYhvizgsCXxsFQXbBK3A5Fg8wHBWMoq87CXzjye+NbN56iZGf5Z1MOZzd5quQG198L3IdsA+nP0turKw2Y8J7FG3Gpf9107u2VP1UHnmoAug2g2iQYpgBm+ZM4RP4d4VqUEqGw23xpPaqDoEUlKA2FuxhnVNuU8C6QbGcwkvEA/pX9f6sYZ5P9YPzKe+dmFu5biR61dhM4XXjJUPLD6lvBDjnXYoq9783SC1oQRC0JY6Kc5C8yoYu2kCjOhA+cX6du56YO/HuE4kXr8VqaonezB8tSdA1rmoraPAXP2N+LZSDCZr+yzh4wDq5EuzUdp1Wf1RB+t+OiAhVfpfzyS9t4Zv6IItgoxo4hBPS88DIXjqsMNZRTMX+h2OlWK1AuGXKab81onIi3rd9/V/bIjPRZ4TPi/IT/VH7ysMyLE1E1/YoH3T0cI82itZNmcr41kvIII9mAwESxDD8oUOT7hOo7leV8fOaN6wvARk8bllxedA2o/gBtkDC7/lRFOQRdR3i2DKYFd0wZCVkxwVFpo+7mV32QV6NtTuyl0eIH0VIT+MC89S
+    SHARE_OVERLAYS_GIT_REPO: AgAk4iC8kZJ0IHd8hW8mtBeAKZVJ3ta3pvgpMyRrzf/GOZiUtOInOTkdb84zG8j30dX7lLntuUrLqdzXmZ62kPqBLuHnIt5u744niR0ChqcOTpBiIr1wzqQmYf0bvdl3IveGQn/o6QnHF8ZikYWXRj79OrULWaO2e7uAc9FmvhjV2fMMUppUpRx+myKSKDat2xA9iow2iYRboV7cpij0V6PE0qm5qFiTVn10uPYjFwTwT4VrTLqM5+7vgh+TSAPnCYd0RnCRqFYCQrUV6rO0lUL0Fjg/56m+MWl0qJUJ3mLYMNmCxxWcHkKX95btyGO7XC9jvwgM1J+uUuVFAo8jFmKYepzVne2LqmIKm3aKpalosDrYvRNDxCUn8bsiPMP5zlA9l8cO0OvPF+03yK04eHrHlSVnUNfSO9lcYDBllhbPDwPq/KeAZgsZESx/r8jHoBU9MP6UqsljKAkwUpjCQ6reYXrImQNbAVRBXOepQfGrW2VQ3wKvGLozQMAnlw2C5OmVjFqCk6DyfteZnLPSpbG/mCjJI+nIAVNaAgvSli4U7lmJHo8RviItZpg3Fo/yH2TPWRyrUjNKCpvw5qN0fJNojpc405w5kK8fcONTtKlbpIUjHBD5zQs3+GhrcaZEhB0k+9K6vvwuPnPaP32+icfFhD5ICdRkpvdjgp5/Vw+FKy82szGzxXJ2JQ6zeFazqwkiV8Jj0h1ZVY28jCJ3P78gJUXJYezN32ywZPDm5iZ8czRTX1IUSeUr1BzHtUr2+u4=
+    SHARE_OVERLAYS_GIT_USERNAME: AgCed35rcUQIkAHanvKPm9KZ5zgFpYAbElntysyK39IAGjMUpFkbC3oPpN50kqHkBK32UYklbmSdi0R0H/zNJiiH/NtI4LuIvesVEs616R1qNWeTRIKgSjPz70v7f81OZzx0Tk/2UcDvCX7kM8oDhHfhjsKM2dJNrHnGQ+tzghi+EzdPh4PoStVrTace4XpXIi1eBvYCDP/LzUvN8wOok+BKQSm2jzt+fa2RvDjad57kxSmWTQb6pfucLPpL+l6v39BVUPtuovhvTcCoFW5EOD0QEvKDaPnVtqgyraVEeP226FVhw4msdisALJeoEx/TsSYs8WWPqtycc+BDnBUfnMV3Q21an4tmOvQXV9HDpz4YWhvrHaSbx7Jf+DR/6cF2kOqYKGLJHW91I/lb9B5KY7XxTx5W3CzF9wPgozfI40eezq2yDGTATEp41wkzaQmUE7qogULUedFC1NhqlH9D/veBnbijsOkQO2FmvHM7V1046/I0/8/xLRDBK2+13DOGTN4s7BVNhEyoTNTN8dVXuNUbfMRNzTkv977AAkYS85Nhuuhotbbgz/TbgYNryfxKdmUDAXELId3Xnnojaa2quJK6Bf4ADlw1jVDTQeOPWBEkMWvn9NpGk6dVHKcPeW2itoRKm1fsH4rWEYfCgoXklhQrNevGhlqzU54Z3HStbneTeav7Rz1k69AeKFZcov4ynNibqNQVoF0hmA==
   template:
     metadata:
       creationTimestamp: null
diff --git a/coeraise/z2jh/fleet.yaml b/coeraise/z2jh/fleet.yaml
index cd6e11dcdf16538c283afc393fc3aad5d102e298..cd492b8edadf75bdcacb4e68d9b11ca451f74041 100644
--- a/coeraise/z2jh/fleet.yaml
+++ b/coeraise/z2jh/fleet.yaml
@@ -13,10 +13,6 @@ dependsOn:
       matchLabels:
         app: postgres-operator
         component: namespaces
-  - selector:
-      matchLabels:
-        app: postgres-operator
-        component: databases
 
 kustomize:
   dir: ./kustomize
@@ -49,8 +45,16 @@ targetCustomizations:
     clusterSelector:
       matchLabels:
         stage: production
+        maintenance: "false"
+    helm:
+      valuesFiles:
+        - ../../base-values/image_prod.yaml
+  - name: production
+    clusterSelector:
+      matchLabels:
+        stage: production
+        maintenance: "true"
     helm:
       valuesFiles:
-        - ../../base-values/image_fixed.yaml
-    kustomize:
-      dir: ./kustomize
+        - ../../base-values/image_prod.yaml
+        - ../../base-values/maintenance.yaml
\ No newline at end of file
diff --git a/dev1/z2jh/fleet.yaml b/dev1/z2jh/fleet.yaml
index 355e507afc70d7d163ef98999e6180a86e868c94..e8b3deff707cad76837c62d110da7a96d4966e01 100644
--- a/dev1/z2jh/fleet.yaml
+++ b/dev1/z2jh/fleet.yaml
@@ -13,10 +13,6 @@ dependsOn:
       matchLabels:
         app: postgres-operator
         component: namespaces
-  - selector:
-      matchLabels:
-        app: postgres-operator
-        component: databases
 
 kustomize:
   dir: ./kustomize
@@ -51,7 +47,6 @@ helm:
   valuesFiles:
     - ../../base-values/extraConfig.yaml
     - ../../base-values/image.yaml
-    # - ../../base-values/resources_default.yaml
   valuesFrom:
     - configMapKeyRef:
         name: values
diff --git a/dev2/z2jh/fleet.yaml b/dev2/z2jh/fleet.yaml
index 80bdeb75a5f863f438ecf8e3e08e8e619a28f159..69e96d986ff9c8c65be7370c148d5a7fefdb542a 100644
--- a/dev2/z2jh/fleet.yaml
+++ b/dev2/z2jh/fleet.yaml
@@ -13,10 +13,6 @@ dependsOn:
       matchLabels:
         app: postgres-operator
         component: namespaces
-  - selector:
-      matchLabels:
-        app: postgres-operator
-        component: databases
 
 kustomize:
   dir: ./kustomize
diff --git a/euroccgcs/custom/fleet.yaml b/euroccgcs/custom/fleet.yaml
index 9a9cc546cd7b1eb50464b314d794f0857f277ee8..583bfef605920e13a590bc1145500d555d794235 100644
--- a/euroccgcs/custom/fleet.yaml
+++ b/euroccgcs/custom/fleet.yaml
@@ -14,7 +14,7 @@ helm:
   releaseName: euroccgcs-custom
   repo: https://kaas.pages.jsc.fz-juelich.de/helm-charts
   chart: jupyter-hub-customizations
-  version: 0.15.38
+  version: 0.16.19
   values:
     fullnameOverride: euroccgcs-custom
     global:
@@ -55,7 +55,7 @@ targetCustomizations:
     clusterSelector:
       matchLabels:
         stage: production
-        prep: "false"
+        maintenance: "false"
     helm:
       values:
         global:
@@ -69,16 +69,16 @@ targetCustomizations:
     clusterSelector:
       matchLabels:
         stage: production
-        prep: "true"
+        maintenance: "true"
     helm:
       values:
         ingress:
           certmanager: false
         global:
-          hostname: zam12185.zam.kfa-juelich.de
+          hostname: zam12154.zam.kfa-juelich.de
           # hostname: jupyter.eurocc-gcs.de
           baseUrl: /euroccgcs/
           loggerName: EuroCCGCS
-          tlssecretname: zam12185
+          tlssecretname: zam12154
         nfs:
           path: /nfs/hubs/rke2/production/euroccgcs
\ No newline at end of file
diff --git a/euroccgcs/specific-secrets/overlays/production/frontend-git.yaml b/euroccgcs/specific-secrets/overlays/production/frontend-git.yaml
index 20589bbc4c2160159375a622b0bfc1d5b40d7e15..75eb1a02901a01c1692b68e63c125d34914e8d23 100644
--- a/euroccgcs/specific-secrets/overlays/production/frontend-git.yaml
+++ b/euroccgcs/specific-secrets/overlays/production/frontend-git.yaml
@@ -7,14 +7,10 @@ metadata:
   namespace: euroccgcs
 spec:
   encryptedData:
-    SHARE_BASE_GIT_BRANCH: AgAFZZ7Pv0Qu5/bcOgUTr023GAn5qMnQUNKOZA3Eecv+Pb9GKukWWoe084eQBJkhnDE31tV8okYlPL+9Qld4w8tPgjq8a+ifKqa8igMnuEC6edLN6ieQJ4g+ENPTG89D5Jx9cf0V10I3LkwjeiC/289k9DSlkezxvKl5OQAm/su680KyP1auoc+OufCFhCDJzc90gyD6VEPTTwmB9botknu35OBoDjvgQqp5naDoOULpfu44jrqjyMYd6DuwtvXEZdNtMFpsHkTmGWX8nktPYGfrbUF/7LaOMCOgChARtFXD5co3eqdzphbh0s3JO1cRemwEmnRj+TE+d5agb/6CMEkB8R0abJUuKB5PB+uJeF2Qkwfy77uiKpIxRoORdTPY+w9u2zufN5GpUR3iLad1vsxXC7p0S8kZDz7iUVQb7N5lEw/D6rtwTprtfaVeZj4uuMEEU3q8FKKdVBVgISOyCXtt5tAzWRyiRH+hvdftSfIW1bh2F0JMTmTamEK8J8Q+QwDOsizX5jdxVN1aQAl9+nDvacUkAIsJ5n97CP9AmmlhEFHhN/OpxaqqSY9UFJG0Sq/eRy205WOJvy0MmW5nLt4yAUpLn0LpiktmxAXs5sFA+59sKCtc9xokYktpYCpwGYb4J+EB+fz8oZ2P6cUobUvRL+Fq62mbU8Vqb+NM0w+GqVECWWkAiRyBtFI4ufCxqhGycoiqrACoLSgRETiaHGTWKbD72eO445/02RxCdeczPw==
-    SHARE_BASE_GIT_PASSWORD: AgAVZpjigLXzg6qonGFwBXR3JAyx4Q2IFmSEgxriO6C7cBuuso2Ij4STZEjdrWO38u7eJDx2ihlCRF/4prSjVrsUyN/pF0+uQQK1yKqxekztTrW/viLBHLM/323RI/VI6oSfRzOcAyjoXNKORIJJyQXkyUv0gbakYzXIEhG5etNC7HnkDFo9IkDN/o+/lXcJ+npPcNTbW8/SvGaP4oW5+x+tJ6islTMxMGbnQ96PtWtvDmpcvldgwTgReW1UfS9b2DfgBpTAyUj5VZMOXlDB+Orw6z+CrnNn4qoXMsDXRq+46N0mScg10YDsDwLUh1T7Iw7r4WK1IhTDussi+Ts6RmVGcPWglZSmA6C/dnkEmP+7dpem460sQgV/yU6AluD8qAeAHNPCujSmUdYKdT0cbg0ZmdmIilwCYDcK6lIguS3CCLeWljSPhS3oN+8OJ/b6trjmUjcXj7RcogPfMsnBMrZbGSB2SQrotOY8r3KgjG+wYIctxfro1qKjUzrvIpkYYcQdTHmc8MFgcCtrVhyiSm0VkyYNor6kXZ/p1hV4ld45DGySttQwfulzP1RmZXpT/6VTi/vfzigrlhp8hriIvqtwq5FvYu+KNVRD308Oz0RmIFFynOL2dLJaIR5Bs+RTI0juEC19jtNVnd3wYCq2ZaU4tOc7IimYVKwAycbasuE08nesNAEwrj3sLTctnz+bOx3qzqiPEfKC6jMFJ6cCPWGxy6ZvtQ==
-    SHARE_BASE_GIT_REPO: AgAlEvGM1GvjTUucE8i2UzA8qu3Qd/hm4w+FIlYCWzQsOM9aEjRiLZLD5IGrDh8scapb15SoZ2Kt7eqRN/PhGuW28Ag40xJLKYqCHRlcnZeRzuQPYqVWRdCCv6NW+rUAHFPSaORHPLjPHUMAvkW5/I54RVK9swNorTOwGJGv3zz/Vvfk3OvCW0PVMG29H0cVs1gyhwg9zD6HkR+zDYgbRYvhdADF+s9jbw8GUX9UT+I4mB53bpZq/m+v5uRHqsmjz9vBErofb5BRcTXbtqPhi8S/OOFrlvYjsW33kG0iyonbsUNsb91SnxolfSPn7PQUU1JVBmI/7RQfYUUGIyGjGgaiVuBtnZu3CatyI8gDW69QufoE9Y5/XXLbkJCauZlEbUMwparceSA3LLIIByO/EnlgMN4CS/zWbSdaHJH4Z4MKpB62YL29WXRaZa8Mv1dupACqUkGvISVN1Crepk6s+jljf33OyD9cl3NXXpdEAoJWu6YXN4rs8GyVZBDzrt/0OqpSjHS9AimhwjUWw2xXT8V5tlHe+DTISCK7VrelUk7BfeyHB1dIHxHSgVYOow0ViwM1tAeYBtAO2AOCaGLbRyDOcjtByIJ3+B5u40+eR9LqIb3L4TrzPL9NHxw50fMqoujZGCvLsyMDl7Nc7NjjiH39kuYzdikTdmqhcO58T/O6OVcpQ/OSG1j7ddqHDfbhaDLkdrNWw+xnA1VIbO5jrBwcFQHDmQhtQ6Q8qtzh5UaparKdfGLi+b7+ygAxwqql7x/8c6n/S7KNnL2u
-    SHARE_BASE_GIT_USERNAME: AgBh/XqRT1VGoaFbab287QbZuAkfUkA+GVo/9xwCvaKlOCU148xsr6YO2fM6fTdtpPlRqGTmDC14gdk9n3UT0+K6QyQqXz8x6QoRTIIgayT1dUPRyKLHuqpFx5OIljQx/+Pkolk2OHODmEJ3H2HMUW6VvQYu6BITzPfI4+f7+cfVXuziss0Dv225R+oO8iWMauKmKG+UJozWg9x+diI4WZ38iV2GaY/I9Jw2sQC8Odbxt6C42afnY3GgZ3wXvLEu/C6uydbog5E4yC7Bu8+YHeGS/RSqBCTsECf9CKtzycSsAcUp5F+Zp4/CbNjVx/ttaeg+l/ahjJ2C2UvKGu3fBSGhWrYaTpsRXggzII+N2gyLOGChClYVnBeOFsPPQb6VgRdtw01YA9SAWbFg6F+392Y0v1GetYyd8+wvQ0mLf0YkxvRXHCYi/qxrMuYEDkzcAlgwlCc3LBDe5E+AztBO5lc9nbfauNR558ovwxFz1U+AiHKvsKzZ+5LAutoeLdJGzwiGU1BS2mqoVb4zGmUZzfg1EO9QdMvUtcpTi9pvFil0JZLY+PXPdPJf8xOst2lhapR4vUZDh9VJaRg9jg7Gn+X1AnajI+lID4zwnSGHvmZPoNbGn4OHdXd4olwlqNIwGIRi0VgpQc4yJ5OxVswJMH3B6N3A+LEkVzPxIXhuuN57BWV+peybobEfd1Ma8kXU67Id1qG0UXOG69YwwkbUrlq5Ncs=
-    SHARE_OVERLAYS_GIT_BRANCH: AgBi5BNx6EFzFDvvaodfLwytpTnQqACw+WNJnJUWugaKs7BLXnBxfcvkxTs9EPy4/d95b0ET3LSmT1BSdhX0A/D39v8Ypst0mBpGVteo1CnKM2afPClqITu2k2SMlSr0/SusveROAws3L3vxyTaZeqmAaifsHGk9/oyEJrr582Sl0GTt2O/zML/opuGERQGQCznf21SiGnX4NRrQ/+mpz46n73XAiDSR7TE+nrFaT7YvfNjpfh5YSUmU2BsBMdxefa3aLB+fHl0I+qubiulbkkBcUiv2hyPr+gxUucMWaS+qUh8dGk8VRm7EuWfQUyRUhHoWV5jaYy/XDOz9rbBMLhwzw06SOz3obm1Y5DYzLySaN61ZdwQrMbs5WoatDiPNZviezjWeM04MZREPS61D63Vg6MBLRT1DRE8Ivq/8gMtFD71eDEVWve9q3RjUITXDGrrxJmh8bCA2d/9oB1JS2sZOEC4LrFlVflLdBA14P23xTijDxr8ihkVMXxqhrofI993Mw0zCtTeEdOikFqq+3OvxtYzfzeIVfC3ogJSQl9TcLI0M9hFryvXbdPC6fMxrrLmGRSp1NLK5FEy6n947h3cDo327BSwEypzgST8oATB261Lm4DVrrs1+YLpxdac8fjVBilINE6phJ0BGMDVuCMwGBRSJ5HLcEPSUd2r8djsG9gRq4M6BDQolw1otCrbmCsiQAW1NJ3CfpBPLVn+irgG/0PsGd4QL1Ii2apU6dg==
-    SHARE_OVERLAYS_GIT_PASSWORD: AgCdmX6qBol+CeSdBBODhUOVVheSQ8S/1zD1ApGXVPxaTh4pZeSaIt6neabIvBhWLY6rXXRa1pcp+D8EStUSjikfBJS/VKtZjxfkRbq96++VPI4fK0L8FvFHrNhmX+CM6nv7v6X/fhp/GxumSTrH1UtyYxcwXXkWlw7sfjyUcxYF0wXWR/7T6RwIDkOtOpvSTf+DW36zjKsIFPjvAmQSxsFBizKNGeILZXrAa25KM5qgPrErnC/C/NCaah+qECxM2Ys7CseAd/XtRL7m3d7FN51Bncz8SyOJVqjEni4IQt//9maDa+kSnhyQwC5Derq+uQ2pP2ASLwxIz2OXlhn1KayBqqvbufPfrL2mrkwMmAvq5T8E8jxVOG30u84U+onhOLC00Y9BvwtGps/XfJU8TtRdFLwEtxkCoDvseBtxXxIWcqx3koSvglU8kdDrr0V4yAMslpRPTOkUQ3nr3LkK91J1vIozWC6ttZdc6v7SRCm6XCQm2FQWI/r0/zFj6p4NlSoDhvpfnMLLKAA2TjnFxM2bKu35CkkNDx+u4fwKX9KbOa/4fR6Iv0nwScDGBXrOLLQksXcfFfX370/ihDAmAfC2qbDb2OQ0UriMXr+qGqEYnmWzWltcYPzVOddYlBO2if+KdoawCD9/WAMNyrAPMnweI257Za8VY48cozTm72WsYB5IysN8/2wfLE7HMjtF9jkFumWeSldtztI7w6SOZeRkWgXu/A==
-    SHARE_OVERLAYS_GIT_REPO: AgCWc9PQ6qB9Yn1dqq5mo0+clB57QWouswsBS6IX1VQgziAe9K3jm1mH+aB/DKwKtE//Rfp+utzusQkklHw/U/JumcOIc55zT9O833wNxLoj5acDirfNFEyhkMCOqNtUy6VoRQXmfR2cUusANjPX2XDHpW04fWCrrq4jBCtwSx705p6Xh+aLBSVMmmzVrtVFghswRwQCU6Ifc38rld2ZNoWSv4WSH5CwP/KDec5AXXlGXuwWsiQ7DNP8L8Iwm0FacYc3pnT7t8TruCdlzaK4Aaq/42JuIxTnBZ0eAXGA0Oq1rDwOTVJhq/vO+w3tjBFWRpDdmnXrCyVbWs52zvziT1vIOuaSs0VOVt2fphDW8MUBtOH3iKD3808KEsCwvDMFbIZKx9d4JB/vrZ8bBIFO73AhuRiM8Atwh91iFtYN7jignkDsZ9B+eoVKTl30W4m2IUGlIDSG1XDqEr9Jj6LJ1pPDg7rItXcPS6KgpKuqlr36Or3LZ43GrLVk7wXsKbUXsDDOWCC8UyaN99lHWRoGQ0Kc+d3hK2rYn/SM899M1ByxWgOkN3Dwt6esf8Ge5WpYEIKX9XvmlnG1W8azaDyUVKVh9GPZOPi5zqZ+gtlZ0sRdKFf01lNBexYhpH2xrXSR8MRpGBlPGFxBSRKZpYu872Zf2b3KiCi8XLwJridNeA/snmlnIj/5edihMg4Nb4qDypj1b4OMtZrvgEKMXkOtu+LleSdbK2J2WEb7GdiXW85qeGsa9EMQCUPFByfXE/S96nSVR346WhSV5pa2
-    SHARE_OVERLAYS_GIT_USERNAME: AgACWprn5DkzWB/t5XTpw9H37cDi6t1W61Sfe9PPG3Ku2Dl284FtTdvad1yc9nI03YDmGoTGld9v/w+uIzh83MywZJOXl0A4CMLSUGoBa/g/F8RuQXjf9oB+O4GOuftF5qZEi4JUzuT+FCvvyugSMichalL9bRyC7h5mvVAo6yYzdFmBG1Loh4C84N9pznl7Qv44yprFUTTnKMkab7l6VeKDaJTo+5I9qC4OkFzZ/AYPd4eS+jvPADufkcJCoHcMGYejYR/mZ4xB3B4oF+7tibDg6E5c7dJ0sQnbHaOyYwcmJf7yIx5pq/xjlAfmnK4fM52dSdxiFApNtWiGj4uJewyIkuhJXH0VDWucRk440nkOmoePzI3O/rD4RLbwUYl8bTSDqT0Nh4vdkvTb4+TowrNGMhaM6xhVuZDbB31iOJ9RKZzRrIlWQKcuk3eTK1bwMTsKUkyX3wZ8SFZX13cr9zwR10Es3MBB6i52M2aFZc5yflBt0EC97/ZvKURWr7IOCZcyUZxKM0SUmsZ0znOZZPyxj/M2IuP2yyjbMRCcItDrXvNkkexzry4Mk4ekZftBxCrK+PEdvj7m//7a3Gfispl44kqO45aeBH7a7ESuQJVN29YUOSpYY+6lcerRefgg7xskvKKqTReqL/dKQg6CHkRM2K/x9CC9bBzDlQ3mUUOMSM9CnRyqiNZ6oPfbgMwgl16q0r1g9PQubQoTEoujD2UIAUo=
+    SHARE_BASE_GIT_BRANCH: AgCcswxxJ6ZepYxq28SbvpVCor7slKuUhbWx3suokeSrCF1Jn/uibEF72mQhkieZoDX6RJ+d1GCmC/t7mog5r4rPIcz9C3w3tQFxmF7XMbOkaABQXEtoMQ37lx0UsVZlmHTDtSAt9WEeZiqPnJ13EvECqFAkf2JgOUfQAIwm3EQXDe05GYI+w+arj+AXYtwqtGMgWJdnApoIzzpwr7oiJdqGCu/T5rBEZuHHeCELb+8JKNi4qXJonqGXtGXPgNq6KVAIDezrqh7agGZI1/oFvsZ4LEF8bq+y/wwbONmqw0ZEFt5Hr4Td71RW3YO/Ax8fAbiOgFA2PkS31RM9/ASXa94hAQcuE4mQ7iNR/DGv7eq3r1KTm4LUmpDpFzVt/8emOAMLR0kE2Zp8r7yWancPW3n+GgUXE+1kPoRIy25NCFnTA35++9La2iKNtxhC5V8kcvgpc7KklAnnXOGrau2FIt3vnb2SyJIPKCgepejsfVLY5o/9gHn0WPXxv8J+Z7uATwn1WDglNwt+JC0mY8LrLWH+aKRZMPFhy+AdloMa0/O4jNh+JViwaUeE5iwB48dB6RZYbB7xE2QvnOPi9QgGCxmenjECbb6tO46lC98rPAlICNeYaqCvuqgBRSexNA+qXQzD5rbx9ojoEYb0zW2rZPwPIW3cDCkrKsm4oXB/ILX+xL0Us1mHSGjMz85or3fqcqrZrRABAn7zzPD1
+    SHARE_BASE_GIT_REPO: AgCR8gpre3AtzbQNuRppHTnbqZYAusgcezIUM7+GvMdKVCPtft4NzShTVX0EfgIa51QdgKyIPKUH5l3rjsfwkJ9AHZlOFYbAaVwc06qXI+ICdmL7csj75IjcwxYGFeKhAwJGIXLLKIC/BHDnR1gKgkIBAVGrAvSTUuEMD0f2CZrs8mqQ9skvci+cfseYZJTjzJS5KijwpsBhQFu2oTvPelH5SrfNvPzMLUd9v934cryiNg0putTDA6fiYEm6YGD0Keli34RWXq/9og7NnE4LaF1O2QVpPgbANKBNCUg/810/RzFEaChahjcXy27M9q3rcFLjIgo94WTeLIA9OBHuwKqsoiXGacOCUacHIBcqTN9cnAuYdz6W13rRxniQ+3Ji/fgmA09MGrXPLr2B//xsgt+lqCC6KLCQs2jXtBFUWsKNL2S5f1xNU5fGWNB+Nh8di1afOyRD27WT6ywhZs4PvnaJHTusxgzLI6pM7RM2VmfjtVmo541DxmuxTPPjxnYADe7qalymRu8nJ5HjQ/4xBbkLaMY/LqLmuAo40fcPXHd+ul11KBC3v7EEJCegprtPqD/uQIjiSaO5vwNvhXL310F+YIRl+3N181uy9R8EH5oI34qKnQ9iObb9YZRNL0FM4rgTguytFwdMDyxWJ5lo7wGa9m+EbUvOqeMdVhlIZvaKdCgCLGApfPuz0oBsqG+qc7WX9d37HIciHuORUn0P2X4J42GfnpWF47367mpkuUsxWy68QluHCMOcHOV6Yg==
+    SHARE_OVERLAYS_GIT_BRANCH: AgBA4Kl3CnyN5dbf1+9sYaerxy5kqsy4rgYOKpMY6tn2rrCjzfQPNlTSY1+c4SguMeaT/Ytgde7oixXe+u5DmecwEXpRhOIA1HG8jrDz6lVoPH+7Cq6eUrEP35X3fKMZPTbQ7Ax26mhGfQytn85KJU9czdibHQ8+JFdu+dRx7XeiQK565ULlOV0LzhOcs2ld6TP76gfnObcQh24Tf1Q5LkR7hFFzoggqbznT8HaVkTN521K938DftmCf0i/H7jotfZBbvcKwseEIR7fY+Y5/8fJX+CflOvkW9LG6Ou6ZdxP2P7uMVZ0Jw7MekdqBe5t2ORURmM1nbl0liX/TrVtQXiKjB+MfYeslbWGPU7Bk2PZg7ITvb6TIBbQqKd+kTSwpJJVgbzaKYisEpHpya7r1PcGKo6vQruJwhl+64eQb20hp9u/ssbt/9je3iUHTVqcja4f37u5Ws32HWmETFOFhawjO1tV8sWvHcmXI64KgggXeB+++K87vk0MRjb0S84qOW13H1eqCqbT2ZmhvtyIfXADcOUwgEoqVWfp+sQ8HXk106ivs7pu7rqfjH5H1tczXwJ1LXUyXoG5MQtpAskMXrKbf9ZCxuEUOXZl2vvFJrZuVCtuXGMCa/vRMYWYMPFzjlONLBNDa8L3wQtXABA6Yi0RXE3yaI7hbKohxDNHDYsz3mCBgeYeAvkkZsWO69wk0Aymyj4MbhXwEhJqj
+    SHARE_OVERLAYS_GIT_REPO: AgAUBds3bH7uv4hGlGR89uEiW7rA1LykjvkcuH+Jn+9G0IeP/uEzbuPj7adsEy5YgzfSeuf8bYBCSkBP3dUX6cEA1FFIDKSGZ+3fu2H0LovwzXtQVFkzMGvEGNOgznkESjbK1IZlDnZDPznaW+JK8xdROU4tvUiJofQPdoTk0fJiqNDumUlMNuYvbaT7SnAu2uxN8vzyOw6JApdseI2TCFjt2YXWuWdBNfOtZ4DwRNaE9eLfwRCk61BbRrWYypDYtAM3x/pXD8ZMGe15LeTpmS/g18R/OFMT7UhLq3QoNCvQ2hVie1uHu0XlGQsfy16WQx6hDwJqDllmbmT1dsDuIIH4bNu1XxmJ5fWfx+S1TuzvqdAY7LpBdstvZX2Sm80eA3UbxozIPsSElOvqxCyYScTrNvtxgnzbPWVbL6v65Z+vCB4Is8SFCPZJNzU89lPmtiEKZu//VF38q2Z+ylThiYyu/E1vU2RQizONo9eD91DEFbkDJv38TK3L9yYF12Q3s2k/oSEjMmR2hF+iNy8e2/5H99cTvTuQAXYLAVI8RR5Cs0llPYQIjCwlp2ib9dn8b5L/xbcCLUjRjMr+vJxsB16ymqpLrOniVNLOl9PBrptlcFSuwVA9ulNK5tycF4WHQGItygwFH3DufnlBKU1oz5FBve2u3mMe4nJIDT0FRjOZYuX1QfndLYqutc0qfujTyc5S6msHktxg9u9ySK1lFEF+yW5+CPPkh+56tJHn9v0aWReVCaNFUar10zehPrBk3z58
   template:
     metadata:
       creationTimestamp: null
diff --git a/euroccgcs/z2jh/fleet.yaml b/euroccgcs/z2jh/fleet.yaml
index 3325b3f0aaba75e5348d7fdd935abb1158628ac6..b38c676c6c4262537d9a8196d53384174bb0328f 100644
--- a/euroccgcs/z2jh/fleet.yaml
+++ b/euroccgcs/z2jh/fleet.yaml
@@ -13,10 +13,6 @@ dependsOn:
       matchLabels:
         app: postgres-operator
         component: namespaces
-  - selector:
-      matchLabels:
-        app: postgres-operator
-        component: databases
 
 kustomize:
   dir: ./kustomize
@@ -49,8 +45,16 @@ targetCustomizations:
     clusterSelector:
       matchLabels:
         stage: production
+        maintenance: "false"
+    helm:
+      valuesFiles:
+        - ../../base-values/image_prod.yaml
+  - name: production
+    clusterSelector:
+      matchLabels:
+        stage: production
+        maintenance: "true"
     helm:
       valuesFiles:
-        - ../../base-values/image_fixed.yaml
-    kustomize:
-      dir: ./kustomize
+        - ../../base-values/image_prod.yaml
+        - ../../base-values/maintenance.yaml
diff --git a/juniq/custom/fleet.yaml b/juniq/custom/fleet.yaml
index 3925993d1750935d120075da8bf5b56eacabd47d..03b6000b7899947400a87f4042150e1b781675c8 100644
--- a/juniq/custom/fleet.yaml
+++ b/juniq/custom/fleet.yaml
@@ -14,14 +14,10 @@ helm:
   releaseName: juniq-custom
   repo: https://kaas.pages.jsc.fz-juelich.de/helm-charts
   chart: jupyter-hub-customizations
-  version: 0.15.38
+  version: 0.16.19
   values:
     fullnameOverride: juniq-custom
     customConfig:
-      announcement:
-        show: true
-        title: "Upcoming Maintenance - 20 Mar 2025 08.30 - 18.30"
-        body: "All running JupyterLabs will be stopped during this maintenance."
       services:
         JupyterLab:
           defaultOption: "4.2-juniq"
@@ -66,7 +62,7 @@ targetCustomizations:
     clusterSelector:
       matchLabels:
         stage: production
-        prep: "false"
+        maintenance: "false"
     helm:
       values:
         global:
@@ -85,16 +81,16 @@ targetCustomizations:
     clusterSelector:
       matchLabels:
         stage: production
-        prep: "true"
+        maintenance: "true"
     helm:
       values:
         ingress:
           certmanager: false
         global:
-          hostname: zam12185.zam.kfa-juelich.de
+          hostname: zam12154.zam.kfa-juelich.de
           # hostname: juniq.fz-juelich.de
           baseUrl: /juniq/
           loggerName: Juniq
-          tlssecretname: zam12185
+          tlssecretname: zam12154
         nfs:
           path: /nfs/hubs/rke2/production/juniq
diff --git a/juniq/specific-secrets/overlays/production/frontend-git.yaml b/juniq/specific-secrets/overlays/production/frontend-git.yaml
index 6a9b1a427d429b28a689de3d2ad24cb49a755be8..d2ae90583b3206a657df5068818f1f98bfe20a7c 100644
--- a/juniq/specific-secrets/overlays/production/frontend-git.yaml
+++ b/juniq/specific-secrets/overlays/production/frontend-git.yaml
@@ -7,14 +7,12 @@ metadata:
   namespace: juniq
 spec:
   encryptedData:
-    SHARE_BASE_GIT_BRANCH: AgCPfxhxb/AyMgQUnlFz6pe4slBolJgV9GtcvsktgxicSpJv7miSi9ImEhpoRgHnjvouV2HQ7w75+rQcQmNgFZFcuQGz8e16BcqYilZ4EwuLdkSAPHMLdZ44gWtDVZ5/4lb+9hNbe6UrkPmM7rj+e3S0RkrUPbXmhSU50yGiO2s+WFxsS7mtbSxwIiB8wqHaNPF5uDhbK2zyciUj2OxqYIK1hYcWsB2k+x5RZ3DImWFlP7f9TIoSFFXvlSq/8ivRNb/PD2i0PmCqvV+maM+IFMpDfFDkNOy9LZ5tWvP39LY/OIpLXx2ZpgF5lWw5Wy5oNAaC+G0oOl1K/B9bhOdOjzW+84NuYHNjlrN1OsRUIy/MCWFPFMkf7xWNsbGm4gS9sZs8H0gZSal1/hC80X4YKl/pFxu7l3a57eWM5oZ2EJJLcNcY/zNmyud6UpbCSlVKiEn97Tg31VYIX9OTSNzycCanJDAJnAqx50nMGp5mcI4EfHSNLFQrYemWEmtsWDNJuqPtXeEpXDfIenWOZKOXCgPw1c7H/A9KQD4bwX3/oBe+XnKu/jO7vALJ3QtasVm5pWJAMWHSkuwfZvEJKDMc7BD5nbOMu6a8dytTt3xpyK4JkyHyMIY8lPVzPJWAVahj12MyXUPx6tmaRSDUI0A0+IAl4NL9dXn4qd7yCLOJ67RZyRRpDRI+1zKVf5lDs0H9s2YHav/0/8KEKt09vshuhSYLVt9PTqNS4Omy5Q72RwL7WA==
-    SHARE_BASE_GIT_PASSWORD: AgAAxRMPtXXr9hiZzY5v08j6SBH+vwi+1lc3W8FYZ8yh6VNoH3zgxLy2uAZGwau2TABn4+y3dzSc3yCa6qdDsMt0gA16hw5bi/+7/6NjjcKAnrijo3eYbdfZxPst/t3fxZ6md3evcvD38X77a0Svgghz6RDTdMI5Q+RB0Abih71YYezHo72Ax6EWNMtrgx/Lap1iGqgAVkp4SqP+loD06sYFf2COhjC/YjDENhIMPYo2v2ry8efQSaD/KTIwYzOwR035f7/WfV226xKhWr6fp31NDGVh3Yzt9aXQJOxJHQNZjU+FN1QGSAhak83QzQ4dCp6yw6go3kxleWzG9W9s2ngRUPeK6casQl+Gz/XEGLSqsUH1NKKrNIyGkzSbcjrkfWJkaeSP9pP7wdzDMqrhgHXT763Ie5avePKSOau0ykSJbg7oBFQYoynOaOu7LE1rvpQ7APlLO1dNjmlsKa+hZuMS/H7eUypEl8Z6D9WRFcA4qCfQglmJf5K+oxJTfFa8DPtXg6P6IHovGzXMkZDFLu05WJpD7adN/OeIVEf6MmYh4P+5/p04srieot70W2zymDEMBREqvTyC9/ZQADqwU8iui6WtnTTwpyzqFgPx1Rs+GlLw1atO5Fq3R1eT02arXfF5MZWYNn2mfWAOjoGYUVGkV4ke//CDWsbwAxWVFOcfPrR3HqDCJdCbhiobe1YLxcMRsVVlER+skUiaJKfzbwZZpfffbQ==
-    SHARE_BASE_GIT_REPO: AgCSE9qHeZx2czUHrqgh0MfgdN/Blbs7gkNLvf3+F9eTiwUsdfy9VO2CD6Ge3XRzoBos8H/ctvv2ou3GKuOuLTY6CDAezUYKPbIA2CgyQqfSR6sRbI9Fs1fk30jPEAWgybOyCEg/uLICPHDSTcepb5ma7HFct01agpxzl9/pnJwFg6SRe5svqh7Ba2bJ6tm2YGAJJv7mdjamXXFpIee0GSuXBHgm3pZ+NrhAemWN6IFH4PlfxsBqHcgSnobSXduiLUlOMPPsegLFkj2v1L/bFAfFsOa9p7pNFVvdl8PHfr6aAZD2d8kky3UvlY/hnu3V8FYfNfTfOcBLm2EkBsb+3LdlF/l3ZbvKxsRA+bFw4b60MpAPhA9zX8obQ8Nnr+o8PuIh01dUVP6gXWX/Adw5guF5vYvaMACGDeXS8WFnaLEpEI4mE2quTol/dyRRzpTg7CuF1+UkaQSpPKy1tyjORCsmA5lZpAFevTBFUNN8kBNh1RkQl2UVG/9E+Wd7scIW9ok2yBnJCGQGg1PYD+IWOj2Yejv7IzciLiTTe8+l0Qch5hO9j0ipCyQgAZaFSsBborEGNmV843f99UmqRhvDCw1W7wwHimCd+KuaV3UcYlzt11zVpCKcUg58LD2zh8BN6mq/Tmz8S/jZPHJEdFoo2QQVBVPe+cDoqTLUJnF3uqeUl/+y9CkyUfnQ1pk/JrKa9+3x+PHS0BzCtIhsMKxxUg5TxeHx/OBPSAuEs3sigL/my7vbb6vS2uw4Ep0fYMzi2tofs0F3c7zq3tEu
-    SHARE_BASE_GIT_USERNAME: AgA6iqVjzu9DqpgwbK6bJXf61Ni03zqZn5MEAmQwaJ+KpoB7Lngm+5EewHSQ2dI5UaNNORrg+F4/Np/ugPdiBIXRzgWTaKHYtQ1BlJaPi8pkYums07yxrL79NycljWRYW9WTq/SB6krmJUZQwv7aibMXZHV6pZYcl7mMdEI+S1agzjO6wJXpUxwRR5pL6wmJuV2QCljEw4bEm4kv3TRHfhru+hQtLt9+YTcdwn4UPNrsyJ16EI2CnwimLc6+oeg9QzmSDo5j9UTIkkajK03SL18+si7RWMxs9o0Uj+HZXK9z7uGlD85Tmdl6BTMiX4hJioJMGji+AROxYY9oLBsdRtWEJTxCuwMBDxNmQZ0E2GswRwKBA41zV1RQ+sdrPIYqf8M8m2XGj/AK3+CK6PJc1OUSM9J6DqSG5i6634vLRH2X9BsKvSDVl6tbJiqsvx5iMnKv9EbWy3cpKaLy0bQdk7cRywuNppvuf8bT3ijmw8IHFO8c5/X5aVxopRoE+Rdtsfajv4A2S602TQ/jTHVpdbbaXUpo8zgXTlHNZTdUmJ1wzAHrwYtjhxZpI5wC2XGhPXFORFQwRnaR1oeIbq52vgIHHBiX9AV/zI5P93QW9VNf8RBEuBTwOdU2ZcoDGMI34rg+ajI1C/zsPywrdF0VdaHdg9MrCoU4JVYxGbct3ZWG82DlYb4YZBZ4iDR64mxGDZiTfzn4Btd/VGRdmm5kL7kL78Y=
-    SHARE_OVERLAYS_GIT_BRANCH: AgBVNoTCCtdD+Pkgn4e0SkZ+smk6VVn9PMTdTSD0t/eKIHHD7ETA34IqBQLIId9qLKDtB47Yoahazowqk8OcA0MdX4HNNUzQeUBeR+qSjY+Jw81/oNLlhGVb8l7ZF4fbNqUsaV8X3pSJcVPQ4KWcGSQNcDnai/bG05722VaCzofvUfinCQUCD1ysMjyGfNqEgRzZSmc/X7KXlHzrKaKXLK7SSLL6QYbQZm/nhQqAnhSYXxZKEKwpbxtmlKOeetE5+uWNv9wangxFGdhyXk3aRV/6WOZzQvydhVw9qnMPpq/WH+0HcjZ4QYKPS3jtMv/Xgc2dDP7vVQY5/ouWi7adXt9HBKiuutnTkmHuecad0qopTcYzGFh1YLuVKr7fFIQDnAMgeFAoXlNXiIUeF9Uzssqwubx/o8akZ+CGQzpFeveD70f1eD7S+Uo1uLo83wHliub/pmNJITQ30byuVFEIzvVSmvYfiXeuNvFrgJ6WRp3Rn3Zh7N09yp/ia4TEcxtGXPlGUrG0PspQwjRvCP0XUM0WjfS5novbGcAFRwv6xpH8adt89oR3PPxztCHig56YWw6MDc2NVIovmStmSKWNBE/mmEO4EAOFEfSUP7RjDyUpulAjasm7SpzBt7cvZlh8MywIwzC3lxfea+FMh7aEhbeoYymnWdqLvagxCbR68H0iYIovisJZh+0eckUMQGGsALqTjQvVRNmnuigq
-    SHARE_OVERLAYS_GIT_PASSWORD: AgCcDBDL/zstpY2gjifoOomtmYa8Ll+Yjf4NJGx/r/6PSKMAWGsdVIFR2JRoobQQ6LcpD+MlOZi7hahTY9VXLaIV1yxfX6GGgYu0FWAoC8QQA2gCypdoWM3wbFbChhfmc/XiRLDUtSgJXG2rc2Tw2kaG/ZRRzkcLIoJtpX9D96G+QNONrpXrLpawuZA6ofzb3JIGLz2KWYvbfyNwZc9p+84GWQ36ixvr+CeFsQd7FcHoD1QIjofwDOsmOycRdFb8/wXVfg+/Xs+O3TorZLg4uFeqzZLQBrSBau/qfsiriURzhG3eg5F32Hp7rS0wGbgwrp6tWDPoIl2qMYAQSLcFMZ+k65xw/fyjTO7BOj+MxAqpYOAFMN3Pkoqs+pLWUIWJdUfxEk5JuOKc0JonswETASah5Gx2OzQtwOaLjSr4pjgUF1mgy/42RrxmIclfKd/Dsnbns4fxR1RT0N5bAXoLkqTGzBmDMOiGZa9ScWAMURS40s09aTrnS1kUAUQiZNGNpmGEYaBgsUrtn0YcfQbHZAyOJ2wflqqEaA+2CVjstFZWqcm1fwyiUQqdCDoJ83R251K7hJr3FAwCpPqL62OqBqJcvow74ialX5J3tKpcd96GH7neUsEzjJTaMCUnkM3yvPSz8UEw5o0uv0HivI/3kWGxdQPKSKfrZAmRNlw04ISMcGVozkBbJEj6AMo85zdAOpbskP4zR2IGSUip+8sWihBhEro/Q8HrNIMxZA==
-    SHARE_OVERLAYS_GIT_REPO: AgALKeU75y7T30mcji6fqacnRjvwHvYQZcU4zAdpd+akiXn9UL2RkdMlCArXwhanQI+7KMCYl+UxjcGo3MDBvmzNnmU/HCxCmwCX6ma+5MdhOks9g2pe9ddGGX56it29FBz4o2RY5hJOMay9PEXVNFy7g3ddjRAxdrAdirhrytfBSVAcCpGVLMlq0m6+c9cxJqyz60UGugSJY3eA7UOGzwrvgkkBq4uQSCwKzuk/lsVnlyVLWy/hsfbMEdpTkxL4GvkYxnwl34LHtTJgihrVizp+Z3U/xX91oHdPY+QLM4PGV6/ATYZtFnvFXCNMTEl3T0minx8JNXoFIIsr6f/sNFviQM8LpXYnHq2o5ge3j+lDnzUXX4yWZd5Ufycr963L4Gacsq2mH0Hbm9xk+O6rZ6EJZ8Hn6NTjtBvd/wWBjDPdyGVyvjSU0ZFNuh9w1+0DAMlUd/NmmrksjIaGc9Zg9fd+OMk+pLK3OdrAVG8Ez32xnZw+tmYzDg7iEJuaDjxX6tiTwmrFCm7GEttGg4sRBC3wIQD1+Xr8PxtyViwoXfO64owJiBl7ikYI70NzapyGdZwo3XzLtkovI/4LtlF5FJlThBZVfzGcd6GcYML6aw3opq52/comzQLFgZdG2wnB4U6IitHKBCjbfGojedU2Dm8HqtYlVFBkyXODLad1k/7FgJKnJzdtyIASkaOF/U0Iq8nHPICkyxMEUWSWK2mTVNuXiY4gW90T3hdLIdluKHk7xM1JooNlBTNRXjPvCdqMJGygWpeuEyjKzA==
-    SHARE_OVERLAYS_GIT_USERNAME: AgCcIuVKaCbKn3CxvyzS291n6zpJ0g6X3Hd0++6/VyuTk2YpwU/7p5/Slc4VvNhPOxLJX2L2w9ywmbqbxNsBG3EdYNi0Agk5qYgQdHNdSVotibSbONu9ZNimuKBKpU6PVBil8MHbhRX1sQS9hP8M4ZhW4fpii3QLwSgJVqWV5Vjj8buI7Mg+0FqAfe5Xq+ZNKUaiUjOPjmANtAujfOoplKOd4oiMEsJR8HBHkzrGo9JbTeb2hGB+mDJELV8qCpLuUQYQW3iZpbExFngxGk1ro1mCUI4hK66k5BBOhbqpdBYgBJXzpxbr2vXvnLis5tJBeUizh2uWGCkMQsIz5fRXqX+y5TA8E/ZS7ZGvleEhRAnf/At7/sPFPW1zotdvnXx4vFH99fIxtD0/NPcFgZyLoQz+Z/F7jpeDMsK/wYMQnmDtECr+/s7bwBMfqSKxzFsJxxPYm6XyUexXf86WnkRsr9B1ma4wLtbwpIMqfaWerJxhbSYEQuPzuR2qxYFRllEO9wl1snaVXMYGAidSDll3nQNfNZG2rD4DE0tjInqYUcF/KR2YV996MArVNRJMbySszcpuaYxKuyGEviNZW+kZA7Hb9QYp1iI5zdVuRg6MYDHSCFDw6MLDrHCcPgtBBPgZW5m0MSdow3sw/J3LOVAstlZebhXGGqs52mEeA5u1mZeLRFtPHPimvZfdP99wVaJVSbKxm3+LPFF96cd9bw==
+    SHARE_BASE_GIT_BRANCH: AgAd5ukJKVBkra0NOWUXY7XSLulSuTG2VXr6YX2Mqr4mfGDBTCbQDFjTrZh5f22N2Iw/gaLRxz8EQTEoFP/CSJBRFuyYAgKRV2BM+4rQPV1ArywjawkjZkRA19/Q/xg9WzqN/1vstkWqPUUPPBO0mSh4DXjI9gKm5K1F2bBjpLSH5N9Dc+YGEgdJh/i8bxD6iUIidZVPHBAa4RakpNMhfowRLCEbV29Raztg+9+YkBMRd7cfBOnkNjSrK3QbFjehVojE9M/yuC1YYb93WfhSwY6xmQYdDWZv/Q7DfCMmM2bM/LBjKveAJ+8SQfS95fT9msGgKIi6ESQMWZQCL68WVGvFm5OKIRwzma5OD72g/w7EToKd/icawIv3o/+0FeerydUqfAKtr+LQQ518dJqYliK4xrWF7JPFLrBBF3yxd8BwAMz0941qmSoECJNe5NhxDLVvKbv4zGZwEm2+w4V2oWcbM8mhmXht3O7M+QrQCBbBIaW718o8/F4tR4V3HThlsqvQR+F8NbhtjYdmFFEQV4kl2kWbDxHcSdEdjYBRudm8Be2xD7mLGayzEW3iBEQgmol0LJeLUacv34DFR+cR5H/+5+HgyeSRm2KR3cMGt7bm8sMb5MskoAW6dgGOyNTHIArLA+tzMrW922bOhoD0vW4P69Y5rEatjKMm3xUj35wG2lEOkTzk+D6JZdrEbDiB/dzp2EW0IoXCXo+M
+    SHARE_BASE_GIT_REPO: AgCJ8akcQ5VTSk/x5uAyhFwuaMAeRydZQWgiVRj7TVf9Dz5CszTEvrRhNBOwY8FnNb+WsvG15HJwBBmeAc6XS6DkpJKggghdJ20MQxI5iXvpgCCG2d7D74oHiYZq2QVbd8/HzQQrM6k9CasdqPINvJNspETK20wqrO0uLj9oHYn37QnV2ctxHC+eyRLJW+7OEo58WYc8uJcUGBoaZ1QpXWuBvaXb3bO9wzkfEmzN4KU2+0o8gz1WIc8PBy5q2hbcWy0u2iNrzNyBS1lff+gMWmp8h83RUkI5TxNOQahxnyvn0onTNISLE44xb8Zhct7qGEAcxRxRRiAihTz/RT7QIrxsF/tZhJ4DDV0Tml8qWaq6Kg6agTPcr+N0IFdVzsoGYhXOrFIMHK0QKWCEPnsmbx41ydC+oP74z0Q1zrbsaTRHmaCaeLB+uYQL6TIS/qjqoyo/XSYmIC7zNvsxSHEUZFetC2VpPvdT1Y/YPjUmLvS98PXL7FjsKiGtuacsXsSkvubSL3jFaL6Hp6cPHRaa1WbzHoi/Ul8EpnEstqhf6g/j8t5rQKRbPK11rOiENfrQNX5VQj/vyhOiQTx3apoN0zYhXyEJ+yOzWA5civXd5GULngP5t1m1//zDOA59Kmth9WtYUh9rq1UyqC/cI2wJToq5XLM5vRjlpRDmzTgaKKEwq2QgXaHMbmQCEDRCP1m9w3jfXzpH1AsbPb8tRJuGLTgqq63R/t65SHIb037rIT4KeflkQtuWkBN+ZdhB6AwVCjI=
+    SHARE_OVERLAYS_GIT_BRANCH: AgCdwB5Bb17RHz33o/Y3OImmcS3CnJsjVTa5rIW2k6KGUGzaLdQunhM8+d9NwPVy6zF4iO2IdE3x3BkoLHYSgDZRZA5bTyYC9UIvh5sL0gMr1Y/h+RpmQmf5YLMMTN64KVQG7iIRD3a3HragQqYh2UgHjgebZF3DQO11kpgxtnCE9q0gvSYn48mNFw1056l9kUmjw27jEdZxjyjg42iMc4iGDmcMfVSVVbj7lgSPDt5roI1nwbGjDZDiDro7yxw4PP5N9qA9P/56OYZdBg43tbujkAzjHshENIOnt1daXpgRV32jsiJoK+7nSXPIFnskQNaToLaOkFKHcOwNWdyRDTFzBrkkkT8wkd2uuawEUvyaSDITB+0c/j/oL1cpo8EMAjKKDeVNDXdgLOC6eiXmqJVTZc/4ZFNJoW1E55TCYMZ7v1SRq726dvr8GNaUG0NTcZ3385EJInNUyJL9XOa1ZQSQpN35jRBLKo1WtkqWqMfY/VwNu8HhTpjqOmAKhD0TNfVjA/1ceC3uM+/ncdYcVoURNiphTzYm7YlI0UmV/90nLA3J7zgsUxDkwBf7OtBV+5WVDHq0dqHXtZ8Kq4jvY7Mtm88NOSN+VmRboaIo0w+ujuP3eko9ulOewc9lNoiK7Jbplqp/485iBZgHaoeTeAyWo/gk5KCgMx61jUk4HA8c7lddAo5QSVacc0bTrVaVWlztt4XkCUz/gzs6
+    SHARE_OVERLAYS_GIT_PASSWORD: AgAQelCGPgS1lZ9WQcTe5bVG+V5WNc1wEGeTRTc6cEu+wOdgqVHal3i1R6E2cEr2aJ52QUHVuimR1taXJl7pUFjBDW3STKkRgTUBot7L8qIUzXBItmkDodxpg9FF63M5RMqxCw9hSpJRJ0Tggwfaa8UEmvj8opZqAAKKvVCffz36sEafCunax5C+O0vvgW0i4e/RoGEptKXj+DZAYEldHjur6DlhLfcwHFL9k3ia/BYjxRb4sJwv/cQrqp+CrqUWddHwYgp2wasnI/NsRpJMCwD/V8yO1wkE1OSLMZqSrnsAZykWZYAASeqU0ID0E7yfZAc8oqcTiia4gLxNwfNK78FaQU9emcsfK09VgvklHTmhZIQwxH0kmqylaiJvqOnRmY+5ACcFGcHyygCmDGMW5RK4Viq85vqCSUd3r33ugmcv5Br0Gst0zjgcLQPWf3NMmKo1nBDWfeBQlBTkQYm0+oCTqrP1EA2SXYztGIOGOho9mVorILpGsTEt8K45snbT73AJ+BX4NB1RUOiZbBsMa0lI7A201mMjPgJ8Ni+reLhLGsV0Bche2K7vp7SfxcbmjnoyFebTi3+PGXQJEF28jcwnOznew/kubIFA0j19idnSm8vB4mnpzL2TgjHMAsV3tT/fvB3gilHE9C+EbFblSC2v5PNM+9P/LA2I+UT1GKfKS6lsxhoiGshu6Hg45Ya6tloPcCiFb+JR/I4fiMqb7Pr01S+rnlVE9JkH/g==
+    SHARE_OVERLAYS_GIT_REPO: AgAZ+XCbCq/rTA+1YnhepXNd6tjqkdJKEB3vqRBQx2yE+QN0F2hn5q5inzM0rSzK3hq/uM/CKm+75PH2O3JFEsugwxi0Ok+Z4FzUp+DNU+Fdi8DPBczy5t0ACi+IQRJ67eMxE66ePT0FQbwW8ReZNZ9tZe8UJWvkS6SkTlimX2TCpuc675oFl6a4tp7ZmfnLD345IQKSlh/6WMv96Qone1rKfO1M99nACrU8DsnHSjOM2kBekYdUFrW/XuAXyj4qwDRbEu/wg6DXSFWbKSVUcYb/wIK1S0+eU1VtZjm++nFWToQQ7NP2OfQBtOt4eGXaOMaVd+s/IftRQbgtL6re+K+t9jVcFrEX9NsUsWNfdNV2LN9J8Wd9VP+IXFp2kXNKVrwb0BEtv26DDG+pTXuWcgRsl6RxfERRF61avgUaJFZLXob3tvHlkoR5N3p55x428iPnEv/e1udyk/ILWeM3DiqCMCVv9L88/bxpm4vNs42W2RdrWc9V4aCgymxOjTv1HdREe/LZn1K911plgVMoxNronLY/tdohaieXnxEVZUU8Wa/Ehw5MisOYQ3/MfRVh1Phkaz7Dl7ZcXMj/2eQkF5pJxB+scNMr51m9UfGdg+bdKhYQR33V4dkJRhImsV9lPXVNJLwYPRXSRmuwqVspYYSzfpOqqCjJiHAPTz/P2rbiVnU42RxKmUy0V+Fw5eBcgR/FtFyCmCwIR/xQNtTGMBy6wIqK7fu1oThm3li5SlZ+HCaSWfOGphp/m2jIpFxRPJZEUebh4z6LC/tQUj1S2H7SRhFDheQ=
+    SHARE_OVERLAYS_GIT_USERNAME: AgA7GOIaeS5KiCZcXinncVpJt3R8iA+7R5+I6OWMa2uWk+ndNnkLnbRdGIIlqFu1sITaaeHeGMUhFUEpqcwgyi2IUk9/KJGX8PN+R6lxdBoeR9c6BWpGf91wcBhDM5WhoNNkc785qbT5zxR1KW03ehJcm0gOVfuq7LdJrmhjibiDVEGzR99h10teBzI23jRX2LsedRCPRsmWypI4R1nxWwVUq+v0Z8McGmcSK0cu2pVTA0s28zVQoqIFdaIkvepgaXidjPchWp8v110uPYoQ13y3sIJWcvevE5jhXOyxBsKYdeLpOIMJtrXpb99GfhoBF6lPRv5YeaPTosvgI4Cij6fQeX4YSYPvokAJ7eCFb8T2HKIYlboMSLpNH75gJEs5taF2n0bizQA6xv3eLYonfFEwPWxk4zPjtiEoOCx1VjRSe9nfINyvTnAYaAobeGdwnGEJma5Epx3VrQNcJny0WpoSSGy4dkUvlR5iKGAvFbGt8WvnUXRlutHadiTs8hmVlyP8jLz50cZgRiSfU0YIBqBwtCoQ89rf5vRGW+kwMzkQPlRmzMPgRCspaUZ4WyMz6SkcozJT6E/zs/M/aEaX9zjqW3dFyMuCH2x3YNoVwuiaPoT1vhBzceSGxp4PDuqTiFIOQzBSTSoOeiMvGgVfi+JkTXOT+jdzqFjLZapnAtDvwodkQ9JjcuoGL6eY9yO9xwOg7MMbO9ksyAHCfg==
   template:
     metadata:
       creationTimestamp: null
diff --git a/juniq/z2jh/fleet.yaml b/juniq/z2jh/fleet.yaml
index 8ea986a960e5b55dd820c45320592a4c0d26947b..a5984da2ba0436772f0421772f7ef99e88b0c23c 100644
--- a/juniq/z2jh/fleet.yaml
+++ b/juniq/z2jh/fleet.yaml
@@ -13,10 +13,6 @@ dependsOn:
       matchLabels:
         app: postgres-operator
         component: namespaces
-  - selector:
-      matchLabels:
-        app: postgres-operator
-        component: databases
 
 kustomize:
   dir: ./kustomize
@@ -49,16 +45,16 @@ targetCustomizations:
     clusterSelector:
       matchLabels:
         stage: production
+        maintenance: "false"
     helm:
       valuesFiles:
-        - ../../base-values/image_fixed.yaml
-    kustomize:
-      dir: ./kustomize
-  - name: staging
+        - ../../base-values/image_prod.yaml
+  - name: production
     clusterSelector:
       matchLabels:
-        stage: staging
+        stage: production
+        maintenance: "true"
     helm:
       valuesFiles:
-        # - ../../base-values/image_devel.yaml
-        - ../../base-values/image.yaml
+        - ../../base-values/image_prod.yaml
+        - ../../base-values/maintenance.yaml
diff --git a/jupyterjsc/custom/fleet.yaml b/jupyterjsc/custom/fleet.yaml
index 74dfbdb1c94315428c1f74708af53d96e49b8be1..5ab7858a9187547834084d146659a25dd9a81f93 100644
--- a/jupyterjsc/custom/fleet.yaml
+++ b/jupyterjsc/custom/fleet.yaml
@@ -14,7 +14,7 @@ helm:
   releaseName: jupyterjsc-custom
   repo: https://kaas.pages.jsc.fz-juelich.de/helm-charts
   chart: jupyter-hub-customizations
-  version: 0.15.41
+  version: 0.16.19
   values:
     fullnameOverride: jupyterjsc-custom
     global:
@@ -89,7 +89,7 @@ targetCustomizations:
     clusterSelector:
       matchLabels:
         stage: production
-        prep: "false"
+        maintenance: "false"
     helm:
       values:
         global:
@@ -112,17 +112,17 @@ targetCustomizations:
     clusterSelector:
       matchLabels:
         stage: production
-        prep: "true"
+        maintenance: "true"
     helm:
       values:
         ingress:
           certmanager: false
         global:
-          hostname: zam12185.zam.kfa-juelich.de
+          hostname: zam12154.zam.kfa-juelich.de
           # hostname: jupyter.jsc.fz-juelich.de
           baseUrl: /jupyterjsc/
           loggerName: JupyterJSC
-          tlssecretname: zam12185
+          tlssecretname: zam12154
         nfs:
           path: /nfs/hubs/rke2/production/jupyterjsc
         # redirects:
diff --git a/jupyterjsc/specific-secrets/overlays/production/frontend-git.yaml b/jupyterjsc/specific-secrets/overlays/production/frontend-git.yaml
index b8ec21ebb517ec3c3aabe153dee67c6e96354da4..9a1d98b06d4aca6259a7293bd69decba91b026d3 100644
--- a/jupyterjsc/specific-secrets/overlays/production/frontend-git.yaml
+++ b/jupyterjsc/specific-secrets/overlays/production/frontend-git.yaml
@@ -7,10 +7,14 @@ metadata:
   namespace: jupyterjsc
 spec:
   encryptedData:
-    SHARE_BASE_GIT_BRANCH: AgAHaMeEjKYxYTYe+phyvhYpnh6D5qs6zPyEXIEckw0zxyJayvEA61oDihx+nQ9P9l6WCZ2L1ZjJPt27p+G9Mw9vqAkieNRTmPVc0udAx9M/Wee54KQvnCrCZHN47DI6ZMXJcsIPtu1MMnjwQSp3okx8gtCL9IeCWhq9xNPp4sHGw9Le5vtTmxAf5taWhCXbWZHBw7qmixFNhMNKka0/NuJ0dHz9bKB8JDIY8gzMMu1U9nv1wYkZ0nkQMbWpskOryZA83FC1rA5gbUEcmZLuNTCpRgPZAlIDCzUd7/vkNBNrnLlh4g1OCg0UxYaoMWo+JA/8bJTE4z4SJPhLE4TDLRKzavYQK2vdwtxTgTlMF+ZnNhDtG+7qhRlLJWyObWjK/zrUpC5PD2gyudrVAB2hpkMFjjosdBY65s4YUNn0jXXiuhQ+y6NAoiRpjydruq1uoGS87mDBDrZDn6HlVdJ4Es9+5/44D3BThHUz929LJue604CsCgFfpVQUSr4ljHqUS0kfQjNajLQpzPI0m5b6WeKZyMR+XEKwduoby+Xi3DIrUYY9cVEfOlqSlNRKODOVIgjTVTQlSxYKlfEOJOW8SELYyJ2N+S4UApSsphrkYPh4QKcy54WQvdAEuUe6pyF0Ev/nlGN9oDjRsAu1p2mLCqsBswd9SHCbYARWvPDTV85F6jU7khYCxb8SWxG96UhyfVLWE98Zg8IgRVwN8AYTTMWo7o47hm24cc5OtyHCOfsI/g==
-    SHARE_BASE_GIT_PASSWORD: AgCk7gYj8jMq/i/rN3f/AoaIRjvF/EHTQU9p7MvQBDT5pDcmprECYUBJMq6WIRFqMgl/LMg/3YMGqDhT5lfSvr2OINbF5gKfkuVnGTaCw54J2h0BkShFl/7opiUOXpUJBw0M4OHloFTJjEVP3fF3bMzDJOq53lu6mlfBrjoAtoVUdBoAFoomVU9ebHR0ZbHNDvgozFdBjSVHZIGpoNaenUb/EcipprfKCl6DKHrhdZwi8psIJ35+sXLe9O439xTvVTJIUQefomU8cadO+EfbJmhRN6aXuo0DIdVVugml9awRJe22PYl49PdrMX1NJ97XQNiR2PFB3Dy0mqnodJgLipI9ThhPAw4ZYRWSfS3ci9LWGVhPiAJUjCvg3L1vFnuo61kgYFo+VVo1NIW/zfk6mvMQ9N3bE3ZUEFvmllfYFkJVgJxm9k+sX3fQ2cO8U/9XKmjWYNp6lfVUDHdKOK2aMuWbWkAn0BK8m5T/RqD7lG3DaM1Y94vS4/VYlYUzyqhfe874SWLR67sz8Cq1iUK1MAotSJwOFLQvmdotH7f7bxATf/eV1vGjz5Ugd4jqZYvM4vtG7jR0mzMulLcB2oG6dxW5oA1Rh0ayD5qw+wcYgRBjSTcIgLsdFWnPua2vUi6uY9lEAiiCSvPFOyqEmJ7vaem4n6tLZoSKoQMQqqR9r/h1XTPIeqcAb9p508lscDUB/dW4scju+yhyjUZlIYUaOJtS8zLtUA==
-    SHARE_BASE_GIT_REPO: AgBWv42GPyZPJePRp3iCTBlHSUkgH68GPIXZFX0mrwRGisn2AWqp/YuxQ3aheAVBmCYOui0PPlyvUY41Fb2hkbEEIseDTeesfpDK5dTzkGlMNf4sLgsbsyx+Q1YDuHeNpyY4zTSB73uGYLJruZL7KxBaHKXNyDNAzIu9QI793MqSePYqvGO2cMpSkk8jE0bUXJocn9YM8dYn+S9gKSFxhlV3GI1Hmf3DrfM8cumPSIBU+ogGXZr3PVjquPBPy27RsxDxozqXYHdfZPmII2jVFAyiu+tLx1AfYW0GIQLV1DYX1Z1Ic106gKxf5G/lq9iY62X825TD6dcW0kTcqrdNw8aNYHxKT4SH6LIzSdSvAgxqL5FSJWo844PdqSarUAM10+2zP1JMOYBaE3pojyCbj6IGdl88oktFzV4FM5XFcHOsJTsgkWvuQ9bg2+MeHccXjkid0vgXOuv/BTh90G99FkFyaFxh5OAv3CHy+pZdmaaSJvlhVa9F42+SryfZNjp6vpIjnQFRqPjEihAJGz8NVbJAalK8dTgcQqT+CCzZV/LzPNX2XcVq27c7GRQuyFmqPkiDU7DOO4S/TLEpDM/CihwBd5YVM6eSHghrrLHNqPSsG+1A/uwGOzo41bC/zG6JekM4Ad80Afb8HOiOPS3WOL1Q1MXTOzkR3Xq0LOrjIXgFR/pZKSfx2N6R1HLIE+imt7KOsUY8cyxnSClmVebakRlrBcMlNh5GsnnIGIGSDkyHky+kDgtLvlor62rs+KXjo2cJApOGedv6EA71
-    SHARE_BASE_GIT_USERNAME: AgBN5yM79fVpaxZ7lzbfkvo7VObwt7qERuFvXLk3X0rMSRt1kZ3NFpZFaVepfrZ/ghMB4bGqwz1tHZxemf5msIvzStS/E3GmM7bJD0cV1KKE7QkhJxwfvh9OCM+edYjK8/Ne1cCHpyDw+khpTKVLNvhTAeVnAyyrFo+41G2BMtIMUprcdqs3VPl5RBh9Y4/OLd8BhmK/k4rC0NGtc/LyMU7izClLWaD1UAbIMjfVhDSxP3iLclagH12GuzU0W3JECTLnXU92XR+4ihzEfqKFB6GmItRA3+T/e649FmcdJ5tFld/X46oS1xa77abePzth2jCrJoE9f6ayhaFNMtV2WGDeCfLTLj5dOHAPg54LcFtIDH2HO9LVMUaTalK1UMlh2xnDbfRBVsI1lNbBrDKvYoWOG5SEu83BakzNbDwXTF3TmpEGbqlRoguMYBZI+m1EfNVG5XQLuc8KIfhDdR3/1auH6u9VKeCYY0NGyjJnrUm4qtfJZQDtSwZndimv/1N1vLibhuN5m4Yn/I3h1/iGmDfnu0g8lHOgbOnyZo8Svv0/7ro+jGNNjEg9NqgtQgnjlUvJkYvdY+VWoGZ2u5Q46hZrtZU2+CBMjawbPPoOBO7fR6hKbsKC8p4VR2Ttx4M3FhEQP2/Xkc9v8Y85a0roydLN/8smg5fCk5JU/upZqqaVKo8ugMn57JsDZ/7BSqsXi2PBNA7XlwZ/xr1QLlnf2sX+MSw=
+    GIT_BLOCKLIST_BRANCH: AgA7GEYaQ3azPVXKO7NAjDc5vBtX5I1WNMH1IxsKtrtcc7oAEJfi9wPrFdaagBFqjqk8fuPeYUd/WN8sJm/T/hiWPO90Zr3F2RUHM77GxY6qoec48JhxDGGieWbAvWZsPrypPnteBK4vsco2NaKnq6rcR8cmp7rbYC5DIL8on4JuJv20I5XaW/jsaLmsmTgQ4JEAkXGgiDFt/07HDgL/vKo1KSoZcQw7iQ2wwx1DmE+Gf2prppndImwnkUePNQOyDTI9tXAIsarA2kJ1VduCydFuklg3ZiPO4Pi64YPidVWSjGwgJvgT7vG9hS5zONaomlV3PF2yAAjAnbrQYg7jlbJHVNVrfwtcUJC7DHwIGSxF1hjPWSku/aSTWXMNOeH4UXLhspLnOiDE8ujrhnBKF1Jp7af+8Vc94jMNg1N6ZbD/JaBjxPOYE2zga0B0OdsT6CYgIHAVZJ0zSaonabp/ljd8U/+qha6Eb9JP5/A8D9hHS1ZjVmntt24phOY47Uw7q7Dvl7u420H6Z/O8SIt5TaAn/dKax1VUh4Ux84Aa5gwG2TCJ/Y0nfRNi+BJkJoWjvpRSJQj/3QrfB81aUAo3ZCG9A33sPp+/Xl+n4TEiU2FPA02LAwGh89PbyeZ7ZmE3YpMHvMaX4TizkLF1Vx7qm2zaThH1gTYz93QTmeJ//HsSW+vWGtaVJSef10OpxbrU08vRAjX8
+    GIT_BLOCKLIST_PASSWORD: AgCZS3Cqhv1+VMMuXwB940UE3x0svY1CkRXkzMRJsf3+xFKKjOBwS1giN1A6omhJI/uzLXEO7sgYi0yrdVJbBYFPR4TIdpcSXLZIufGre4bz83bYnG0LjXngKkx21T6prp8nk8GglnHowporUvppiax+z/OWYik7fE958j1o//ov3aaWkiJZlwFW1H/pnEqBY4qVLN0Y/BF+jRaLogN8dSffuhRpi6HCISJdbsHfnyOWVvcTstFfUKawcnkVfkUoBj7RPz6ym5p218NmYBh1/7bmziLk+kRbpWqdOsPbcM0gFt7Dwpik5QmkA3m8Z46hjeEgMSn8vcy07T2bOlXFJMnGgA/Q9fOWe1utkTMRnrbAAdjPeiooE116lDZas7VURSfa0CTr5MUL2yi27SNpDcl8eYHk7ejC28jXhIkCryxXjlYCjRbsQJAbKycYVRAzJxXbOmfu5+5YasviRpul7ai2pR8VHp0sJKGnXsUq4l0cFL2ieqw/MVfgcSfZOtx26NdrIzutc+vAqB5EbrWjtiZ5/iABLxpBr69kRD2tNvRobjXhZyaCMNhXejljTFPTo5PA46lYEhXCWf8haCjZLZ5h1MxSh20DOEDRrsjhBOrw181lCItMTAKQYbIfhrkCa35S5rYB7ZP6E5hGisRzAvUmY0CygI7sVMXGj4olVf8eBgOnDt0HmWsdo2qcH26tEUeYkY/IhUKz3zwbLbPzsFEfi0lIYw==
+    GIT_BLOCKLIST_REPO: AgAy1L1sQnWGJjxlWUVr02DGJzwgDPYZEqx8NbhSDdI7QSb4nVZCo2uqSPqUrz8RVT9EBnJ2YJ/85Xbz903bXRLcKPosO6OEaidF2hjymVXSDSIKSe+ec7Vb0lFfQGc5yjDb4rVWVLev1SbpUcaoA79GFhHJfqhMVREU9+5+CUxSkvF8TWWHYbpTIuNR8A3mOFUzqmY6EB3DU8NufHwiOXJx86+1eLWfjWRk2PRyKOR9tlFDa1K+SUGoTpNjMV3ur1958/FA8IS+bbpCIaTy/82Me2wYYkyv87gzl58huwdp+0T3sBGe+8bT2OTwNFHyeuW60LTTvt0JyJQcdSm/hNTTV+mPI0m5gDTX5qwG/Tqb1xdjXcDCiOKYZm6HlA0/fzTXXBtPT4g0ralfiXAt6HbO+f3x4xB5Hlz5FoeIg9ey0TntdwZKxktKgvyPjEOtSh+BQhG6iaon/P7l79kuziB1ijE1e2n/P/X6MnIrNNVDM83oV3tFQDmPi2HPFKDVt5kiGNzUbqAnDVqJNoboJmAXLvDFAUSV1EWRJ+dozQDGB5j1B0iBjRkcevVNu+RibIBTE6A92b0TB3jmrWFymXWGThCIUcixZeR7YZfJFdW90IXkKEzSmWjJKfGm6BmceieWEGRBZcwDwKFxRFbtDjxkGdlUbR8ljsVa+do4YFQiE5zka0LwjXDmTGAmMeJO8yhvohioNZ7PVdjGoPLB4leKhBRQyFdVL2x2A32RKW99Be0hbeZL8EEEzpXJ20B7BsGKAaWRz+Er7G5c4FSSU8BLNjHKZ+kirqI=
+    GIT_BLOCKLIST_USERNAME: AgCXh1q2jevaadGVp5u+jGDN52tPqzH1d9P+9uPNzebfxcW6Mt4qBNOazhYdd4Aa69QP4ufEoMaZALuXkXa08mG/9Q74EKY8jNLsG/DZhekLNAcbX3OBANDXUSnU/agZvy6fHdPRLWuLmVk9qI1pmCEdwoKDPjxIf+Awl1fBLAffwHv63IrlaShfKLL06OfTAd1G2AWlgbKb7Tfc2UBj2n+MmjICkoSv+u7aTNQBRpFv7iPABlycqvQqifJaPtNCP4izw4BJOtdow6yKQ4Bxc8UtmvPnZKEd0Q7CKP+KaMpbeERC8OqugTGJWuSWHTnc8ZjI2pYwlcnzL6L9M9T0Qb+2Ac/TiecuboqneK3E3hUWHb7NcCYWYsvh8sPprEHeqIjqESFoDwjL0qOudQaPtCCHOqEcJkNkGLdclwsiPM8saJgIEu0GQKleRqAxLbJxxbFmzaBiAmllPesn+knJsX2IfY6vio1B75OUndTfvATyEwnc56WAIexBErJVhVPHel7ZcuX8HLh0nuUS0sSSjCAJghR5lagZhzZ7d0vueWtyJFFCd1iQg/4+nRX7oyd5GskSpG2UC6zwpzz+LFHgyvtUDNGi8vNSQ5V2hsuiE+LzqSyTEzV9dqsApMSZbAFx+oNOKYRgd5rtB7zIr05nL/NSiTMWfh9vFN48utzKtT8PcY1lhpgrYTcl4Cz2+pv/R9X7W2Os5McgZTxnQw==
+    SHARE_BASE_GIT_BRANCH: AgAcVKwMIq/SDRBYYGEQzTBv1ce3QGtFownUwsEiJdg/1wnqeVz1dTNk2giLgd3PFVRjxHBbzjOoLWpghRFa4a5rbbGOh7gZ9iKPRREbHcJGVFFh3LLu0cbM3pw2iQT2awLYK3En7UYWs8b7gKuuwbc5CZ1Ain7rSoFg/2OP11vjcYp9A5DLOAUZrD9qoaC7vCNsZ/eH+Wcf2L+2NXqO12U6ObUGLQIMrySGYsMkrrVoQ6cYFdXERDF0hqGNbQ+GRuGJoYyfUVepxhKiA9r+Lfup2+1a828Z1WL+hRIQooGolEg8vFh8cYhqqkFSAIovITajg/eojcDr9eubRHfLUOOcbionagH/49VcumB2DMJo/TWTxUMksh63wldndiEK2Q8/rtkisnYtknyadzp98z4yBKKeBC2KpzJ95c1v+Fz1ZXdSDkMuCyG/yz1vEHNoid+YG+6Rd9XGsmsA83Tw4y5bfclggQzfAbFypVfeCFfbFbaFxbXByw343FQB8nOl21YYQ5K5w21n3DtByUn6DrnCofTTRzh0N52QY7DC2Tw6KmBekaLOS46DSMyjUSoYcitW3e4FSBEj43laN6kaB99L9O3BMNpJtjaWUMGVElLPvf7ay6/U0tNaLtA3LNSuNHwKf5KPfF8s9OPGSo5Q+XksiHbgZr9kh31w221bjP2PwGGkuNQ1HWFmxAEYrwiY0qSNdlARjika16h8
+    SHARE_BASE_GIT_REPO: AgBrvvrLGvubsdbtnFTetZrsFHfRiLgwYRWLcg2cIPTQRddkTlJHK/xiKFuiMaJRh5li3A3EpRYr1tkVkJCCgyoyRb8EvT8sUvic+k0eVul1ok07nq5EjphXIfmJ0VaBfCD1MvRUxjm1z6QA8fNUIA8GXNU5bpBr4oClLpboJpUda9gstFY8gE/m37eNadDAK/0oP+W2dgJKKO955WcHrB2gHywicrxA3Ebh9wI+EOZ/HZMq3KpVGl5vSFV8cVJHHSC5ZuYZXiN5l9VcAeEWt0xL76BNqQdziolCgopCI6u4pOK3CO0AOT8n2F1Ykr6Qv0I3EOWePdM9GQMhMkwcmt4tr/zsRAYsAcxnqNL7zVLmvoFBTMc1vGFOmUIWr39urG6U219nnbjvA4BmjBY809mwOAuGxd52/ee9miGKVUGDWMwU1pl5y5fPIr14L6rHfwILynjAgqNtekZnTvHPuIry3P+yO2lWYmtehQP7pI11EXFxM/UxNR/lo8lFWFvcTvl+Cdqwck86LejM2aWHnxbfTQ9pjaLigzoQewXdWMVdOtwyrzhTb0ppU+ZYLneBIB2ycj6TLFXxHhVUi7KTd9uljWnqXMW5zXqbgCBFBua9xuz85XcIqu64xGXH7exY6TLP3h/CvKR9DKlHxI4ZOKZgy1bDSHjLvRNL+EN3Fpz3hI5UcHJosPqDkRSRnr5Hy6oju4ze4akX+faL/mtGtofaMhekPKuSwzuJDY94IZd7ar3UiSa89u5TYcvFyW4LYeU=
+    SHARE_OVERLAYS_GIT_BRANCH: AgCPxCsvrjgFSJT1H4+4ZbeSxMYr3fMADw4IlPzpQd/SdIIUWzicPdtUiTI4NRc6KsqPKl7MOYuz8TmiopwX282vlzeJCvIM90zCCeouvAze6ORp6a5bYsEJld0TNuklfMy0Cx5XGifWxd+oKZovc+32W/VKTe+WZtZTn9eC+Ud/mBnfo5lFe2NWIBKix7Vix3vNzMvA0QPp5W0zyHWbAf+9Zi6AWlHScvVSNSXLTxpw89z2q3918taI/+SzaEwlsQ9BqpMaScONopwe4bUCXi8pkj5qn/t4m0Ur779A1CxpRfj4iaBfasSoPPEaXbWrP6fjwsjM4gy0re15rdKsBHQjLU5lAcxrz1HAZ3VU8ap4JioFW2nxEG2r327B3qfc46Ap9S5C20fJViJWrn1x1ay5HIoC30S1ozY/rcB+7qtzd1h52w3svUzLFxvRmt7AGfYVJd/PSOD+AJnPHalKUNDlzpgJWbCGUWw0vuOOjg2ss9kZyo2R598oId6CrmpNXccrKlpBP1GRF3Sa9YDQ2TecdeQUAwvHrk8ColOFgpx24I8IhTEi6h6TeICKdFjVkdxXeQIX72P/k4glqYafpBgoiEU9YHuBWdk2qKFTkRS5PNvFz4IO+L0I2F5+dGMkq8hhIPCbYaHzUiVB4eEiF5qPVRqOBcPoJkkUKq98lyC9mjsiEMI1OJAN6A+L0nSJ1T76kcmjlFWSphWn
+    SHARE_OVERLAYS_GIT_REPO: AgBkEw0W0PVMfu4uX/0Bs/FiBq+PRzFjUSXnDS3Wk4rFmMebF5TgJgfLQS0iCkUljuM3CeLxzDxLzAugK6DIjEah8vVFyovCju0+WkrsT7dju/KcsJ8q+FooqRaOkNa/sC8LW5vTf0AUnFSXQAIzEj8kXfqwwOLO0be3iJ/3FI/LL6qN1aLsvFZ6QRJFqpgddSkIyQJMv2rnKM9L0WTfU8RXQcNuHaAMDBRDt8ncIIIUaBS9gp8qksF+iO4mVEyeBpA6OOrT5vHiX4beaSfXrfdgx6EP4h4Q0PovTiStO1zb/T486ln0vQhDww6JVFLy7BrccE5s3UguHQePwBUzZa8ps1V8tzYDKTmIMMiSUlrvjx72lwFLY7bq7GVaaCGXlQTqORRZ2ZwcCiGEMkYadUurAloaMznuakI39DePG5IW+yHXb+aHR73CdPG+XLgzcPArf1PbVn4XG8EpJXuzCSEyLatWLMrDjfm/2n4cdXXiuFWvWCviYLvOUPL+NeKE3BH/5DQaeAqF46k69EPby3VRHLbMjN57+kA8RTPBVOovYSXj0R/7h+EjgS7tsL3Sb44Xoa+QaYlLKS+d5wdyXttCbKN5QkBTTpTX+8RxXjUVWCXskCpgBvR5e0xsz6TsJxqPOgrBO8IgpCGK2NnpP/6rPwt0/fELJcvgl5PXvLveBOQsvSzoC12y3xHS7qinU7RH6vqAYcbewuNb2xIOHoDO7FYZiYqLVkS0BHnjHkL0ccq2tAnDJBxGlWthDIaVZA96WpEERM8=
   template:
     metadata:
       creationTimestamp: null
diff --git a/jupyterjsc/z2jh/fleet.yaml b/jupyterjsc/z2jh/fleet.yaml
index 0033d2f668a3f617c0a62ddd766aa10674d6bd74..cc2c3d0601af327a1324be4b6cf44a972622080d 100644
--- a/jupyterjsc/z2jh/fleet.yaml
+++ b/jupyterjsc/z2jh/fleet.yaml
@@ -13,10 +13,6 @@ dependsOn:
       matchLabels:
         app: postgres-operator
         component: namespaces
-  - selector:
-      matchLabels:
-        app: postgres-operator
-        component: databases
 
 kustomize:
   dir: ./kustomize
@@ -49,17 +45,16 @@ targetCustomizations:
     clusterSelector:
       matchLabels:
         stage: production
+        maintenance: "false"
     helm:
       valuesFiles:
-        - ../../base-values/image_fixed.yaml
-    kustomize:
-      dir: ./kustomize
-  - name: staging
+        - ../../base-values/image_prod.yaml
+  - name: production
     clusterSelector:
       matchLabels:
-        stage: staging
+        stage: production
+        maintenance: "true"
     helm:
       valuesFiles:
-        # - ../../base-values/image_devel.yaml
-        - ../../base-values/image.yaml
-        - ../../base-values/testingExtraConfig.yaml
+        - ../../base-values/image_prod.yaml
+        - ../../base-values/maintenance.yaml
\ No newline at end of file
diff --git a/maintenance/fleet.yaml b/maintenance/fleet.yaml
index 010c1c19ebd3ed2c2e3ab4a3133c6c914e6b6776..a3e0bb516302e264088d3b87a4aa04ffda246fec 100644
--- a/maintenance/fleet.yaml
+++ b/maintenance/fleet.yaml
@@ -30,33 +30,19 @@ targetCustomizations:
         stage: staging
         maintenance: "false"
     doNotDeploy: true
-  - name: staging
-    clusterSelector:
-      matchLabels:
-        stage: staging
-        maintenance: "true"
-    helm:
-      valuesFiles:
-        - values/overlays/staging/hosts.yaml
-      values:
-        enabled: false
   - name: production
     clusterSelector:
       matchLabels:
         stage: production
-        prep: "false"
-    helm:
-      valuesFiles:
-        - values/overlays/production-prep/hosts.yaml
-      values:
-        enabled: true
+        maintenance: "false"
+    doNotDeploy: true
   - name: production
     clusterSelector:
       matchLabels:
         stage: production
-        prep: "true"
+        maintenance: "true"
     helm:
       valuesFiles:
-        - values/overlays/production-prep/hosts.yaml
+        - values/overlays/production/hosts.yaml
       values:
         enabled: true
diff --git a/maintenance/values/overlays/maintenance/hosts.yaml b/maintenance/values/overlays/maintenance/hosts.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..3ab4baf9834ad3cb6035b1512c8660ea52538778
--- /dev/null
+++ b/maintenance/values/overlays/maintenance/hosts.yaml
@@ -0,0 +1,4 @@
+ingress:
+  hosts:
+    - host: zam12185.zam.kfa-juelich.de
+      secretName: zam12185
diff --git a/nfdigeneral/custom/fleet.yaml b/nfdigeneral/custom/fleet.yaml
index eeb5e4fea7bc837427c910cea40fb94ac98a4918..aadcb39809cb65e8a46c0867fc44d8faae294b1f 100644
--- a/nfdigeneral/custom/fleet.yaml
+++ b/nfdigeneral/custom/fleet.yaml
@@ -14,7 +14,7 @@ helm:
   releaseName: nfdigeneral-custom
   repo: https://kaas.pages.jsc.fz-juelich.de/helm-charts
   chart: jupyter-hub-customizations
-  version: 0.15.38
+  version: 0.16.19
   values:
     fullnameOverride: nfdigeneral-custom
     global:
@@ -37,10 +37,6 @@ helm:
       backendServices:
         outpostKubeJSCCloud:
           pollInterval: 180
-      announcement:
-        show: true
-        title: "Upcoming Maintenance - 20 Mar 2025 08.30 - 18.30"
-        body: "All running JupyterLabs will be stopped during this maintenance."
       services:
         defaultOption: "4.2"
       systems:
@@ -53,10 +49,6 @@ targetCustomizations:
     helm:
       values:
         customConfig:
-          announcement:
-            show: true
-            title: "Jupyter4NFDI - Staging Instance"
-            body: "This instance is only used for testing."
           systems:
             - JSC-Cloud
             - MPCDF
@@ -71,7 +63,7 @@ targetCustomizations:
     clusterSelector:
       matchLabels:
         stage: production
-        prep: "false"
+        maintenance: "false"
     helm:
       values:
         global:
@@ -93,16 +85,16 @@ targetCustomizations:
     clusterSelector:
       matchLabels:
         stage: production
-        prep: "true"
+        maintenance: "true"
     helm:
       values:
         ingress:
           certmanager: false
         global:
-          hostname: zam12185.zam.kfa-juelich.de
+          hostname: zam12154.zam.kfa-juelich.de
           # hostname: hub.nfdi-jupyter.de
           baseUrl: /nfdigeneral/
           loggerName: NFDIGeneral
-          tlssecretname: zam12185
+          tlssecretname: zam12154
         nfs:
           path: /nfs/hubs/rke2/production/nfdigeneral
diff --git a/nfdigeneral/specific-secrets/overlays/production/frontend-git.yaml b/nfdigeneral/specific-secrets/overlays/production/frontend-git.yaml
index e84899a5469e891b79d9da2e4cecba5cfd4e10f9..ce55b3c5ccddd6599ab30b19b007aa1bf0ff6510 100644
--- a/nfdigeneral/specific-secrets/overlays/production/frontend-git.yaml
+++ b/nfdigeneral/specific-secrets/overlays/production/frontend-git.yaml
@@ -7,14 +7,10 @@ metadata:
   namespace: nfdigeneral
 spec:
   encryptedData:
-    SHARE_BASE_GIT_BRANCH: AgCD9ShY12GgEQT7OC6ObBL559kyC3Al5HfzPGQtbNLhghqNyQyfxnn3AO+m6bsDnb3j9Pn6h9bdl+TLkeR4UBu8VlBwolJ62M8MQDzK42PfMZgb1E2lKiB7C1acTP04eDvslzIk6hzLfTKgU2H2akWhqtN0/9efPAXR1bGVALYPgKJ6MocFkcNF80JUlM3KZfpV0rxdFeAbAhhCSEGh3WPIh7VoM6uoTiU667RUgtijKLiX//gZT1VwbE7cOT3x5zjiKBPrMD1/cBsTFYXByAmvWvHu8TfhnmSaRxHMFK2jhWxQ4sOB/dnNVZgJZ7RwvgEx3PqxcizoxkYHe+iN2Eu5pqP5DQX++s2gIwnpEjBG0ljYf0bQLoG2k49qAi61+MQJogo7r0P+oX9Lf6JaU5tPzPe6ds4b4Yvarg0G57Uq8OqTW0R8yStOFYOMGSpFih0HdP18bANZwY0m+lp2IvJSgMoQbnl+/FLam9CPV4oTn/TDg7DaKr85pHwfUXUszMtFT382AZ4h1UYwIaau2Xh1zoomw+IVhWESEFrNLFM3eABwkR0Jjv/BI7u/QdH+NGq1eRiAcrl0t9dT65qcUF9dMQx2PHLAKrSDI5a2KcBDYgKkjZZIhrPaLcTIZ0XGFe3F/DWHFkoYWYa/dBTnl0ahLt94yLwE2HNiIJXdmh2bTRiH4BRt8cZQVup2wL0K7+59ojFytrxcDHWlRdKEZkMTN+qdXsPntt8PlM91S3Oyow==
-    SHARE_BASE_GIT_PASSWORD: AgCVmGSTlkEiYO9NNRYjCsHrEW5jS0sDcpEnG/+8xJ83ONvO3DDnCDU8LuqWJVyFhUEHgxYlB33DJmeTLNcFSrjfsdFPKGUPw6kV1iIXaAZPr6NSjVnzRnvZoACE8r5PfDifMIC/lw/g2jMZWIUNvmgr79Oq4IcZIuMOg9GrNPp4x9SiuFqpU3dnzcKj8uHlB2xPxty6V6VzZIMp6oG0GrjcyDhCOq1HUAeL/5NQC2A+Ivg05CLSg1tPDPuqu8iy/M/784ojrw2JP2OpfjpOevC/c6hp2WhTIZC5zx2+oOlkhUJ4VEvBCT1azDbOyjv17R9A+ZyCQkZcsTDqOFe2KD+opPn/5d28d5xgevCp/DOizoCiZXTlYoQs2hPkaSSgNjgMlS86F+QCZ9yOgaUM6FPMHboDLrUfywE5upKmxSlP5MERhNEYoXDZfz1Bvl4R5b5bfD64M0HPeRF2zoRozLh7b/TxS+fueLSJz/7hkGWS5M19AJbogOAANSMFtBh7FJ1eKF45902Fp/2SOtpZVasD4a8kJdRM6+o+iYYeNY+9XWVeZJlJ2Sm4GABALMvFoTfxKvC2gt0YL/8/GQ6b9VbZD3wPtHG3OQndBVB5Gf/Rn0YvjflR90q+oWldCzIRBbLkUvN6zfQjNGMr+EL8xw3mhccfZOICMyg3NlhqiRI5llpnm4tcoeWLJj92hPn7CC9WT28Xe74cjOwlifM7t0HMEfcbZA==
-    SHARE_BASE_GIT_REPO: AgBmSMvF9U3whNcohHpL2UQNJdzTHMuKwVlqOrO2j2CvIgoq2+5rCZR07dYFIitaQtqH0+cOSloYRF2KVJCKuopIdU7OiZ10+Fc1Iho138K7SS7b3+uL3wFF0vSDI+FR7HpC+nEcWM1gyXWhKFxE0tSAJ65l2Dm92/SDuHokRpj854pPutnLSNzo23vFjPuMXHMSC6LO2/4wwW0dGft5peZccA+nVHAUiGu69Qg27LtyYRg3nW3Kx7cZfoxOrP7Ak9vDcrfklw8V7TfwBfZIrjuWWvvO8vj7bBL6lGsNv3mx+weDhVLzqE2Yy7Ln9hd9zJNZ4PTVArgBwLiolc4eVtOW4ysG02lUXhzqdvCo59OZ1y94vpNQti7q4VTF3HRbAYaXFWvXYI070ZrVZaP8t/MCJZ0epJyMJCp5lItgiTxTWK1oOGVkdWKcNdkmdcqf5BaeTyP1Wkl6yWpCCuFnWm7UlFWniYa5LiI4fwoICOwZ/W+k0FUSUtW/PqhOl/me+sKkfgt2XDfL1ZKa+mtfJKlwN9wGARSvZhLqC1xFrnyiEmkJigRoFYcdLzgWaFr9ww/Y1VJK6/nopd7KMaa36G1TJHvidnXe0rkJyezb6zzTxnZXGuQiuc9ASEZ4uXsK1YNlXIEjroo9XrlQ6YIvFp8cive4Yo89B7oMYDdCle4SoyC82VQBjLzOpfm9xwK4I2F1vv3yD2iHOOyICIt34vS8KtHVOyudR+iuLB9UQnoy+Vmiu5zfx/14bnz7Rq2SexiNCyP5kW8UfASM
-    SHARE_BASE_GIT_USERNAME: AgACgRY1dIbBJs2OKkNDkgU/Jnv/yrwfh97QEuKcKnkFyjljK4F1GT1vMZJJrq1RmJOc6bREBzqQBmJiPHhdXXyvb5Km15yHiTmXdXjBR9o97tmiPhC2Ryldo6ETj5ioFQOaz70Tp/AD9FMX+jZVsmwyjoEi6HGRiRvFI0x+np19oWY97utWJwNgx0ak7XfnhZLC9M+MUAfTvLIfFeUQz4SywRwkZMedPMkVOMLkOro8xBpPGlG4rgCVBJy8LGowdjDAJtA+ACTTylBFOmSrLQqkcwpRUHApkF967qamCjVl6orKtMNzimxMTsJFUYBcfsCwtjvwCcgvCNVyOOHFoYz8/ll7MIDyQ7zUT3ka8XxsaUsinb//xBW3r0e5HcW86NgQCxb9RkeVKGbI4utBvAqgML1BeFZj/KU+zvj59xlYKIGpk7mBFhhO+uj/Hmw7APOYPKx/N6I4j7gCTLZLNGqxsUN4o/8hWi/EEax5tFhb6Otr4T3NcYYTiAJeQUdWUG697V+DqyZrXFSpQlr1z5bmb/VGOXsD8VXSla29OroxKIaHkm5TuHPOzHeJdM95Qg+/Bdlkll7VABIuPNaPfTrPI/L9EYOyxf8J2/mxUo6UpxQT8QwOtbWyz4l0/rxwmUsuR09YZicvlKLlwNB8IlG7O+pz6y7Z7kvSODmybxn9Cgio5JyYhmHwIRGDwrnRgNRuY4vtiZMkmj3WHmfuAhbQHps=
-    SHARE_OVERLAYS_GIT_BRANCH: AgBtG5ab++lwQ8//5VCW5tW9CpeG7mVfOIsH/ayebRuIF13NbRB+X444nH6UAiuFml4beIy/vZd8WPvQaBM13YR188P1xBxZJ2htFypvEiuvYu4o0FOURkSe35AVFN9a1Nr+7eKvWoPqrbJJW7uuNpoHUzHAMggVcWI2b5m3Ro83AQP64zEnuk+lmX12WZt37gMX/o8QumfKDNLbczdE5Po+44ODXm8g1dBw0iT8CvfU22wBu98Mrw+ywWpQIlWfaLrUqDls1PCM+2LxKjQ7HJcBJYSUo4ocyUEYOoJW/17daSpns5SwN95FyyO4XkscMITOm/QOdUWz0I/f87iBNRnBg9abZ5HilJ3F+4XognCBl9oQVlUcTFWDPdCv3ThZ8yt7nJGhaQtaWfVyXhHIkRNCeF2oF9vOIG+kmcVeOcaeGN7rCrNZitmrqODoSbkuyqVZDX7dgEOg1MAHasjNaoObUtkx7seRz067U1t8w7D7vt5KJSgD8B3m4OO3YbDiorQepCsVIo2yKChsf7b4KfouAuIWl41VEf2sJ+iL98lpPxTbmn57qhilnIJFlPuFh1NB/Ngq1+tJwY31j+7CqEcnqlVX18NNqMIbKvmptj8C809g+Zj7OdwVjns6N6LYSnsAJcd7CLdzGu5j0NEpkym9MIc9Oe6NqPEGbAL7vm4EwWPkPFXg2zLO1DdN1cx4JYU5Ix8M7Z0BlFFL
-    SHARE_OVERLAYS_GIT_PASSWORD: AgB07TNoD2ngaPIRfpv5ELIxWxyyDFsUZkWWEz9qPGaWaw1S3spFSxVpQTxVh73t5PWAsxsmY5zRySbeKT6z15Eb2GtrXwIOZlz3txRONCiP2R03zjcgAcu0MzO/0csc3GHjdpyy6S3eGya2WfoYOZyPftTrhKTR5dWu9b2NbFAm/mJkHkZhvB9wBBYI46ztc8++7dNOzLxZDgSWSqQhj/EsEaJiDPW/nclDc7oSN28ONSBOdAYVwaHezZ6raAeo72KpiaKLWm4qWP1p6YJcCjRw8ws5Gk/e6fhJYlaV1ejnnZPGxDyB4WH2y+XVdHCfABpeDwzTi85s2/xKypqjjJHwjRP2gHCtl5RRTzsu+3FoQTT5veqG1xO3IiV8qQrrYhx1WeVqyxqXfF/8V2MpoWd17Fw1Vjj9YwCVDSyO9zuePTh9YVUrInthMc3x5iaoU/clkQ7ZZFX5MKuUs3Y5nfbe51OQyhEmW8Itt+tPwMcKt9T2Dm/u4xrRRECRiQcSfx5FAFiv0djowbcna3v08EKAToxNKuzNbrvMmjEqBcIi7wp4B5lwB4TOBhDke7r7KaKgJ5ueUnqfHDegyEZyvzdKcTZKqkVTx3qizkGkU7kTIgvKKGxkPkJ5dON8mbXGkPduGAzPxABZSGrQoMti2KLLRNDEvgYyqClHzx50uKCa20ZaXWnkPVgfV+6/Fqv9MZgwcKX+D8+kkniruChQt5zCO8wJmg==
-    SHARE_OVERLAYS_GIT_REPO: AgCSkQRUrR1d3wnwtTJjTXwWOzll7wOeZd7xoqI3sByidxcd58Xwgmjg8A3iItDJ334VVkuyWV1gJuPqFaBvk3Wg+/PQHFEXnBva4pzENNEPNgOmLQXohaiFtTMds+DP7qm+hJ87nSJWAEKDF3Z7JW81FaiVnvA4JOnW/zlgTliCg6g5Hx+MnImyWEK8YFAN4itOhHfHwGkfjYCTzTpTtUWAJntGKkYb2zakTWsa1E3mt7GyMe5PxlkXjz0Ddu/4saFafTgQwIGx9fpU68ULCf3bz488lKE2F2VGIYM2CP6tX8TZFmsct4wj+GZha6sV7CYt/adIKKKJ/TiS6KDsl52h+wgpMpHEQNqHBFbInfvap408sLxA7jeKX1kB3H2KSE/YMbZpU5Ub4825LFb+YDjsXrTSRCyaqP0mjRP/eeS34CEEP7RdbI6NM3KcYdWp17sA4lboI8/LkU4A7nzzcIS+/Z5VqiskFU1r4du+S57cM7/p3VOUQsw3n30mC6DOpg04sZ7Iw4QWbG3QVJr9zMJzqvoCoEu5EZmj0bDp+YKMHmo6ahqaBYWwlRcP5G4zkri7OgFM7J6EXjexD40SDbN7EwEvD9BMLcYCl93narg01l94DjQMP1wiJBIFiNBPkMad6rLHU9X84ulugQR3DO5Xx7wXteRPzrXpVfON6XXNFvPjnVXkatY2A4Pb+xWlfWXhjwy22miQKhDGWKJRzTs1AxyFcQ7Z883oITwLpCOtzN3uwMzL/yybP++cLrm2L9MINpHLLSyDdLh2
-    SHARE_OVERLAYS_GIT_USERNAME: AgBCseZqAIl2K1YdCzkilLw2QKx6DmApEEhx3hQiucOXaRAYLK+3dRv1/2ViUtwoLVpBCm+vK7t9UqGXJfmKLaZJP+2jvu3NIEb2SW2S1CMdrgC1ZE31sZ52hJj623dTXb1ndwwDpU6eknaexWwFgbs07+OoaTYisagOJ6zFwfwctxkGQIlP/273KIVErVZjw9QrNQOfVN/Pmd5pVnjcREmEdL0MiiJGKiSDvLQA6k5UErn14DksyxEnE1XDjSuRhdFvcEztKguIe723beP63pDE9UcXAiSdfeS9MEBMQ2m/V0RDt4PFIqtH4mVlw9Uu5neEjw1lnq0JxO/ltjRO8IWx9DI/+N1pP+xClkiD8BIiqSzDtKYL++vVx29aJc4IL8Bp45H5hq3UC6Z1l25bby7aMKFboSZqBx2uK8bkmSKT7tnnDXZ4lk0uzpfpcwtk+eCuQRj58sNyf/ao79/O14BwMI02Gi0W2Ta6daScMriFGcNo63cM86j3BjPGckGQfGM4KVgg5cWtQrwUeSsRmlUw8ouTvKVq91lnWiTf95OhOok3iSobtghx3SlFKZnGFHS3UhABua0h2DK77yi4N+H4ylROX2uYnU7WDS7wdj1r8daA+FsdG1xqhVnwtk0hCoKi14v1FJDYeZHa4A1mZEktDaoTJUZdteGqMa1WY/nOwiWQ6FUirk4SKCvlSSzeH5f/UaqFTIKSK4WeBMmjnxU9n0VIeyL7
+    SHARE_BASE_GIT_BRANCH: AgANlPuedzsubdr5zbsjxBM9IleqYln7/mytepHuKcLT/MNfhuISTo2N2+7qhAGHi+gU2rRcaqIpNvLQKyJVAmf3/kMX39fH2snSem8QkW6XFI30gryNnzCHVornt+ei9XF/Dp3wPk/a+xmY5Wff7g04F1XbLOU5p5ElSoY2wJkQRRrSFam2s8MDKTrz8Rju2aTjpqxfvFY+v1Ncd0J3a+EqZzJQXTBuBCndPvuc8ZTGZSL1NipTxFjeww3qPbBHMLnw7nOCPHS1sGV41O0MS4VZKxJe320eNt4ZvFWwucDd2IKYuSZQN3sDueeKW6Mptpfcq2HBfRAZ58aoVpQKlOqE7xMYAv5krgAn8NRSyJo8Ljj1MTesuNSfruc5lpSIeVKmgfcS50x3Imbata3lrHkWqvnycdV7jmjfx92d/AHIaCzIuJOv6vVreUOHSg0TYrDpdvfi5q4SeAnrTdRNEUui9H5rpXphnrxJiD2unw5IrAbpa4kLJJKSZxjjZ+GdbcSzQAesmsEgeyExo8CEA7MLU44UPZB0y6DlnO1IPE6BVRr/ax3/1Ra3FMo48IT/mvSyPXgs5gHNM+06o1cdMPloxR52WCaLyMSA+uUnXJeFFK1Qdpz2464Pk4ZmCpc3pXxt7NZ8gnYKoEFJts7YKm6h+sbvBpCmaDDzH/fSoh7QQflhd8OPwuYvYpo1S3QzI9FUipYHtMcl59Nm
+    SHARE_BASE_GIT_REPO: AgAF002Y7FQ4UgMTSiEYVFmWJCEhr7m+vZeo9aoKlQgna2tb5CfkdHWvSq/rbj4md5iCJlekZUAsEo3To1VSgoZHFxr4biUyPKv8sNlINjHWzUDnjUHCbb5+smKuyKsB20LtWK8eWgHZWYDgpAJRAMv6n1c8Svyh3HWHiWJLGWfTm+eteD+ITyuVckKXb3g7HWLt5gx8upMj8X8fya3r6Vg6WRAWiwAZ7rln51V/iTUJH6R7UrK9g8CIiSKRXYrEYM4IzZqgdTkSTPWBgznRzqP61Dzy9Xx5jf1hPhBFI0O2B/zg/hfICpttXxBqDVyGs553+33AerNdTJBx2LAE9fFKYPaB0t9i/zsqrFuoVwY6ci1A0rtNtdPrudaHrZx5lMJk2oZdQC3dY7vsLhMp4tF1DXCTeRfuuOEl2RuOOboAIwWNbb8ZyaLdzo+uQVVj3+nKJg0lLDI+oph8G3lwXwXHE7NpunYjJCkB+6ymxYry14usNyge5ybrVDJRyhml1tqsgSXolbOBPwsLM+6sXJjSgU29JO9XLRzTWyk/CRPfxX4QwIURGQeIHTbTBkP4zfNdxDBgqBaILiwvrV6Qs/oGa6CaWWKbJWmu2Gcx5eZx5lVcQ9cU1ssRpkIecf+GBuqs7uYzi7Tl30ITTXu+Ac3dMhVhrHbu+gl9896Y+CJtZGunRYETXXlOSyeLQ0B7frhP4c8JtiNt4lVarglY5TjR9cfhl/MHPPV0eYF8w69VAPNNBkS8waSWzRXhlcXS1Z4=
+    SHARE_OVERLAYS_GIT_BRANCH: AgCLZd/6nE4M3mtO4EZagfyLLeuuZPksuwFcNb63y+zN4DWXomE32dy9ouDJvLxnAxR9HKCyCgvbbhb7LtRfM7vsX2Y649txkrOgddB3aIYahAIiIOuwayw4uVOKvnICh2Ty/D05M8tFHgka7aAUOnBvS4gmekMX9G/NE7Ougzcoh2kAb7xJcvceAZfomQU0ATv3qBN+SvZE9LmtgmiYIlwwFgaoxgJXb7kaSIuePne5xeI6OpZmkQLBdbk76Mle0ugQlS1SD7pszGrXVPhyXHQWC1yMV/gvwSNhylJVaH09ZLutXqN8iDwaSsP/MJScVM4ezAJ1EuXXiuD5DbrNRnc6dqrHzw42S68PzZB9DO6Rpe9qVkjMGAxpYISXYSa4HnukGF5qiNhxngQ3fSetz1qWH+xWvnD4fq4c2ex+neIGZU6hri1b4e2yQHRD/QIo5Bt9SEMGWQdcXlB82R4cAImhGojdXhrUHXEB/jXd+OswPXIygCgnGSUmyL4rJQ/CBcgaFjQD247w0H1BM3DjA86cUBRLRpI6Am+K3dbRwF76NQJtIEAFSlVkJsTUnhOeBD+XJEOc2W/hYROxzamfjYB/Oy+5fv7VU0i6h4GacF33GTpqiEAa4DhiPr8zLBG/W8IUmZHSmfmeRB3LmJaKM+PlHy6AzdHSLNdEBfe48bXmT1To6FWO/bllEcrsGJEE0jIK0H0GGzV7pk1F
+    SHARE_OVERLAYS_GIT_REPO: AgCizYWONRcrbYd/5fiwnaSErhCEaXR0GiqGwuTE5Xxjxbfxc3LUStVfctBfOefU+bcDH1TT6RuQdQrKFK8qedIutDUbxT7RSSIu7Tpuez7MbT0E7EldaNbvLcv23TLwxrwm1vVtC+pHlDkTKgQiJE/ZzLBKP/42BaV5b2H4kRoO0qluUwW+ROukWudrfb+2ikq0Fv0o/5xqgB52jTrpw07XWd0a5a82zLjLfp5AzGXaRbHapGxAXJkWp6H1XX7OflBKhBBLon2R8yVx0eGwOKaZ89M+FmNoBYdeIQJa1rOaXDW4cjwveATAA4dsmQEjLGQtBQpbrkBthLIQsYaVuC6zj917JzaX5BDAHshxTL7c4FSJZDYAmmsvXgfDOLuVJxXtlnoAvlE4QzM3dQOWgJPg03ZOe59oL/qcgOBw3G9WwsshyIOuBE9g5QXOGDcElTvhbuWjOLXUIE7hdqRGf10IIeEnLCY3QC1p4ywdlOhRolCtdhuvgSXmmkZDh4Vd1bbpiibxrFo0J6wCjTk9BsGv2hLP8tGtbWvfy7eT0dcegcbRs6qTKH1exDlaTYgsjH472En5bI+jUtgphhkaMgxPUrxKdaawNGyuyedEOFIAMqYOX5+lturgBg9dgRN04aAPxhb6qPPem+U+u+8g9oYoLeLQBCm80zlgMcvJmW7KVzS8WWgDWktsA3p4QUHDGPtCI1nLF4LvwVbGar5aVWRO0k9InlQ6ZV8qfC3Ktn1kiegg5Hr+UyPpn88eqH8X8JLjniQkOUI8gg==
   template:
     metadata:
       creationTimestamp: null
diff --git a/nfdigeneral/z2jh/fleet.yaml b/nfdigeneral/z2jh/fleet.yaml
index 26156a45678e4aa702293f7c766620fca92d7cb9..6f6325906bd2ae9d3e5b4cad7b6ef367376cf753 100644
--- a/nfdigeneral/z2jh/fleet.yaml
+++ b/nfdigeneral/z2jh/fleet.yaml
@@ -13,10 +13,6 @@ dependsOn:
       matchLabels:
         app: postgres-operator
         component: namespaces
-  - selector:
-      matchLabels:
-        app: postgres-operator
-        component: databases
 
 kustomize:
   dir: ./kustomize
@@ -49,8 +45,16 @@ targetCustomizations:
     clusterSelector:
       matchLabels:
         stage: production
+        maintenance: "false"
+    helm:
+      valuesFiles:
+        - ../../base-values/image_prod.yaml
+  - name: production
+    clusterSelector:
+      matchLabels:
+        stage: production
+        maintenance: "true"
     helm:
       valuesFiles:
-        - ../../base-values/image_fixed.yaml
-    kustomize:
-      dir: ./kustomize
\ No newline at end of file
+        - ../../base-values/image_prod.yaml
+        - ../../base-values/maintenance.yaml
\ No newline at end of file
diff --git a/portalgauss/custom/fleet.yaml b/portalgauss/custom/fleet.yaml
index 5de43f56b40d9190e56546b3433279d372687c99..fec4fb4dcb371e5e2a98f4b59c0619e60bad20ff 100644
--- a/portalgauss/custom/fleet.yaml
+++ b/portalgauss/custom/fleet.yaml
@@ -14,7 +14,7 @@ helm:
   releaseName: portalgauss-custom
   repo: https://kaas.pages.jsc.fz-juelich.de/helm-charts
   chart: jupyter-hub-customizations
-  version: 0.15.38
+  version: 0.16.19
   values:
     fullnameOverride: portalgauss-custom
     global:
@@ -78,7 +78,7 @@ targetCustomizations:
     clusterSelector:
       matchLabels:
         stage: production
-        prep: "false"
+        maintenance: "false"
     helm:
       values:
         customConfig:
@@ -101,7 +101,7 @@ targetCustomizations:
     clusterSelector:
       matchLabels:
         stage: production
-        prep: "true"
+        maintenance: "true"
     helm:
       values:
         ingress:
@@ -111,10 +111,10 @@ targetCustomizations:
             - JSC-Cloud
             - LRZ
         global:
-          hostname: zam12185.zam.kfa-juelich.de
+          hostname: zam12154.zam.kfa-juelich.de
           # hostname: portal.gauss-centre.eu
           baseUrl: /portalgauss/
           loggerName: PortalGauss
-          tlssecretname: zam12185
+          tlssecretname: zam12154
         nfs:
           path: /nfs/hubs/rke2/production/portalgauss
diff --git a/portalgauss/specific-secrets/overlays/production/frontend-git.yaml b/portalgauss/specific-secrets/overlays/production/frontend-git.yaml
index b486803363da9d96ca36ec0d293832ea21578a74..cbc55b261e2e4dfd4e9b96d970710b06b566d3da 100644
--- a/portalgauss/specific-secrets/overlays/production/frontend-git.yaml
+++ b/portalgauss/specific-secrets/overlays/production/frontend-git.yaml
@@ -7,10 +7,10 @@ metadata:
   namespace: portalgauss
 spec:
   encryptedData:
-    SHARE_BASE_GIT_BRANCH: AgCPeSNl3X1krY5kVlxjfn3D2kQgO7I8l7Zo327/4YnkGgMx9IUgu08tXlIb8YluOBBXQ2aQzQoj1UGTUbbUqI3Uenju6LrTeF7ftxOWV+2tVD+DccIxFuW1L8WSONMLBNPj7UBa2EXXJ+E85F+C5lyIL/yzXVDtNgDB2HLXziLycGvtD9CXvN3ah23aTWGjTomvfRyCp5kkbkgdQFAoAcuPZY6hZW/I5rDFAwBN7FfAucrGDhxp7IZnV4096HUyJD0XP5Y5N6wrmkDGAjeSniDDvPafZdubrq1ovulrL8iRx0GiYByzo98XcmX0iPjG27DVEL4NM+WS2c7txIwTz+y5dIensamdz2NcFUs6OLRnAmidQQYV/imj+b83soTV+uIjXw1axV5pvwlK+PUnvg/MbStP/hjo9070JuPzJz5g04TGgIUMyNfBdigOEqZtrLqvYLEoU3Hi3ANVXJx3O/FSfH7Nw5kU/RCHgqKVOVAPBkFlQTdcsbGQWaoBdNlHOmW7syXZ158/+gZ0DzOcVN5jaW4ZfCPyHCl4z/rYLhg35UWbvC/jijXkpqKo4haZ5Ryl2BjE/ZixjjKC6ta8q5LHDmVXUf5px7/c/jOrIEzxDOfFu9EPASpYG4/XJu+m9/E9sEIlNhaXiEPSsFZxMj1EINTWpUMkO7pIF9TZgORNX2CtkcsX1aO9s5FRmwTySQcgk9WMnEqPMh7IfceUO4fkvty2k1yY5OO8je9RFyyfxg==
-    SHARE_BASE_GIT_PASSWORD: AgA6t/2yhJY1haPxO9rQjH7CHvLGpYJnrQBCsIDhTtao7y7fyuT/WclfrSGMxVHYp62KjCA5m1Z5s2EzTpev82sT+bM3adRs+U0eYR8SGpkATe0TUXGdc7G+7oVFx/11mBn4P91oxFWPi+DGU6kLZFzwrtk+O5d9GzL3LB7n54QKQatPhSCOyLwur3nJ1FgyR74PV1sbirpZCBxdKoJKjy9C9hIEyDCpj4oUmWFAls4mFG/5iL14GlbvFWYNpwdRL6u0IW/2m+8fPtOVjkw0AMQp6foRya/9klj4bDTHBDosfRTpv2jXYvJwYLlCGp4wHUDijPDl/xG541kWHqpfTITwUmK7Bnj9alXsJu5ZM2gYAK1uY0GyWe1ak6cmXcpChOGaSM/iJVevFzITt2WP1lSyUCYL7RPBkqb7BDfvpi7dVV4wUrgsixulXHptYVcEpek6LuuHO8fnkcthXfl5sw/KmdT4a6GbBh4rb28wSFg2Le+JotRDhuGwn0RgAPIIldro435PBHUepHcYU8isDNSPLExSm4sjfYofXM+cagSTqNLD+pgOlZd8xOQq+Gyl9wTPLSpO70Mi5rzOkQu/R/XJakdj7BKLeQRAgo82SmNnCiDU9bfnSRv044/VtY9/zu2GmtK2LoF7M5LHhbZMqIC5XOm7cE9bwNxaTCnBquwu/C7TXNx+cdlOr9MBmv0Cn7kzxsurohtdw26o8UNTBSzkxUOKuQ==
-    SHARE_BASE_GIT_REPO: AgBYV6zwuJnlXWyymm2pf4KrNMpaVKRyQN5SNIEIYcjikV1xAOHUY1pcchlhw/bVf3KNGcBhp7GrCcXewpOSIo4so9XUMsluJxUMnMseQJReo7mX4VVTZ0xQ33asFWKQ/nCUaNaJUGpiLDSZgN4TUnUDaYI4+9Bw2rlM/iNS4kwWZ3cph5/zQWIqFsEti7FItDAaCx4J6u+nSDugiooWYC0xrPCHgNUsrzytc6b0reoB6QyJ9d7WCHE6Nr8Hnswg2FKVmmmgTOopbiF4hHNsCZYRnXX/w2BBjNUbA5SEGChmatG7glDUlXl73D9aQ9uHut6w5pplrEB7WrRHaNLgwDGKLT1pCB2uztFbK75Hj4pWtTgM1msOwALw9Pf5f22zVhCATb73u0IAo1KVveFvUiS7xjq2lm6n+6RBCPMEjJ0sK7Fd4jfrwnwu4TF3kBZ3P8+e7pKFFwASqgAO3ODIUBDimQwLmuMFpXJvuLmQNsoBCAA+fSG+n5JiE5yJrVAk4lYGrbjTL905BXrFoMPAV0Dd3H4PQ9glEkvphVJanFdoDmHxSF+VfYlZF4O8A3mlJgprqguvNInDls+Z38F/w6ekAoTv/WiLDHX+a4YFZRW2S3QXNeKsLs7wucSB5Y4pUWWO/zpYG4JV/bUo39MUhtR2nHTFxe7cOnsDxbOqnvc65yNDYVUYDBZ3PUJcluaWYC5XqMvNVpuDLycNAjSUeo7m3rVS+TlW9WY/kgd5SpVLmoIVHsDY/wg2FA9NNSL69oggRvdSe0TjYHja
-    SHARE_BASE_GIT_USERNAME: AgA0oejHIiJ6qBmba7plBtntRR833BAB9eD1rFnnRIk2NwV1nnYmw/61qoEXEKl10sIOouXULFJVW2Z61bG4O12Dgfi/lfnshh5ccrBAAKaTWsq7sQwJHixK2gxMW6vpqsP8ms2YEBwQwoL0814r9ovKO8O05rdKCQAAe1cnFrnCnwWsxgehILXZjPSg5cLbOjRwWxt3juXAC1kwCfr6YZrX8mMWdCov6FG6l20UydXNLg1kFqQT93dtEIgesXqmJJNoKFOD3CHJqS3jchM13rZJwdJja7SpwWigLtTr98Z1sVfYj6bsI4KTyf4Izxbv39YAIMkk/Sk9zCRP56sRHaYu8dfNyfPYWqcVDgQejhrFW0HVLd10IOyly+a1pMGmEDepZ93YczH05IrgSG/q/4yKAorCytI/AYH9ft4n1gnMG8QbtLvk85R0rJYpWKWo6R+A+D87QHOgwzXxXSDojXBR2gKRZCJ/y255FCjFCp5oUj6T6aRrIfgr8OsZ4/S5YtBKnIrFbqauIB/XEQ5HBxurOb/sT+OoDMjMEg5Hq3NapzhLpuSSd1FJLbKtKpy4YBoQq2huFDFpDEq4+CK7Imf4+1nwTWmqDSpwgpNUZCXyyWFKkeWZ6xMfm+WaTYUHweFD5W0FK/NDgZF5TXweaZNRT7ED11mN9dMxFv/lhCvXpJwRAJ30azgJ7VRCAMl6uxGOOdTe32KesTroDnNlFiAdhwI=
+    SHARE_BASE_GIT_BRANCH: AgBpILtVZYj0Wygtkhyjf9HGcyYNjCw0OQApf7hpxhRlsYMvmrVht3xW9IkSwez0RpXvEaM4A/pm2RW2ATfzsZ15mZ7OzYsWjGNkpdh3JKwGevXsolckOyt2imSasJCBHIQwU7DzEQJqkNCroOnqwhO6A3nntCNwJ6dBjxBZ0nADPmRD45G+g/Qg6ApEe1+9SWMy8y3omTHU/3mVY5IHH3LekWcDWHDkNPShVvkw4F8fGLdj+WW3a68lbYjpVdU5dod0Sxc7S7Zuuctvl8x4RWNU5k1pP4hoJwPb1BYkWxPrcb5zLPufKrigL6nYA06rnX9B/bo5OEilVNfQ7KeCYJAkVigrZzkqYsPRBGdLTcDeMNfh1qY8KIY7q0Dt1zfHJOqkXq4EbeN1la/40b2qkjSMv4V8iX/UbgRKymMKHJWggCYlMdSF1B6IgLKy9l+7pZyE9lFfLuyZK+bz0t/2LIxKD4kWptTSEixqM2/r76lxPUwK0ejEfdBNkmHggOnLPzqguTitSqxev1uuajO4CEoL+68ko2PiIIvAOqNSJh+7JEnEnBrJdr53igk1Xj5uvhuB6Fg+jIWfGfjHeD7GFbjC+DIWMkoJY+OtLH4nfV0vqHNIgwEt8rpoQni1eS/uEnDgTfYJnBwzcJu+KmwgxXi51Ee750kql7/W+LSar4NylNT5skkGJwuq9TUe0smzxA4wRVEk9lwHnVP3
+    SHARE_BASE_GIT_REPO: AgCXIsWtGS0QAYMXbeer7ncEEljC0hXwiHvBBkhheY+t0mR0+uIiUiMTbjaPYsZKUVUMJ4Jencla65IozlMbcGsRfTVj7z5fsADDWL66a6iEX6PIi2WQsMGGSBKtxvSIGlN8yiMhN0vSCzlleQs4opeiR6I1F09yQX3wofWgAqgiEdEAJTBQb60crBLPFodxGQsg+SW5lo2JjveJJpsSZiM4NMONTQ3CVBPc6BLbQ3imn4CjlTEcoQjmMGD1kEOb2Z9td87BOZE8D0A+Yf0gjWisT1voesjQj9fsAXT4dD7xfnRxOjpAyl1WxiIfZqrr0fZDoQGsAg3+ZmEalk2gTG7ax0oOEUBB3r29EqTyxxT3cthba6l31hqGiuw9DsmQUbvvVjq8Z8kGx3kv5WYyDp+J/cHcROMumWCDOeXP547iTef6AURp3M/S7eMQdKR4IOs8jFDuTRm3MA4ZnG+w+4P/3fTE3DDWQQtmH7fYi2LIj2zwn6HmDYX3BCv0Ze5IXrAfq4SkVv1ZixlW1EGLvh5ncYF5n4qKX9+f2o3VE7C6eOZlJhY2NgsUmUoaCbHFz/stcDahmjueqlgiUdMTqnmC2WOLWu4IzSgAKjW9N2hXBFVoqEL7iU5bMqFBYTLp1G/eAUshB1wfXmoLfqPkw7Vm71Q8nBfHZaFQINcQd++RYq0l9rTm4Y3VIjTEypW+XlkKiYIajD0zBI6uKN5oTSFx2Omh0/zQVuJv+bwMznnlDH4AlDJc6brsYWS896hpJVs=
+    SHARE_OVERLAYS_GIT_BRANCH: AgAyTrcMnyXxRTjZV5Fyd9te5yKNKu2bb60ps9ngJf/2F7ZRVqyMFhYlGTVaGOMzvc/iPKSNNayZGsZIe/py8MUsn6ybW8eyRAWf3xN79bSPdX8bY/Lzn+Eej4Dn+bKMAi05PqxaRa/sZSjGvLMNzaRfv34gfcmWkmks0TYYbpDtDZPfk1n+WbdWZVZLT302j7xX8AJwneqY73JXpnPwhX5kKeMBwE0jq2ODSKjcGtqUiAUum75qTA7CkSmTk5OAQpOygXr5ZM6jjKVfnWpXept/LeU3QA95QByD97r7Mbv4zAEeUmquZljuBrta2t9PQ46N4oSwNiN+gAx3Zl9wU8QW/5E1Q6HRehqZp4veH7IbV2rqkoS5bOOSiJrhR9UtdZlj54RpgAMzVrztC7cySDJNHF4MXmflU2x5hlXSMXiWVyX23uMBWbqrou9+iF7R1TmF4tZ80ZwoBMBW/B43gpfu2u7FD1RblsvZfYtIkTjQFs8W8ft1o+SPNDjZtc+zfMnanihpGvbL8RlDvtNCY1GA2cWcvtKW0J0kuFfW7TEIhk6EFWETc82zxS185syNFd2dxNmcTCDG/Zcju6FVZ1UOIEHIEygafh7SuVIiVfTwtI1nCLPa/vzcGXNGcJglDo7e+shUdyXlyP9+slN6ptzWDTRn/32rXft8IoHDVORySOb8Rp7egS6bZ7PtHuFBamwzleAQyHtsDQ9q
+    SHARE_OVERLAYS_GIT_REPO: AgAbzXO3hOd+DoLeSw0B5RCIlJh0TKIIFgXVeiNhqbSUFtG8xO33LBjjP+WTepu7ndY5eUNHrUSHSpD8Q/8WducTW0QH8iIOClfR2k/C2RBt3w2AOtx4Aler4LB5tNJEr5QqdPg2qbjaLBDodbnSf5PMHC4iWDspJaIPwMCaEhPK8s7VV36//uSmhmsCQPZNrMobECnMNosg1M50Xr+If32qekyJ80UMs3FIxFBf+LOm4GnLvmNwVyja4UnIAUicQOJty//dKO5R+UKx0OGxLX0x3qrQHSAHzh4qqmYnhi51wyt6yEkWT4LjzXcRZd8mOyqOzLgDjc69LMHJKNfwdH+DkZkT4ER+L8FMDO8ZsWvWfLiuB2BJHUTGbj6her7pHyVJuaY4wMbnpteH1NeJKFBOadM/iBHwInsPp+4/qzqPnPUEZdX2BLKF0T5YTyMOiv0Sn6lVIkYazasIJ4+4+3LKBrZ8+sn+GLNin5FQe7tA4n08TIpAv+5rjGbfHk6RFFgF4gZJs0Yy5QYRC2IOXI70Iy5th8Dyred4dzzcOoaa/P1FdMD/aRZnfyJhDJLJfAA0XsxH3E8TYNMV+C4AaZrPzIqaZIOQ5UoqCY4JyFf1nskJ6EwumoNjBeTMazu9JLVSyBTv7P3eEZLffT27s17E8Po9/I79Z/s9vFxE+7gogvljIjSntUvLkDXb7vSHjR/3YDMohSxtVHpbC6pvUn1VSCZ++8Q8sI0Q99eNfPmGcEwVjMbF0AnQ/KgYWxFqmxDSMdZlnqGZ
   template:
     metadata:
       creationTimestamp: null
diff --git a/portalgauss/z2jh/fleet.yaml b/portalgauss/z2jh/fleet.yaml
index e895a5404dbaf324685434f2c6995a7cd68735be..b23c24504b49050e49b982728fe5a07d761159ee 100644
--- a/portalgauss/z2jh/fleet.yaml
+++ b/portalgauss/z2jh/fleet.yaml
@@ -13,10 +13,6 @@ dependsOn:
       matchLabels:
         app: postgres-operator
         component: namespaces
-  - selector:
-      matchLabels:
-        app: postgres-operator
-        component: databases
 
 kustomize:
   dir: ./kustomize
@@ -49,8 +45,16 @@ targetCustomizations:
     clusterSelector:
       matchLabels:
         stage: production
+        maintenance: "false"
+    helm:
+      valuesFiles:
+        - ../../base-values/image_prod.yaml
+  - name: production
+    clusterSelector:
+      matchLabels:
+        stage: production
+        maintenance: "true"
     helm:
       valuesFiles:
-        - ../../base-values/image_portalgauss.yaml
-    kustomize:
-      dir: ./kustomize
+        - ../../base-values/image_prod.yaml
+        - ../../base-values/maintenance.yaml