diff --git a/charts/mlrun-ce/Chart.yaml b/charts/mlrun-ce/Chart.yaml
index aa33a402..92046055 100644
--- a/charts/mlrun-ce/Chart.yaml
+++ b/charts/mlrun-ce/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-version: 0.6.3-rc10
+version: 0.6.3-rc11
 name: mlrun-ce
 description: MLRUn Open Source Stack
 home: https://iguazio.com
diff --git a/charts/mlrun-ce/templates/config/jupyter-env-configmap.yaml b/charts/mlrun-ce/templates/config/jupyter-env-configmap.yaml
deleted file mode 100644
index 98a27d63..00000000
--- a/charts/mlrun-ce/templates/config/jupyter-env-configmap.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-{{ if .Values.jupyterNotebook.enabled}}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: jupyter-common-env
-data:
-  S3_ENDPOINT_URL: {{ include "mlrun-ce.minio.service.url" . }}
-  AWS_SECRET_ACCESS_KEY: {{ .Values.minio.rootPassword }}
-  AWS_ACCESS_KEY_ID: {{ .Values.minio.rootUser }}
-{{- end}}
diff --git a/charts/mlrun-ce/templates/config/minio-env-secret.yaml b/charts/mlrun-ce/templates/config/minio-env-secret.yaml
new file mode 100644
index 00000000..d5815346
--- /dev/null
+++ b/charts/mlrun-ce/templates/config/minio-env-secret.yaml
@@ -0,0 +1,10 @@
+{{ if .Values.minio.enabled}}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: minio-env-secret
+data:
+  S3_ENDPOINT_URL: {{ include "mlrun-ce.minio.service.url" . | b64enc | quote }}
+  AWS_SECRET_ACCESS_KEY: {{ .Values.minio.rootPassword | b64enc | quote }}
+  AWS_ACCESS_KEY_ID: {{ .Values.minio.rootUser | b64enc | quote }}
+{{- end}}
diff --git a/charts/mlrun-ce/templates/config/mlrun-env-configmap.yaml b/charts/mlrun-ce/templates/config/mlrun-env-configmap.yaml
index d1b058d2..e202ccba 100644
--- a/charts/mlrun-ce/templates/config/mlrun-env-configmap.yaml
+++ b/charts/mlrun-ce/templates/config/mlrun-env-configmap.yaml
@@ -7,9 +7,6 @@ data:
   MLRUN_STORAGE__AUTO_MOUNT_TYPE: s3
   MLRUN_STORAGE__AUTO_MOUNT_PARAMS: "aws_access_key=minio,aws_secret_key=minio123,endpoint_url={{ include "mlrun-ce.minio.service.url" . }}"
   MLRUN_HTTPDB__PROJECTS__FOLLOWERS: nuclio
-  S3_ENDPOINT_URL: {{ include "mlrun-ce.minio.service.url" . }}
-  AWS_SECRET_ACCESS_KEY: {{ .Values.minio.rootPassword }}
-  AWS_ACCESS_KEY_ID: {{ .Values.minio.rootUser }}
   MLRUN_HTTPDB__REAL_PATH: s3://
   MLRUN_ARTIFACT_PATH: s3://mlrun/projects/{{ `{{run.project}}` }}/artifacts
   MLRUN_FEATURE_STORE__DATA_PREFIXES__DEFAULT: s3://mlrun/projects/{project}/FeatureStore/{name}/{kind}
diff --git a/charts/mlrun-ce/values.yaml b/charts/mlrun-ce/values.yaml
index 5064ca4e..2c9ec07c 100644
--- a/charts/mlrun-ce/values.yaml
+++ b/charts/mlrun-ce/values.yaml
@@ -105,6 +105,9 @@ mlrun:
       - configMapRef:
           name: mlrun-override-env
           optional: true
+      - secretRef:
+          name: minio-env-secret
+          optional : true
     extraPersistentVolumeMounts: ~
   ui:
     fullnameOverride: mlrun-ui
@@ -192,9 +195,9 @@ jupyterNotebook:
 
   extraEnvKeyValue: {}
   envFrom:
-    - configMapRef:
-        name: jupyter-common-env
-        optional: true        
+    - secretRef:
+        name: minio-env-secret
+        optional: true
   persistence:
     enabled: true
     existingClaim: