diff --git a/charts/stable/pydio-cells/Chart.yaml b/charts/stable/pydio-cells/Chart.yaml
index 536600f2b1b..7c08711fc16 100644
--- a/charts/stable/pydio-cells/Chart.yaml
+++ b/charts/stable/pydio-cells/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 kubeVersion: ">=1.16.0-0"
 name: pydio-cells
-version: 1.0.3
+version: 1.0.4
 appVersion: "3.0.4"
 description: Pydio-cells is the nextgen file sharing platform for organizations.
 type: application
diff --git a/charts/stable/pydio-cells/questions.yaml b/charts/stable/pydio-cells/questions.yaml
index af9d0dbc64d..70dcb55fb4c 100644
--- a/charts/stable/pydio-cells/questions.yaml
+++ b/charts/stable/pydio-cells/questions.yaml
@@ -461,7 +461,7 @@ questions:
                 label: "runAsNonRoot"
                 schema:
                   type: boolean
-                  default: true
+                  default: false
 # Include{securityContextAdvanced}
 
   - variable: podSecurityContext
@@ -476,13 +476,13 @@ questions:
           description: "The UserID of the user running the application"
           schema:
             type: int
-            default: 568
+            default: 0
         - variable: runAsGroup
           label: "runAsGroup"
           description: The groupID this App of the user running the application"
           schema:
             type: int
-            default: 568
+            default: 0
         - variable: fsGroup
           label: "fsGroup"
           description: "The group that should own ALL storage."
diff --git a/charts/stable/pydio-cells/values.yaml b/charts/stable/pydio-cells/values.yaml
index bb0a5ac652e..381b2a29de4 100644
--- a/charts/stable/pydio-cells/values.yaml
+++ b/charts/stable/pydio-cells/values.yaml
@@ -3,11 +3,19 @@ image:
   pullPolicy: IfNotPresent
   tag: v3.0.4@sha256:81c6f8675ffc243af9ffab5a43da0ed50f33f0c153c352aad027127c3c0318ad
 
+securityContext:
+  readOnlyRootFilesystem: false
+  runAsNonRoot: false
+
+podSecurityContext:
+  runAsUser: 0
+  runAsGroup: 0
+
 env:
   CELLS_EXTERNAL: ""
-  CELLS_GRPC_EXTERNAL: "{{ .Values.service.gprc.ports.gprc.targetPort }}"
-  CELLS_HEALTHCHECK: "{{ .Values.service.main.ports.main.targetPort }}"
-  CELLS_BIND: "0.0.0.0:{{ .Values.service.main.ports.main.targetPort }}"
+  CELLS_GRPC_EXTERNAL: "{{ .Values.service.gprc.ports.gprc.port }}"
+  CELLS_HEALTHCHECK: "{{ .Values.service.healthcheck.ports.healthcheck.port }}"
+  CELLS_BIND: "0.0.0.0:{{ .Values.service.main.ports.main.port }}"
   CELLS_WORKING_DIR: "/cells"
   CELLS_DATA_DIR: "/cells/data"
   CELLS_LOG_DIR: "/cells/logs"
@@ -21,28 +29,45 @@ pydioinstall:
 
 probes:
   liveness:
-    path: "/healthcheck"
-
+    custom: true
+    spec:
+      httpGet:
+        scheme: HTTP
+        path: "/healthcheck"
+        port: 10162
   readiness:
-    path: "/healthcheck"
-
+    custom: true
+    spec:
+      httpGet:
+        scheme: HTTP
+        path: "/healthcheck"
+        port: 10162
   startup:
-    path: "/healthcheck"
+    custom: true
+    spec:
+      httpGet:
+        scheme: HTTP
+        path: "/healthcheck"
+        port: 10162
 
 service:
   main:
     ports:
       main:
         protocol: HTTPS
-        targetPort: 10150
         port: 10150
   gprc:
     enabled: true
     ports:
       gprc:
         enabled: true
-        targetPort: 33060
         port: 33060
+  healthcheck:
+    enabled: true
+    ports:
+      healthcheck:
+        enabled: true
+        port: 10162
 
 persistence:
   cells:
diff --git a/docs/manual/default-ports.md b/docs/manual/default-ports.md
index dae58be0595..9f63a2c3947 100644
--- a/docs/manual/default-ports.md
+++ b/docs/manual/default-ports.md
@@ -316,6 +316,7 @@ These defaults can of course be changed, but as we guarantee "sane, working defa
 | photoview                  |      main       |      main       | 10159 |   TCP    |                                         |
 | linkace                    |      main       |      main       | 10160 |   TCP    |                                         |
 | librephotos                |      main       |      main       | 10161 |   TCP    |                                         |
+| pydio-cells                |   healthcheck   |   healthcheck   | 10162 |   TCP    |                                         |
 | satisfactory               |     beacon      |     beacon      | 15000 |   UDP    |                                         |
 | satisfactory               |      query      |      query      | 15777 |   UDP    |                                         |
 | minecraft-bedrock          |      main       |      main       | 19132 |   UDP    |                                         |