diff --git a/charts/clair/Chart.yaml b/charts/clair/Chart.yaml
index 117e6444..4cba2466 100644
--- a/charts/clair/Chart.yaml
+++ b/charts/clair/Chart.yaml
@@ -12,4 +12,4 @@ maintainers:
 name: clair
 sources:
 - https://github.com/coreos/clair
-version: 0.1.9
+version: 0.1.10
diff --git a/charts/clair/templates/_config.yaml.tpl b/charts/clair/templates/_config.yaml.tpl
index 59f85fd6..b95e5a9a 100644
--- a/charts/clair/templates/_config.yaml.tpl
+++ b/charts/clair/templates/_config.yaml.tpl
@@ -1,11 +1,13 @@
+{{- $postgresHost := (include "postgres.host" $) }}
+
 introspection_addr: {{ .Values.config.introspection_addr }}
 http_listen_addr: {{ .Values.config.http_listen_addr }}
 log_level: {{ .Values.config.log_level }}
 indexer:
   {{- if .Values.config.postgresPassword }}
-  connstring: "host={{ .Values.config.postgresHost }} port={{ .Values.config.postgresPort }} dbname={{ .Values.config.postgresdbname }} user={{ .Values.config.postgresUser }} password={{ .Values.config.postgresPassword }} sslmode=disable"
+  connstring: "host={{ $postgresHost }} port={{ .Values.config.postgresPort }} dbname={{ .Values.config.postgresdbname }} user={{ .Values.config.postgresUser }} password={{ .Values.config.postgresPassword }} sslmode=disable"
   {{- else }}
-  connstring: "host={{ .Values.config.postgresHost }} port={{ .Values.config.postgresPort }} dbname={{ .Values.config.postgresdbname }} user={{ .Values.config.postgresUser }} sslmode=disable"
+  connstring: "host={{ $postgresHost }} port={{ .Values.config.postgresPort }} dbname={{ .Values.config.postgresdbname }} user={{ .Values.config.postgresUser }} sslmode=disable"
   {{- end }}
   scanlock_retry: {{ .Values.config.indexer.scanlock_retry }}
   layer_scan_concurrency: {{ .Values.config.indexer.layer_scan_concurrency }}
@@ -16,9 +18,9 @@ indexer:
 matcher:
   indexer_addr: "{{ .Values.config.matcher.indexer_addr }}"
   {{- if .Values.config.postgresPassword }}
-  connstring: "host={{ .Values.config.postgresHost }} port={{ .Values.config.postgresPort }} dbname={{ .Values.config.postgresdbname }} user={{ .Values.config.postgresUser }} password={{ .Values.config.postgresPassword }} sslmode=disable"
+  connstring: "host={{ $postgresHost }} port={{ .Values.config.postgresPort }} dbname={{ .Values.config.postgresdbname }} user={{ .Values.config.postgresUser }} password={{ .Values.config.postgresPassword }} sslmode=disable"
   {{- else }}
-  connstring: "host={{ .Values.config.postgresHost }} port={{ .Values.config.postgresPort }} dbname={{ .Values.config.postgresdbname }} user={{ .Values.config.postgresUser }} sslmode=disable"
+  connstring: "host={{ $postgresHost }} port={{ .Values.config.postgresPort }} dbname={{ .Values.config.postgresdbname }} user={{ .Values.config.postgresUser }} sslmode=disable"
   {{- end }}
   max_conn_pool: {{ .Values.config.matcher.max_conn_pool }}
   run: ""
@@ -32,9 +34,9 @@ matcher:
   {{- end }}
 notifier:
   {{- if .Values.config.postgresPassword }}
-  connstring: "host={{ .Values.config.postgresHost }} port={{ .Values.config.postgresPort }} dbname={{ .Values.config.postgresdbname }} user={{ .Values.config.postgresUser }} password={{ .Values.config.postgresPassword }} sslmode=disable"
+  connstring: "host={{ $postgresHost }} port={{ .Values.config.postgresPort }} dbname={{ .Values.config.postgresdbname }} user={{ .Values.config.postgresUser }} password={{ .Values.config.postgresPassword }} sslmode=disable"
   {{- else }}
-  connstring: "host={{ .Values.config.postgresHost }} port={{ .Values.config.postgresPort }} dbname={{ .Values.config.postgresdbname }} user={{ .Values.config.postgresUser }} sslmode=disable"
+  connstring: "host={{ $postgresHost }} port={{ .Values.config.postgresPort }} dbname={{ .Values.config.postgresdbname }} user={{ .Values.config.postgresUser }} sslmode=disable"
   {{- end }}
   delivery_interval: {{ .Values.config.notifier.delivery_interval }}
   poll_interval: {{ .Values.config.notifier.poll_interval }}
