diff --git a/charts/library/common/Chart.yaml b/charts/library/common/Chart.yaml
index 9ab6e4b718f..1dd61e8137f 100644
--- a/charts/library/common/Chart.yaml
+++ b/charts/library/common/Chart.yaml
@@ -15,4 +15,4 @@ maintainers:
 name: common
 sources: null
 type: library
-version: 8.0.4
+version: 8.0.5
diff --git a/charts/library/common/templates/lib/controller/_container.tpl b/charts/library/common/templates/lib/controller/_container.tpl
index 9f50fabc9e5..a6ed529df84 100644
--- a/charts/library/common/templates/lib/controller/_container.tpl
+++ b/charts/library/common/templates/lib/controller/_container.tpl
@@ -35,7 +35,7 @@
   {{- end }}
 
   env:
-   {{- if .Values.securityContext.readOnlyRootFilesystem }}
+   {{- if or ( .Values.securityContext.readOnlyRootFilesystem ) ( .Values.securityContext.runAsNonRoot ) }}
     - name: S6_READ_ONLY_ROOT
       value: "1"
    {{- end }}