diff --git a/test/minio/1.7.0/templates/logsearchapi-secret.yaml b/test/minio/1.7.0/templates/logsearchapi-secret.yaml
index 2ae0021637..bb03c5a329 100644
--- a/test/minio/1.7.0/templates/logsearchapi-secret.yaml
+++ b/test/minio/1.7.0/templates/logsearchapi-secret.yaml
@@ -1,18 +1,25 @@
 {{ if .Values.logsearchapi.enabled }}
 {{ $logSearchValues := (. | mustDeepCopy) }}
 {{ $_ := set $logSearchValues "common" (dict "nameSuffix" (include "logsearchapi.nameSuffix" .)) }}
+
+{{ $auditToken := randAlphaNum 32 | b64enc }}
+{{ $queryToken := randAlphaNum 32 | b32enc }}
+
 apiVersion: v1
 kind: Secret
 metadata:
   name: {{ include "logsearchapi.secretName" . }}
 data:
-  {{/*
-  Those are passed to environment variables, which sets everything on startup
-  There is no need to remember previously created secrets.
-  */}}
-  {{ $auditToken := randAlphaNum 32 }}
-  auditToken: {{ $auditToken | b64enc }}
-  queryToken: {{ randAlphaNum 32 | b64enc }}
+  {{ with (lookup "v1" "Secret" .Release.Namespace (include "logsearchapi.secretName")) }}
+  {{ $auditToken = (index .data "auditToken") }}
+  {{ end }}
+  auditToken: {{ $auditToken }}
+
+  {{ with (lookup "v1" "Secret" .Release.Namespace (include "logsearchapi.secretName")) }}
+  {{ $queryToken = (index .data "queryToken") }}
+  {{ end }}
+  queryToken: {{ $queryToken }}
+
   logQueryURL: {{ (printf "http://%v:8080" (include "common.names.fullname" $logSearchValues)) | b64enc }}
-  webhookURL: {{ (printf "http://%v:8080/api/ingest?token=%v" (include "common.names.fullname" $logSearchValues) $auditToken) | b64enc }}
+  webhookURL: {{ (printf "http://%v:8080/api/ingest?token=%v" (include "common.names.fullname" $logSearchValues) ($auditToken | b64dec)) | b64enc }}
 {{ end }}
diff --git a/test/minio/1.7.0/templates/postgres-secret.yaml b/test/minio/1.7.0/templates/postgres-secret.yaml
index ea149e2197..563c2b2d15 100644
--- a/test/minio/1.7.0/templates/postgres-secret.yaml
+++ b/test/minio/1.7.0/templates/postgres-secret.yaml
@@ -1,20 +1,22 @@
 {{ if .Values.logsearchapi.enabled }}
-{{ $dbPass := randAlphaNum 32 | b64enc }}
 {{ $pgValues := (. | mustDeepCopy) }}
 {{ $_ := set $pgValues "common" (dict "nameSuffix" (include "postgres.nameSuffix" .)) }}
+
+{{ $dbPass := randAlphaNum 32 | b64enc }}
+
 apiVersion: v1
 kind: Secret
 metadata:
   name: {{ include "postgres.secretName" . }}
 data:
-  db_user: {{ include "postgres.dbUser" . | b64enc }}
-  db_name: {{ include "postgres.dbName" . | b64enc }}
   {{ with (lookup "v1" "Secret" .Release.Namespace (include "postgres.secretName" .)) }}
   {{ $dbPass = (index .data "db_password") }}
-  db_password: {{ $dbPass }}
-  {{ else }}
-  db_password: {{ $dbPass }}
   {{ end }}
+  db_password: {{ $dbPass }}
+
+  db_user: {{ include "postgres.dbUser" . | b64enc }}
+  db_name: {{ include "postgres.dbName" . | b64enc }}
+
   postgresURL: {{ printf "postgres://%v:%v@%v:5432/%v?sslmode=disable" (include "postgres.dbUser" .) ($dbPass | b64dec) (include "common.names.fullname" $pgValues) (include "postgres.dbName" .) | b64enc }}
   postgresHost: {{ printf "%v" (include "common.names.fullname" $pgValues) | b64enc }}
 {{ end }}