diff --git a/CHANGELOG.md b/CHANGELOG.md
index 08a4d2f1c2a1159d2458955a8006ba52b1032839..71fe16245fbf746ca4ffb2d4920f9508321b87a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 9.2.6-bb.6 - 2021-03-30
+
+Modified initContainer logic
+
 ## 9.2.6-bb.5 - 2021-03-22
 
 Fixed initContainer logic
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index 419a951277925256af87ba1aba8e73e53cd30837..eecdad391c8eae7966a5e228290840da22f745f9 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.5
+version: 9.2.6-bb.6
 keywords:
   - coverage
   - security
diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml
index 16bfe5c2c9b0214596071551767d1e4aa4a2e1af..da69ad2e28746c2f848c3e4b16d92adab7b3f8c3 100644
--- a/chart/templates/deployment.yaml
+++ b/chart/templates/deployment.yaml
@@ -58,6 +58,7 @@ spec:
       imagePullSecrets:
         - name: {{ .Values.image.pullSecret }}
       {{- end }}
+      {{- if or .Values.caCerts .Values.initSysctl.enabled .Values.elasticsearch.configureNode .Values.plugins.install .Values.postgresql.enabled (and .Values.sonarProperties .Values.sonarSecretProperties) }}
       initContainers:
       {{- if .Values.caCerts }}
         - name: ca-certs
@@ -172,6 +173,7 @@ spec:
           - name: POSTGRES_HOST_AUTH_METHOD
             value: "trust"      
       {{- end }} 
+      {{- end }}
       {{- if .Values.priorityClassName }}
       priorityClassName: {{ .Values.priorityClassName }}
       {{- end }}