diff --git a/basic/apps/people/suitecrm-values-configmap.yaml b/basic/apps/people/suitecrm-values-configmap.yaml
index 5043ea4..46431fd 100644
--- a/basic/apps/people/suitecrm-values-configmap.yaml
+++ b/basic/apps/people/suitecrm-values-configmap.yaml
@@ -8,19 +8,16 @@ data:
   values.yaml: |
     ingress:
       enabled: true
-      #annotations:
-      #  kubernetes.io/tls-acme: "true"
       hostname: "people.${domain}"
       tls: true
       certManager: true
     suitecrmUsername: "admin"
     suitecrmEmail: "${admin_email}"
-    suitecrmPassword: "${suitecrm-password}"
-    #existingSecret: stackspin-suitecrm-variables
+    suitecrmPassword: "${suitecrm_password}"
     mariadb:
       auth:
-        password: "${mariadb-password}"
-        rootPassword: "${mariadb-root-password}"
+        password: "${mariadb_password}"
+        rootPassword: "${mariadb_root_password}"
     # TODO Adjust OIDC SSO to service
     #    - name: Stackspin
     #      key: "${client_id}"
diff --git a/templates/stackspin-suitecrm-variables.yaml.jinja b/templates/stackspin-suitecrm-variables.yaml.jinja
index 45004f7..eb1a66e 100644
--- a/templates/stackspin-suitecrm-variables.yaml.jinja
+++ b/templates/stackspin-suitecrm-variables.yaml.jinja
@@ -3,6 +3,6 @@ kind: Secret
 metadata:
   name: stackspin-suitecrm-variables
 data:
-  suitecrm-password: "{{ 32 | generate_password | b64encode }}"
-  mariadb-password: "{{ 32 | generate_password | b64encode }}"
-  mariadb-root-password: "{{ 32 | generate_password | b64encode }}"
+  suitecrm_password: "{{ 32 | generate_password | b64encode }}"
+  mariadb_password: "{{ 32 | generate_password | b64encode }}"
+  mariadb_root_password: "{{ 32 | generate_password | b64encode }}"