diff --git a/charts/clair/templates/_helpers.tpl b/charts/clair/templates/_helpers.tpl
index b91f6746..7ade02b6 100644
--- a/charts/clair/templates/_helpers.tpl
+++ b/charts/clair/templates/_helpers.tpl
@@ -1,3 +1,13 @@
+{{/* Returns Postgres db service name */}}
+
+{{- define "postgres.host" }}
+{{- if $.Values.global.externalDatabase }}
+{{- print "clair-postgresql.devtroncd" }}
+{{- else }}
+{{- print "postgresql-postgresql.devtroncd" }}
+{{- end }}
+{{- end }}
+
 {{/* vim: set filetype=mustache: */}}
 {{/*
 Expand the name of the chart.
diff --git a/charts/clair/templates/deployment.yaml b/charts/clair/templates/deployment.yaml
index 252d1b1f..e9f6dedd 100644
--- a/charts/clair/templates/deployment.yaml
+++ b/charts/clair/templates/deployment.yaml
@@ -1,3 +1,4 @@
+{{- $postgresHost := (include "postgres.host" $) }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -41,7 +42,7 @@ spec:
       - name: pg-ready-wait
         image: postgres:11.3
         command: [ "sh", "-c",
-          "until pg_isready -h {{ .Values.config.postgresHost }} -p {{ .Values.config.postgresPort }};
+          "until pg_isready -h {{ $postgresHost }} -p {{ .Values.config.postgresPort }};
           do echo waiting for database; sleep 1; done;"]
       containers:
       - name: {{ .Chart.Name }}
diff --git a/charts/clair/values.yaml b/charts/clair/values.yaml
index e0b207c9..9ddfd992 100644
--- a/charts/clair/values.yaml
+++ b/charts/clair/values.yaml
@@ -1,5 +1,5 @@
 config:
-  postgresHost: postgresql-postgresql.devtroncd
+  # postgresHost: postgresql-postgresql.devtroncd
   postgresPort: 5432
   postgresdbname: clairv4
   postgresUser: postgres
diff --git a/charts/security/Chart.yaml b/charts/security/Chart.yaml
index 314253f3..1b657664 100644
--- a/charts/security/Chart.yaml
+++ b/charts/security/Chart.yaml
@@ -15,10 +15,10 @@ maintaintainers:
     email: pawan.mehta@devtron.ai
 sources:
   - https://github.com/devtron-labs/charts
-version: 0.1.4
+version: 0.1.5
 appVersion: "0.1.1"
 dependencies:
 - name: clair
-  version: "0.x.x"
+  version: "0.1.10"
   repository: https://helm.devtron.ai
   condition: clair.enabled
diff --git a/charts/security/templates/_helpers.tpl b/charts/security/templates/_helpers.tpl
new file mode 100644
index 00000000..fcd52014
--- /dev/null
+++ b/charts/security/templates/_helpers.tpl
@@ -0,0 +1,19 @@
+{{/* Returns Postgres db service name */}}
+
+{{- define "postgres.host" }}
+{{- if $.Values.global.externalDatabase }}
+{{- print "clair-postgresql.devtroncd" }}
+{{- else }}
+{{- print "postgresql-postgresql.devtroncd" }}
+{{- end }}
+{{- end }}
+
+{{/* Returns Postgres db name */}}
+
+{{- define "postgres.db" }}
+{{- if $.Values.global.externalDatabase }}
+{{- print "clairv4" }}
+{{- else }}
+{{- print "orchestrator" }}
+{{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/charts/security/templates/image-scanner.yaml b/charts/security/templates/image-scanner.yaml
index b67112ff..a8d53fbc 100644
--- a/charts/security/templates/image-scanner.yaml
+++ b/charts/security/templates/image-scanner.yaml
@@ -1,3 +1,5 @@
+{{- $postgresHost := (include "postgres.host" $) }}
+{{- $postgresDB := (include "postgres.db" $) }}
 {{- with .Values.imageScanner }}
 apiVersion: v1
 kind: Secret
@@ -8,7 +10,7 @@ metadata:
     release: {{ $.Release.Name }}
     integration: security
 {{- if .labels }}
-{{ toYaml .labels | indent 4 }}    
+{{ toYaml .labels | indent 4 }}
 {{- end}} 
 type: Opaque
 {{- if .secrets }}
@@ -30,6 +32,8 @@ metadata:
 {{ toYaml .labels | indent 4 }}    
 {{- end}} 
 data:
+  PG_ADDR: {{ $postgresHost }}
+  PG_DATABASE: {{ $postgresDB }}
 {{- if .configs}}
 {{ toYaml .configs | indent 2 }}
 ---
@@ -133,4 +137,4 @@ spec:
 {{ toYaml .tolerations | indent 8 }}
 {{- end }}
   revisionHistoryLimit: 3
-{{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/charts/security/values.yaml b/charts/security/values.yaml
index 6ef43775..93638a6a 100644
--- a/charts/security/values.yaml
+++ b/charts/security/values.yaml
@@ -3,8 +3,8 @@ imageScanner:
     CLAIR_ADDR: clair.devtroncd:6060
     CLIENT_ID: client-2
     NATS_SERVER_HOST: nats://devtron-nats.devtroncd:4222
-    PG_ADDR: postgresql-postgresql.devtroncd
-    PG_DATABASE: orchestrator
+    # PG_ADDR: postgresql-postgresql.devtroncd
+    # PG_DATABASE: orchestrator
     PG_LOG_QUERY: "false"
     PG_PORT: "5432"
     PG_USER: postgres