diff --git a/apps/user-demo.yaml b/apps/user-demo.yaml
index 0dd8d6c..36c8eff 100644
--- a/apps/user-demo.yaml
+++ b/apps/user-demo.yaml
@@ -11,11 +11,8 @@ spec:
   project: default
   source:
     repoURL: 'https://gitea.training.cluster.acend.ch/<user>/prometheus-training-lab-setup'
-    path: charts/user-monitoring-demo/
+    path: user-demo/
     targetRevision: main
-    helm:
-      values: |
-        user: <user>
   syncPolicy:
     automated:
       prune: true
diff --git a/charts/user-monitoring/templates/user-basic-auth-secret.yaml b/charts/user-monitoring/templates/user-basic-auth-secret.yaml
index b4c67c0..f733a9a 100644
--- a/charts/user-monitoring/templates/user-basic-auth-secret.yaml
+++ b/charts/user-monitoring/templates/user-basic-auth-secret.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 data:
   admin: JDEkSzNRZUlsOHAkZVZZb1h2RERNWk40b3RJT2tBc3AwLw== # $(openssl passwd -1 admin)
   {{ .Values.user }}: JDEkSzNRZUlsOHAkZVZZb1h2RERNWk40b3RJT2tBc3AwLw== # $(openssl passwd -1 admin)
-  grafana_user: {{ .Values.user }}
+  grafana_user: {{ .Values.user | b64enc }}
 kind: Secret
 metadata:
   labels:
diff --git a/user-umbrella.yaml b/user-umbrella.yaml
index eacda7e..26951d3 100644
--- a/user-umbrella.yaml
+++ b/user-umbrella.yaml
@@ -2,7 +2,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: <user>-umbrella
+  name: <user>-app-of-apps
   namespace: argocd
 spec:
   destination: