diff --git a/alerta/templates/secret.yaml b/alerta/templates/secret.yaml
index b22a82eb0..ebe3740ad 100644
--- a/alerta/templates/secret.yaml
+++ b/alerta/templates/secret.yaml
@@ -18,11 +18,11 @@ limitations under the License.
 apiVersion: v1
 kind: Secret
 metadata:
-  name: alerta-admin-cert
+  name: {{ printf "%s-%s" $envAll.Release.Name "admin-cert" | quote }}
 type: Opaque
 data:
   alerta-admin-user: {{ .Values.conf.alerta.alertaAdminUser | b64enc }}
   alerta-admin-password: {{ .Values.conf.alerta.alertaAdminPassword | b64enc }}
-  alerta-admin-key: {{ .Values.conf.alerta.alertaAdminPassword | b64enc }}
-  alerta-api-key: {{ .Values.conf.alerta.alertaAdminPassword | b64enc }}
+  alerta-admin-key: {{ .Values.conf.alerta.alertaAdminKey | b64enc }}
+  alerta-api-key: {{ .Values.conf.alerta.alertaAPIKey | b64enc }}
 {{- end }}
diff --git a/alerta/values.yaml b/alerta/values.yaml
index 430c02421..aa579af7b 100644
--- a/alerta/values.yaml
+++ b/alerta/values.yaml
@@ -179,6 +179,8 @@ conf:
   alerta:
     alertaAdminUser: admin
     alertaAdminPassword: changeme
+    alertaAdminKey: changeme
+    alertaAPIKey: changeme
     alertadb: alerta_db
     alerta_configs: |
       # ref: http://docs.alerta.io/en/latest/configuration.html