diff --git a/diracx/Chart.yaml b/diracx/Chart.yaml
index e676a408..cc5a7314 100644
--- a/diracx/Chart.yaml
+++ b/diracx/Chart.yaml
@@ -11,7 +11,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: "1.1.4"
+version: "1.1.5"
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/diracx/templates/diracx/cleanup-authdb/cronjob.yaml b/diracx/templates/diracx/cleanup-authdb/cronjob.yaml
index 2aaab402..ffc808e8 100644
--- a/diracx/templates/diracx/cleanup-authdb/cronjob.yaml
+++ b/diracx/templates/diracx/cleanup-authdb/cronjob.yaml
@@ -2,7 +2,7 @@
 
 {{/* Define common volume mounts for reusability */}}
 {{- $commonVolumeMounts := list }}
-{{- $commonVolumeMounts = append $commonVolumeMounts (dict "mountPath" "/entrypoint.sh" "name" "container-entrypoint" "subPath" "entrypoint.sh") }}
+{{- $commonVolumeMounts = append $commonVolumeMounts (dict "mountPath" "/pre-run-hook.sh" "name" "container-entrypoint" "subPath" "pre-run-hook.sh") }}
 {{- if and .Values.developer.enabled .Values.developer.enableCoverage }}
 {{- $commonVolumeMounts = append $commonVolumeMounts (dict "mountPath" "/diracx-coveragerc" "name" "container-entrypoint" "subPath" "coveragerc") }}
 {{- $commonVolumeMounts = append $commonVolumeMounts (dict "mountPath" "/coverage-reports" "name" "coverage-data" "readOnly" false) }}
diff --git a/diracx/templates/diracx/deployment-cli.yaml b/diracx/templates/diracx/deployment-cli.yaml
index aa70bbf8..33cf042c 100644
--- a/diracx/templates/diracx/deployment-cli.yaml
+++ b/diracx/templates/diracx/deployment-cli.yaml
@@ -62,7 +62,7 @@ spec:
       {{- $commonVolumeMounts := list }}
       {{- $commonVolumeMounts = append $commonVolumeMounts (dict "mountPath" "/cs_store" "name" "cs-store-mount" "readOnly" false) }}
       {{- $commonVolumeMounts = append $commonVolumeMounts (dict "mountPath" "/ca" "name" "ca-mount" "readOnly" false) }}
-      {{- $commonVolumeMounts = append $commonVolumeMounts (dict "mountPath" "/entrypoint.sh" "name" "container-entrypoint" "subPath" "entrypoint.sh") }}
+      {{- $commonVolumeMounts = append $commonVolumeMounts (dict "mountPath" "/pre-run-hook.sh" "name" "container-entrypoint" "subPath" "pre-run-hook.sh") }}
       {{- if .Values.developer.enableCoverage }}
       {{- $commonVolumeMounts = append $commonVolumeMounts (dict "mountPath" "/diracx-coveragerc" "name" "container-entrypoint" "subPath" "coveragerc") }}
       {{- $commonVolumeMounts = append $commonVolumeMounts (dict "mountPath" "/coverage-reports" "name" "coverage-data" "readOnly" false) }}
diff --git a/diracx/templates/diracx/deployment.yaml b/diracx/templates/diracx/deployment.yaml
index 30a95544..ddca16cd 100644
--- a/diracx/templates/diracx/deployment.yaml
+++ b/diracx/templates/diracx/deployment.yaml
@@ -71,7 +71,7 @@ spec:
       {{- $commonVolumeMounts = append $commonVolumeMounts (dict "mountPath" "/cs_store" "name" "cs-store-mount" "readOnly" false) }}
       {{- end }}
       {{- $commonVolumeMounts = append $commonVolumeMounts (dict "mountPath" "/keystore" "name" "jwks-mount" "readOnly" false) }}
