diff --git a/OracleDatabase/SingleInstance/helm-charts/oracle-db/templates/secrets.yaml b/OracleDatabase/SingleInstance/helm-charts/oracle-db/templates/secrets.yaml
index dfccbbf2f4..b0f1522f6e 100644
--- a/OracleDatabase/SingleInstance/helm-charts/oracle-db/templates/secrets.yaml
+++ b/OracleDatabase/SingleInstance/helm-charts/oracle-db/templates/secrets.yaml
@@ -4,12 +4,16 @@
 #
 
 ---
+{{- $secretName := (include "fullname" .) -}}
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ template "fullname" . }}
+  name: {{ $secretName }}
 {{- include "oracle-db-labels" . | indent 2 }}
 stringData:
-  oracle_pwd: {{ default (randAlphaNum 10) .Values.oracle_pwd | quote }}
+{{- $secretObj := (lookup "v1" "Secret" .Release.Namespace $secretName) | default dict }}
+{{- $secretData := (get $secretObj "data") | default dict }}
+{{- $pwdSecret := (get $secretData "oracle_pwd") | b64dec | default .Values.oracle_pwd | default (randAlphaNum 10)  }}
+  oracle_pwd: {{ $pwdSecret | quote }}
 ---