diff --git a/PendingReleaseNotes.md b/PendingReleaseNotes.md
index b84ea359b..65b59875a 100644
--- a/PendingReleaseNotes.md
+++ b/PendingReleaseNotes.md
@@ -2,6 +2,9 @@
 
 ## Breaking Changes
 
+- Support for `secret.adminID` and `secret.adminKey` has been deprecated and removed
+  from Helm charts. Please use `secret.userID` and `secret.userKey` instead.
+
 ## Features
 
 ## NOTE
diff --git a/charts/ceph-csi-cephfs/templates/secret.yaml b/charts/ceph-csi-cephfs/templates/secret.yaml
index 93e341434..c4755dcec 100644
--- a/charts/ceph-csi-cephfs/templates/secret.yaml
+++ b/charts/ceph-csi-cephfs/templates/secret.yaml
@@ -14,6 +14,6 @@ metadata:
     heritage: {{ .Release.Service }}
     {{- with .Values.commonLabels }}{{ toYaml . | trim | nindent 4 }}{{- end }}
 stringData:
-  userID: {{ .Values.secret.userID }}
-  userKey: {{ .Values.secret.userKey }}
+  userID: {{ required "A valid userID must be specified in secret" .Values.secret.userID }}
+  userKey: {{ required "A valid userKey must be specified in secret" .Values.secret.userKey }}
 {{- end -}}