diff --git a/charts/airflow/CHANGELOG.md b/charts/airflow/CHANGELOG.md
index 2a60e3aa..ab4041b8 100644
--- a/charts/airflow/CHANGELOG.md
+++ b/charts/airflow/CHANGELOG.md
@@ -7,6 +7,11 @@ This project follows [Semantic Versioning](https://semver.org/spec/v2.0.0.html)
 
 TBD
 
+## [8.6.0] - 2021-08-25
+### Added
+- `airflow.kubernetesPodTemplate.shareProcessNamespace`
+- `airflow.kubernetesPodTemplate.extraContainers`
+
 ## [8.5.1] - 2021-08-23
 
 ### Fixed
@@ -620,6 +625,7 @@ TBD
 > https://github.com/helm/charts/tree/master/stable/airflow
 
 [Unreleased]: https://github.com/airflow-helm/charts/compare/airflow-8.5.1...HEAD
+[8.6.0]: https://github.com/airflow-helm/charts/compare/airflow-8.5.1...airflow-8.6.0
 [8.5.1]: https://github.com/airflow-helm/charts/compare/airflow-8.5.0...airflow-8.5.1
 [8.5.0]: https://github.com/airflow-helm/charts/compare/airflow-8.4.1...airflow-8.5.0
 [8.4.1]: https://github.com/airflow-helm/charts/compare/airflow-8.4.0...airflow-8.4.1
@@ -647,4 +653,4 @@ TBD
 [7.14.3]: https://github.com/airflow-helm/charts/compare/airflow-7.14.2...airflow-7.14.3
 [7.14.2]: https://github.com/airflow-helm/charts/compare/airflow-7.14.1...airflow-7.14.2
 [7.14.1]: https://github.com/airflow-helm/charts/compare/airflow-7.14.0...airflow-7.14.1
-[7.14.0]: https://github.com/airflow-helm/charts/compare/airflow-7.14.0...airflow-7.14.0
\ No newline at end of file
+[7.14.0]: https://github.com/airflow-helm/charts/compare/airflow-7.14.0...airflow-7.14.0
diff --git a/charts/airflow/files/pod_template.kubernetes-helm-yaml b/charts/airflow/files/pod_template.kubernetes-helm-yaml
index 5ea67a7f..010485a0 100644
--- a/charts/airflow/files/pod_template.kubernetes-helm-yaml
+++ b/charts/airflow/files/pod_template.kubernetes-helm-yaml
@@ -47,6 +47,7 @@ spec:
     {{- include "airflow.container.git_sync" (dict "Release" .Release "Values" .Values "sync_one_time" "true") | indent 4 }}
     {{- end }}
   {{- end }}
+  shareProcessNamespace: {{ toYaml .Values.airflow.kubernetesPodTemplate.shareProcessNamespace }}
   containers:
     - name: base
       {{- include "airflow.image" . | indent 6 }}
@@ -66,6 +67,10 @@ spec:
       ports: []
       command: []
       args: []
+      {{- if .Values.airflow.kubernetesPodTemplate.securityContext }}
+      securityContext:
+        {{- toYaml .Values.airflow.kubernetesPodTemplate.securityContext | nindent 8 }}
+      {{- end }}
       {{- if .Values.airflow.kubernetesPodTemplate.resources }}
       resources:
         {{- toYaml .Values.airflow.kubernetesPodTemplate.resources | nindent 8 }}
@@ -74,6 +79,9 @@ spec:
       volumeMounts:
         {{- $volumeMounts | indent 8 }}
       {{- end }}
+    {{- if .Values.airflow.kubernetesPodTemplate.extraContainers }}
+      {{- toYaml .Values.airflow.kubernetesPodTemplate.extraContainers | nindent 4 }}
+    {{- end }}
   {{- if $volumes }}
   volumes:
     {{- $volumes | indent 4 }}
diff --git a/charts/airflow/values.yaml b/charts/airflow/values.yaml
index 9fe9a346..6a270889 100644
--- a/charts/airflow/values.yaml
+++ b/charts/airflow/values.yaml
@@ -328,6 +328,13 @@ airflow:
     ##
     extraVolumes: []
 
+    ## Enable shareProcessNamespace
+    ## https://kubernetes.io/docs/tasks/configure-pod-container/share-process-namespace/
+    shareProcessNamespace: false
+
+    ## Add extra containers
+    extraContainers: {}
+
   ########################################
   ## COMPONENT | db-migrations Deployment
   ########################################