-      {{- $commonVolumeMounts = append $commonVolumeMounts (dict "mountPath" "/entrypoint.sh" "name" "container-entrypoint" "subPath" "entrypoint.sh") }}
+      {{- $commonVolumeMounts = append $commonVolumeMounts (dict "mountPath" "/pre-run-hook.sh" "name" "container-entrypoint" "subPath" "pre-run-hook.sh") }}
       {{- if and .Values.developer.enabled .Values.developer.enableCoverage }}
       {{- $commonVolumeMounts = append $commonVolumeMounts (dict "mountPath" "/diracx-coveragerc" "name" "container-entrypoint" "subPath" "coveragerc") }}
       {{- $commonVolumeMounts = append $commonVolumeMounts (dict "mountPath" "/coverage-reports" "name" "coverage-data" "readOnly" false) }}
diff --git a/diracx/templates/diracx/diracx-container-entrypoint.yaml b/diracx/templates/diracx/diracx-container-entrypoint.yaml
index b5ccf582..f3f38b4b 100644
--- a/diracx/templates/diracx/diracx-container-entrypoint.yaml
+++ b/diracx/templates/diracx/diracx-container-entrypoint.yaml
@@ -7,17 +7,12 @@ metadata:
     "helm.sh/hook-weight": "-3"
     "helm.sh/resource-policy": keep
 data:
-  entrypoint.sh: |
+  pre-run-hook.sh: |
     #!/bin/bash
     set -euo pipefail
     IFS=$'\n\t'
 
     ulimit -n 8192
-    if [ -f "/activate.sh" ]; then
-      source /activate.sh
-    else
-      eval "$(micromamba shell hook --shell=posix)" && micromamba activate base
-    fi
 
     {{ if .Values.diracx.pythonModulesToInstall }}
     pip install{{ if .Values.developer.offline }} --no-build-isolation{{ end }} {{- range $moduleSpec := .Values.diracx.pythonModulesToInstall }} {{ $moduleSpec | quote }} {{- end }}
diff --git a/diracx/templates/diracx/init-cs/job.yaml b/diracx/templates/diracx/init-cs/job.yaml
index b29dc4b1..23a38dde 100644
--- a/diracx/templates/diracx/init-cs/job.yaml
+++ b/diracx/templates/diracx/init-cs/job.yaml
@@ -3,7 +3,7 @@
 {{/* Define common volume mounts for reusability */}}
 {{- $commonVolumeMounts := list }}
 {{- $commonVolumeMounts = append $commonVolumeMounts (dict "mountPath" "/cs_store" "name" "cs-store-mount" "readOnly" false) }}
-{{- $commonVolumeMounts = append $commonVolumeMounts (dict "mountPath" "/entrypoint.sh" "name" "container-entrypoint" "subPath" "entrypoint.sh") }}
+{{- $commonVolumeMounts = append $commonVolumeMounts (dict "mountPath" "/pre-run-hook.sh" "name" "container-entrypoint" "subPath" "pre-run-hook.sh") }}
 {{- if and .Values.developer.enabled .Values.developer.enableCoverage }}
 {{- $commonVolumeMounts = append $commonVolumeMounts (dict "mountPath" "/diracx-coveragerc" "name" "container-entrypoint" "subPath" "coveragerc") }}
 {{- $commonVolumeMounts = append $commonVolumeMounts (dict "mountPath" "/coverage-reports" "name" "coverage-data" "readOnly" false) }}
diff --git a/diracx/templates/diracx/init-keystore/job.yaml b/diracx/templates/diracx/init-keystore/job.yaml
index 700725e1..f24f5eeb 100644
--- a/diracx/templates/diracx/init-keystore/job.yaml
+++ b/diracx/templates/diracx/init-keystore/job.yaml
@@ -2,7 +2,7 @@
 
 {{/* Define common volume mounts for reusability */}}
 {{- $commonVolumeMounts := list }}
