diff --git a/helm/Chart.yaml b/helm/Chart.yaml
index 2bef29ec..ff3b486e 100644
--- a/helm/Chart.yaml
+++ b/helm/Chart.yaml
@@ -24,4 +24,4 @@ version: 0.1.0
 dependencies:
   - name: config-bootstrapper
     repository: "https://storage.googleapis.com/hypertrace-helm-charts"
-    version: 0.2.44
+    version: 0.2.47
diff --git a/helm/templates/deployment.yaml b/helm/templates/deployment.yaml
index 7e813c11..224cac64 100644
--- a/helm/templates/deployment.yaml
+++ b/helm/templates/deployment.yaml
@@ -21,16 +21,16 @@ spec:
     metadata:
       labels:
         release: {{ .Release.Name }}
-      {{- with .Values.podLabels }}
+        {{- with merge .Values.podLabels .Values.commonPodLabels }}
         {{- toYaml . | nindent 8 }}
-      {{- end }}
+        {{- end }}
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
         prometheus.io/scrape: "true"
         prometheus.io/port: "{{ .Values.containerHealthProbePort }}"
-      {{- with .Values.podAnnotations }}
+        {{- with merge .Values.podAnnotations .Values.commonPodAnnotations }}
         {{- toYaml . | nindent 8 }}
-      {{- end }}
+        {{- end }}
     spec:
     {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
@@ -59,7 +59,7 @@ spec:
       topologySpreadConstraints:
         {{- toYaml . | nindent 8}}
     {{- end }}
-    {{- with .Values.securityContext }}
+    {{- with .Values.podSecurityContext }}
       securityContext:
       {{- toYaml . | nindent 8 }}
     {{- end }}
@@ -115,4 +115,8 @@ spec:
               port: {{ .Values.containerHealthProbePort }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
+          {{- with .Values.containerSecurityContext }}
+          securityContext:
+            {{- toYaml . | nindent 12 }}
+          {{- end -}}
 {{- end }}
diff --git a/helm/values.yaml b/helm/values.yaml
index 09fbade7..e469f666 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -11,7 +11,7 @@ image:
   pullPolicy: IfNotPresent
   tagOverride: ""
 
-imagePullSecrets: { }
+imagePullSecrets: {}
 
 containerPort: 9012
 containerHealthProbePort: 9013
@@ -21,15 +21,21 @@ service:
   type: ClusterIP
   port: 9012
 
-nodeLabels: { }
+nodeLabels: {}
 
-tolerations: [ ]
+tolerations: []
 
-affinity: { }
+affinity: {}
 
-topologySpreadConstraints: [ ]
+topologySpreadConstraints: []
 
-securityContext: { }
+podSecurityContext: {}
+
+containerSecurityContext: {}
+
+commonPodLabels: {}
+
+commonPodAnnotations: {}
 
 javaOpts: "-XX:InitialRAMPercentage=50.0 -XX:MaxRAMPercentage=75.0 -XX:MaxDirectMemorySize=128M -XX:+ExitOnOutOfMemoryError"
 
@@ -56,7 +62,7 @@ deploymentLabels:
 podLabels:
   app: attribute-service
 
-podAnnotations: { }
+podAnnotations: {}
 
 deploymentSelectorMatchLabels:
   app: attribute-service
@@ -93,7 +99,7 @@ logConfig:
 config-bootstrapper:
   job:
     prefix: attribute
-  configurationCommands: { }
+  configurationCommands: {}
 
 hpa:
   enabled: false