diff --git a/charts/bigdata-operator/Chart.yaml b/charts/bigdata-operator/Chart.yaml
index 40cf36a4..d3b2e8b5 100644
--- a/charts/bigdata-operator/Chart.yaml
+++ b/charts/bigdata-operator/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: bigdata-operator
 description: Spot Ocean BigData Operator
 type: application
-version: 0.4.4
+version: 0.4.5
 appVersion: 0.4.3
 home: https://github.com/spotinst/charts
 icon: https://docs.spot.io/_media/images/spot_mark.png
diff --git a/charts/bigdata-operator/values.yaml b/charts/bigdata-operator/values.yaml
index 925f1248..e20ebbf8 100644
--- a/charts/bigdata-operator/values.yaml
+++ b/charts/bigdata-operator/values.yaml
@@ -35,7 +35,8 @@ podLabels:
 podSecurityContext: {}
 # fsGroup: 2000
 
-securityContext: {}
+securityContext:
+  runAsNonRoot: true
 # capabilities:
 #   drop:
 #   - ALL
diff --git a/charts/bigdata-proxy/Chart.yaml b/charts/bigdata-proxy/Chart.yaml
index da4b3b2e..c0968d0e 100644
--- a/charts/bigdata-proxy/Chart.yaml
+++ b/charts/bigdata-proxy/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: bigdata-proxy
 description: A Helm chart for the Spot Big Data Proxy
 type: application
-version: 0.4.3
+version: 0.4.4
 appVersion: 0.5.3
 home: https://github.com/spotinst/charts
 icon: https://docs.spot.io/_media/images/spot_mark.png
diff --git a/charts/bigdata-proxy/values.yaml b/charts/bigdata-proxy/values.yaml
index ce18384f..cc5288f8 100644
--- a/charts/bigdata-proxy/values.yaml
+++ b/charts/bigdata-proxy/values.yaml
@@ -45,7 +45,8 @@ podLabels:
 podSecurityContext: {}
   # fsGroup: 2000
 
-securityContext: {}
+securityContext:
+  runAsNonRoot: true
   # capabilities:
   #   drop:
   #   - ALL
diff --git a/charts/bigdata-spark-watcher/Chart.yaml b/charts/bigdata-spark-watcher/Chart.yaml
index 910f5a7c..00c0b7d8 100644
--- a/charts/bigdata-spark-watcher/Chart.yaml
+++ b/charts/bigdata-spark-watcher/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: bigdata-spark-watcher
 description: A Helm chart for the Spot Big Data Spark Watcher
 type: application
-version: 0.5.0
+version: 0.5.1
 appVersion: 0.4.5
 home: https://github.com/spotinst/charts
 icon: https://docs.spot.io/_media/images/spot_mark.png
diff --git a/charts/bigdata-spark-watcher/values.yaml b/charts/bigdata-spark-watcher/values.yaml
index 215a4e42..62c3efe4 100644
--- a/charts/bigdata-spark-watcher/values.yaml
+++ b/charts/bigdata-spark-watcher/values.yaml
@@ -56,7 +56,8 @@ podLabels:
 podSecurityContext: {}
   # fsGroup: 2000
 
-securityContext: {}
+securityContext:
+  runAsNonRoot: true
   # capabilities:
   #   drop:
   #   - ALL
diff --git a/charts/bigdata-telemetry/Chart.yaml b/charts/bigdata-telemetry/Chart.yaml
index 01c2ffc2..b8fb7914 100644
--- a/charts/bigdata-telemetry/Chart.yaml
+++ b/charts/bigdata-telemetry/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: bigdata-telemetry
 description: A Helm chart for the Spot Big Data Telemetry components
 type: application
-version: 0.2.0
+version: 0.2.1
 appVersion: "1.16.0"
 home: https://github.com/spotinst/charts
 icon: https://docs.spot.io/_media/images/spot_mark.png
diff --git a/charts/bigdata-telemetry/templates/thanos-receiver-statefulset.yaml b/charts/bigdata-telemetry/templates/thanos-receiver-statefulset.yaml
index 8c5861e7..d3771dea 100644
--- a/charts/bigdata-telemetry/templates/thanos-receiver-statefulset.yaml
+++ b/charts/bigdata-telemetry/templates/thanos-receiver-statefulset.yaml
@@ -90,6 +90,8 @@ spec:
               port: 10902
               scheme: HTTP
             periodSeconds: 5
+          securityContext:
+            {{- toYaml .Values.securityContext | nindent 12 }}
           terminationMessagePolicy: FallbackToLogsOnError
           volumeMounts:
             - mountPath: /var/thanos/receive
diff --git a/charts/bigdata-telemetry/values.yaml b/charts/bigdata-telemetry/values.yaml
index 6052226a..1ff69592 100644
--- a/charts/bigdata-telemetry/values.yaml
+++ b/charts/bigdata-telemetry/values.yaml
@@ -14,6 +14,8 @@ thanos:
 
 
 nodeSelector: {}
+securityContext:
+  runAsNonRoot: true
 
 affinity:
   nodeAffinity:
diff --git a/charts/spark-operator/Chart.yaml b/charts/spark-operator/Chart.yaml
index d3bae843..70bdbccf 100644
--- a/charts/spark-operator/Chart.yaml
+++ b/charts/spark-operator/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: Spark Operator (b/g part)
 name: spark-operator
-version: 0.1.22
+version: 0.1.23
 appVersion: v1beta2-1.3.4-3.1.1
 dependencies:
   - name: spark-operator
diff --git a/charts/spark-operator/values.yaml b/charts/spark-operator/values.yaml
index 0cc01648..cd29a60f 100644
--- a/charts/spark-operator/values.yaml
+++ b/charts/spark-operator/values.yaml
@@ -20,6 +20,9 @@ spark-operator:  # This section controls the behavior of the spark operator sub-
 
   disableExecutorReporting: false
 
+securityContext:
+  runAsNonRoot: true
+
   webhook:
     enable: true
     # If hostNetwork is set to true it is probably a good idea to change this (e.g. 25554)