diff --git a/CHANGELOG.md b/CHANGELOG.md
index 71fe16245fbf746ca4ffb2d4920f9508321b87a7..f62d6e0a491db27b165f2ad7b00765fab3c08406 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 9.2.6-bb.7 - 2021-03-31
+
+Adding Affinity documentation
+
 ## 9.2.6-bb.6 - 2021-03-30
 
 Modified initContainer logic
@@ -36,4 +40,3 @@ Added logging instructions to docs 7/22/2020
 Added auth-oidc plugin version 2.0.0
 
 Added plugins for scanning C/C++ code 10/01/2020
-
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index eecdad391c8eae7966a5e228290840da22f745f9..549d20763ec68ab3576bec3750ea315b8d2c6021 100644
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: 8.6-community
 name: sonarqube
 description: SonarQube is an open sourced code quality scanning tool
-version: 9.2.6-bb.6
+version: 9.2.6-bb.7
 keywords:
   - coverage
   - security
diff --git a/docs/Affinity.md b/docs/Affinity.md
new file mode 100644
index 0000000000000000000000000000000000000000..cf42e892f80e95560a46f6c5598b472f7501403a
--- /dev/null
+++ b/docs/Affinity.md
@@ -0,0 +1,16 @@
+## Setting Affinity, nodeSelector, and tolerations for Sonarqube within the chart
+
+### To enable affinity, tolerations, and nodeSelector options in the sonarqube chart set the provided values:
+```
+# Affinity for pod assignment
+# Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
+affinity: {}
+
+# Tolerations for pod assignment
+# Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
+tolerations: []
+
+# Node labels for pod assignment
+# Ref: https://kubernetes.io/docs/user-guide/node-selection/
+nodeSelector: {}
+```