diff --git a/installation/kubernetes/README.md b/installation/kubernetes/README.md
index c36a0fc3..bf99cdad 100644
--- a/installation/kubernetes/README.md
+++ b/installation/kubernetes/README.md
@@ -26,8 +26,8 @@ Notes:
 Cert Manager can be used to automate Letsencrypt certificate management.
 During Creation of new ingress, cert-manager annotations are used.
 
-[Installation](https://cert-manager.io/docs/installation/kubernetes/)
-[Configure Issuer](https://cert-manager.io/docs/installation/kubernetes/#configuring-your-first-issuer)
+- [Installation](https://cert-manager.io/docs/installation/kubernetes/)
+- [Configure Issuer](https://cert-manager.io/docs/installation/kubernetes/#configuring-your-first-issuer)
 
 ## Prepare MariaDB
 
@@ -147,7 +147,7 @@ kubectl create namespace erpnext
 helm repo add erpnext https://helm.erpnext.com/repo
 helm repo update
 
-helm install frappe-bench-0001 --namespace erpnext-v12 erpnext \
+helm install frappe-bench-0001 --namespace erpnext erpnext-v12 \
     --set mariadbHost=mariadb.mariadb.svc.cluster.local \
     --set persistence.storageClass=rook-cephfs
 ```
diff --git a/installation/kubernetes/helm-charts/erpnext/templates/deployment-scheduler.yaml b/installation/kubernetes/helm-charts/erpnext/templates/deployment-scheduler.yaml
index c62ca414..8b2ef936 100644
--- a/installation/kubernetes/helm-charts/erpnext/templates/deployment-scheduler.yaml
+++ b/installation/kubernetes/helm-charts/erpnext/templates/deployment-scheduler.yaml
@@ -32,13 +32,7 @@ spec:
           - name: sites-dir
             mountPath: /home/frappe/frappe-bench/sites
           imagePullPolicy: {{ .Values.pythonImage.pullPolicy }}
-          command: ["docker-entrypoint.sh"]
           args: ["schedule"]
-          {{ if .Values.runAsRoot }}
-          env:
-            - name: "RUN_AS_ROOT"
-              value: "1"
-          {{ end }}
           livenessProbe:
             exec:
               command:
diff --git a/installation/kubernetes/helm-charts/erpnext/templates/deployment-worker-default.yaml b/installation/kubernetes/helm-charts/erpnext/templates/deployment-worker-default.yaml
index 7c89b1d4..649ee411 100644
--- a/installation/kubernetes/helm-charts/erpnext/templates/deployment-worker-default.yaml
+++ b/installation/kubernetes/helm-charts/erpnext/templates/deployment-worker-default.yaml
@@ -32,7 +32,6 @@ spec:
           - name: sites-dir
             mountPath: /home/frappe/frappe-bench/sites
           imagePullPolicy: {{ .Values.pythonImage.pullPolicy }}
-          command: ["docker-entrypoint.sh"]
           args: ["worker"]
           env:
             - name: "WORKER_TYPE"
diff --git a/installation/kubernetes/helm-charts/erpnext/templates/deployment-worker-long.yaml b/installation/kubernetes/helm-charts/erpnext/templates/deployment-worker-long.yaml
index de178c82..cda4b1e7 100644
--- a/installation/kubernetes/helm-charts/erpnext/templates/deployment-worker-long.yaml
+++ b/installation/kubernetes/helm-charts/erpnext/templates/deployment-worker-long.yaml
@@ -32,7 +32,6 @@ spec:
           - name: sites-dir
             mountPath: /home/frappe/frappe-bench/sites
           imagePullPolicy: {{ .Values.pythonImage.pullPolicy }}
-          command: ["docker-entrypoint.sh"]
           args: ["worker"]
           env:
             - name: "WORKER_TYPE"
diff --git a/installation/kubernetes/helm-charts/erpnext/templates/deployment-worker-short.yaml b/installation/kubernetes/helm-charts/erpnext/templates/deployment-worker-short.yaml
index ebe02fc2..a4f72c15 100644
--- a/installation/kubernetes/helm-charts/erpnext/templates/deployment-worker-short.yaml
+++ b/installation/kubernetes/helm-charts/erpnext/templates/deployment-worker-short.yaml
@@ -32,7 +32,6 @@ spec:
           - name: sites-dir
             mountPath: /home/frappe/frappe-bench/sites
           imagePullPolicy: {{ .Values.pythonImage.pullPolicy }}
-          command: ["docker-entrypoint.sh"]
           args: ["worker"]
           env:
             - name: "WORKER_TYPE"
diff --git a/installation/kubernetes/helm-charts/erpnext/templates/job-migrate-sites.yaml b/installation/kubernetes/helm-charts/erpnext/templates/job-migrate-sites.yaml
index acbcfe84..e3c602d3 100644
--- a/installation/kubernetes/helm-charts/erpnext/templates/job-migrate-sites.yaml
+++ b/installation/kubernetes/helm-charts/erpnext/templates/job-migrate-sites.yaml
@@ -2,7 +2,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: migrate-sites-1587307712
+  name: migrate-sites-{{ template "erpnext.fullname" . }}-{{ date "20060102150405" .Release.Time }}
 spec:
   backoffLimit: 1
   template:
@@ -11,8 +11,8 @@ spec:
         supplementalGroups: [1000]
       containers:
       - name: erpnext
-        image: frappe/erpnext-worker:v12
-        command: ["migrate"]
+        image: "{{ .Values.pythonImage.repository }}:{{ .Values.pythonImage.tag }}"
+        args: ["migrate"]
         imagePullPolicy: IfNotPresent
         volumeMounts:
           - name: sites-dir
@@ -21,6 +21,6 @@ spec:
       volumes:
         - name: sites-dir
           persistentVolumeClaim:
-            claimName: erpnext-v12
+            claimName: {{ template "erpnext.fullname" . }}
             readOnly: false
 {{ end }}
diff --git a/installation/kubernetes/helm-charts/erpnext/values.yaml b/installation/kubernetes/helm-charts/erpnext/values.yaml
index 86c506ab..d7e8fb22 100644
--- a/installation/kubernetes/helm-charts/erpnext/values.yaml
+++ b/installation/kubernetes/helm-charts/erpnext/values.yaml
@@ -33,9 +33,6 @@ imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
 
-# Run workers, scheduler and web as root
-runAsRoot: false
-
 serviceAccount:
   # Specifies whether a service account should be created
   create: true
diff --git a/installation/kubernetes/resources/backupsitesjob.yaml.template b/installation/kubernetes/resources/backupsitesjob.yaml.template
index 9ec2293f..fcd1ab6b 100644
--- a/installation/kubernetes/resources/backupsitesjob.yaml.template
+++ b/installation/kubernetes/resources/backupsitesjob.yaml.template
@@ -11,7 +11,7 @@ spec:
       containers:
       - name: erpnext
         image: frappe/erpnext-worker:${VERSION}
-        command: "backup"
+        args: ["backup"]
         imagePullPolicy: IfNotPresent
         env:
           - name: "WITH_FILES"
diff --git a/installation/kubernetes/resources/migratesitesjob.yaml.template b/installation/kubernetes/resources/migratesitesjob.yaml.template
index a77b67fe..57cdd46c 100644
--- a/installation/kubernetes/resources/migratesitesjob.yaml.template
+++ b/installation/kubernetes/resources/migratesitesjob.yaml.template
@@ -11,7 +11,7 @@ spec:
       containers:
       - name: erpnext
         image: frappe/erpnext-worker:${VERSION}
-        command: "migrate"
+        args: ["migrate"]
         imagePullPolicy: IfNotPresent
         volumeMounts:
           - name: sites-dir
diff --git a/installation/kubernetes/resources/newsitejob.yaml.template b/installation/kubernetes/resources/newsitejob.yaml.template
index 78a4499e..680e3042 100644
--- a/installation/kubernetes/resources/newsitejob.yaml.template
+++ b/installation/kubernetes/resources/newsitejob.yaml.template
@@ -11,7 +11,7 @@ spec:
       containers:
       - name: erpnext
         image: frappe/erpnext-worker:${VERSION}
-        command: "new"
+        args: ["new"]
         imagePullPolicy: IfNotPresent
         volumeMounts:
           - name: sites-dir