diff --git a/contrib/helm/harbor/templates/adminserver/adminserver-cm.yaml b/contrib/helm/harbor/templates/adminserver/adminserver-cm.yaml
index 11e5c352b..55ed1b71a 100644
--- a/contrib/helm/harbor/templates/adminserver/adminserver-cm.yaml
+++ b/contrib/helm/harbor/templates/adminserver/adminserver-cm.yaml
@@ -54,7 +54,6 @@ data:
   CLAIR_DB_PORT: "5432"
   CLAIR_DB: "{{ .Values.clair.postgresDatabase }}"
   CLAIR_DB_USERNAME: "{{ .Values.clair.postgresUser }}"
-  CLAIR_DB_PASSWORD: "{{ .Values.clair.postgresPassword }}"
   UAA_ENDPOINT: ""
   UAA_CLIENTID: ""
   UAA_CLIENTSECRET: ""
diff --git a/contrib/helm/harbor/templates/adminserver/adminserver-secrets.yaml b/contrib/helm/harbor/templates/adminserver/adminserver-secrets.yaml
index fd2aff13f..da5169228 100644
--- a/contrib/helm/harbor/templates/adminserver/adminserver-secrets.yaml
+++ b/contrib/helm/harbor/templates/adminserver/adminserver-secrets.yaml
@@ -13,7 +13,9 @@ data:
   MYSQL_PWD: {{ .Values.mysql.pass | b64enc | quote }}
   JOBSERVICE_SECRET: {{ .Values.jobservice.secret | b64enc | quote }}
   UI_SECRET: {{ .Values.ui.secret | b64enc | quote }}
+{{- if eq .Values.adminserver.authenticationMode "ldap_auth" }} 
+  LDAP_SEARCH_PWD: {{ .Values.adminserver.ldap.searchPwd | b64enc | quote }} 
+{{- end }}
 {{ if .Values.clair.enabled }}
   CLAIR_DB_PASSWORD: {{ .Values.clair.postgresPassword | b64enc | quote }}
 {{ end }}
-  #LDAP_SEARCH_PWD: not-a-secure-password
diff --git a/contrib/helm/harbor/values.yaml b/contrib/helm/harbor/values.yaml
index 3ebec0079..db4c2e3f5 100644
--- a/contrib/helm/harbor/values.yaml
+++ b/contrib/helm/harbor/values.yaml
@@ -72,6 +72,7 @@ adminserver:
   ldap:
     url: "ldaps://ldapserver"
     searchDN: ""
+    searchPassword: ""
     baseDN: ""
     filter: "(objectClass=person)"
     uid: "uid"