-{{- $commonVolumeMounts = append $commonVolumeMounts (dict "mountPath" "/entrypoint.sh" "name" "container-entrypoint" "subPath" "entrypoint.sh") }}
+{{- $commonVolumeMounts = append $commonVolumeMounts (dict "mountPath" "/pre-run-hook.sh" "name" "container-entrypoint" "subPath" "pre-run-hook.sh") }}
 {{- if and .Values.developer.enabled .Values.developer.mountedPythonModulesToInstall }}
 {{- $commonVolumeMounts = append $commonVolumeMounts (dict "mountPath" .Values.developer.sourcePath "name" "diracx-code-mount" "readOnly" true) }}
 {{- range $module := .Values.developer.mountedPythonModulesToInstall }}
diff --git a/diracx/templates/diracx/init-os/job.yaml b/diracx/templates/diracx/init-os/job.yaml
index 8f4e3501..e47d6137 100644
--- a/diracx/templates/diracx/init-os/job.yaml
+++ b/diracx/templates/diracx/init-os/job.yaml
@@ -3,7 +3,7 @@
 
 {{/* Define common volume mounts for reusability */}}
 {{- $commonVolumeMounts := list }}
-{{- $commonVolumeMounts = append $commonVolumeMounts (dict "mountPath" "/entrypoint.sh" "name" "container-entrypoint" "subPath" "entrypoint.sh") }}
+{{- $commonVolumeMounts = append $commonVolumeMounts (dict "mountPath" "/pre-run-hook.sh" "name" "container-entrypoint" "subPath" "pre-run-hook.sh") }}
 {{- if and .Values.developer.enabled .Values.developer.enableCoverage }}
 {{- $commonVolumeMounts = append $commonVolumeMounts (dict "mountPath" "/diracx-coveragerc" "name" "container-entrypoint" "subPath" "coveragerc") }}
 {{- $commonVolumeMounts = append $commonVolumeMounts (dict "mountPath" "/coverage-reports" "name" "coverage-data" "readOnly" false) }}
diff --git a/diracx/templates/diracx/init-sql/job.yaml b/diracx/templates/diracx/init-sql/job.yaml
index 19dd7844..73824c25 100644
--- a/diracx/templates/diracx/init-sql/job.yaml
+++ b/diracx/templates/diracx/init-sql/job.yaml
@@ -2,7 +2,7 @@
 
 {{/* Define common volume mounts for reusability */}}
 {{- $commonVolumeMounts := list }}
-{{- $commonVolumeMounts = append $commonVolumeMounts (dict "mountPath" "/entrypoint.sh" "name" "container-entrypoint" "subPath" "entrypoint.sh") }}
+{{- $commonVolumeMounts = append $commonVolumeMounts (dict "mountPath" "/pre-run-hook.sh" "name" "container-entrypoint" "subPath" "pre-run-hook.sh") }}
 {{- if and .Values.developer.enabled .Values.developer.enableCoverage }}
 {{- $commonVolumeMounts = append $commonVolumeMounts (dict "mountPath" "/diracx-coveragerc" "name" "container-entrypoint" "subPath" "coveragerc") }}
 {{- $commonVolumeMounts = append $commonVolumeMounts (dict "mountPath" "/coverage-reports" "name" "coverage-data" "readOnly" false) }}
diff --git a/diracx/templates/diracx/task-scheduler-statefulset.yaml b/diracx/templates/diracx/task-scheduler-statefulset.yaml
index 3e484582..4b26afe5 100644
--- a/diracx/templates/diracx/task-scheduler-statefulset.yaml
+++ b/diracx/templates/diracx/task-scheduler-statefulset.yaml
@@ -70,7 +70,7 @@ spec:
       {{- $commonVolumeMounts = append $commonVolumeMounts (dict "mountPath" "/cs_store" "name" "cs-store-mount" "readOnly" false) }}
       {{- end }}
       {{- $commonVolumeMounts = append $commonVolumeMounts (dict "mountPath" "/keystore" "name" "jwks-mount" "readOnly" false) }}
-      {{- $commonVolumeMounts = append $commonVolumeMounts (dict "mountPath" "/entrypoint.sh" "name" "container-entrypoint" "subPath" "entrypoint.sh") }}
+      {{- $commonVolumeMounts = append $commonVolumeMounts (dict "mountPath" "/pre-run-hook.sh" "name" "container-entrypoint" "subPath" "pre-run-hook.sh") }}
       {{- if and .Values.developer.enabled .Values.developer.enableCoverage }}
       {{- $commonVolumeMounts = append $commonVolumeMounts (dict "mountPath" "/diracx-coveragerc" "name" "container-entrypoint" "subPath" "coveragerc") }}
       {{- $commonVolumeMounts = append $commonVolumeMounts (dict "mountPath" "/coverage-reports" "name" "coverage-data" "readOnly" false) }}
diff --git a/diracx/templates/diracx/task-worker-deployments.yaml b/diracx/templates/diracx/task-worker-deployments.yaml
index 0be02d44..6a68c790 100644
--- a/diracx/templates/diracx/task-worker-deployments.yaml
+++ b/diracx/templates/diracx/task-worker-deployments.yaml
@@ -75,7 +75,7 @@ spec:
       {{- $commonVolumeMounts = append $commonVolumeMounts (dict "mountPath" "/cs_store" "name" "cs-store-mount" "readOnly" false) }}
       {{- end }}
       {{- $commonVolumeMounts = append $commonVolumeMounts (dict "mountPath" "/keystore" "name" "jwks-mount" "readOnly" false) }}
-      {{- $commonVolumeMounts = append $commonVolumeMounts (dict "mountPath" "/entrypoint.sh" "name" "container-entrypoint" "subPath" "entrypoint.sh") }}
+      {{- $commonVolumeMounts = append $commonVolumeMounts (dict "mountPath" "/pre-run-hook.sh" "name" "container-entrypoint" "subPath" "pre-run-hook.sh") }}
       {{- if and $.Values.developer.enabled $.Values.developer.enableCoverage }}
       {{- $commonVolumeMounts = append $commonVolumeMounts (dict "mountPath" "/diracx-coveragerc" "name" "container-entrypoint" "subPath" "coveragerc") }}
       {{- $commonVolumeMounts = append $commonVolumeMounts (dict "mountPath" "/coverage-reports" "name" "coverage-data" "readOnly" false) }}
diff --git a/diracx/templates/diracx/validate-config/job.yaml b/diracx/templates/diracx/validate-config/job.yaml
index 7e7ecb3e..e953c2aa 100644
--- a/diracx/templates/diracx/validate-config/job.yaml
+++ b/diracx/templates/diracx/validate-config/job.yaml
@@ -1,6 +1,6 @@
 {{/* Define common volume mounts for reusability */}}
 {{- $commonVolumeMounts := list }}
-{{- $commonVolumeMounts = append $commonVolumeMounts (dict "mountPath" "/entrypoint.sh" "name" "container-entrypoint" "subPath" "entrypoint.sh") }}
+{{- $commonVolumeMounts = append $commonVolumeMounts (dict "mountPath" "/pre-run-hook.sh" "name" "container-entrypoint" "subPath" "pre-run-hook.sh") }}
 {{- if and .Values.developer.enabled .Values.developer.enableCoverage }}
 {{- $commonVolumeMounts = append $commonVolumeMounts (dict "mountPath" "/diracx-coveragerc" "name" "container-entrypoint" "subPath" "coveragerc") }}
 {{- $commonVolumeMounts = append $commonVolumeMounts (dict "mountPath" "/coverage-reports" "name" "coverage-data" "readOnly" false) }}
diff --git a/docs/admin/explanations/architecture_diagram.md b/docs/admin/explanations/architecture_diagram.md
index 69a22923..0f454b3b 100644
--- a/docs/admin/explanations/architecture_diagram.md
+++ b/docs/admin/explanations/architecture_diagram.md
@@ -5,7 +5,7 @@ config:
 flowchart TD
 
     subgraph k8s_instance ["K8s Instance: diracx"]
-        subgraph helm_chart ["Helm Chart: diracx 1.1.4"]
+        subgraph helm_chart ["Helm Chart: diracx 1.1.5"]
             subgraph k8s_app ["K8s Application: diracx"]
                 ing_diracx{{"ing: diracx"}}
                 svc_diracx(("svc: diracx"))