diff --git a/charts/funkwhale/templates/NOTES.txt b/charts/funkwhale/templates/NOTES.txt
index 44f0cfa..0ce6b5c 100644
--- a/charts/funkwhale/templates/NOTES.txt
+++ b/charts/funkwhale/templates/NOTES.txt
@@ -28,4 +28,4 @@ https://docs.funkwhale.audio/changelog.html#increased-quality-of-jpeg-thumbnails
 
 To get a shell in the master pod, run the following commands;
   export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "funkwhale.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-  kubectl exec --namespace {{ .Release.Namespace }} -c funkwhale -it $POD_NAME bash
+  kubectl exec --namespace {{ .Release.Namespace }} -c funkwhale -it $POD_NAME -- bash
diff --git a/charts/matrix-synapse/templates/NOTES.txt b/charts/matrix-synapse/templates/NOTES.txt
index 4741669..f276bd9 100644
--- a/charts/matrix-synapse/templates/NOTES.txt
+++ b/charts/matrix-synapse/templates/NOTES.txt
@@ -29,9 +29,10 @@ Matrix client - and register an account - as soon as final setup is done.
 You can also create an admin user with the following command;
 {{- else }}
 You can create a user in your new Synapse install by running the following
-command;
+command; (replacing USERNAME and PASSWORD)
 {{- end }}
 
-    kubectl exec --namespace {{ .Release.Namespace }} {{ template "matrix-synapse.fullname" . }} -- register_new_matrix_user -c /synapse/config/homeserver.yaml -c /synapse/config/conf.d/secrets.yaml -u USERNAME -p PASSWORD --admin http://localhost:8008
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "matrix-synapse" .  }},app.kubernetes.io/instance={{ .Release.Name }},app.kubernetes.io/component=synapse" -o jsonpath="{.items[0].metadata.name}")
+    kubectl exec --namespace {{ .Release.Namespace }} $POD_NAME -- register_new_matrix_user -c /synapse/config/homeserver.yaml -c /synapse/config/conf.d/secrets.yaml -u USERNAME -p PASSWORD --admin http://localhost:8008
 
 You can also specify --no-admin to create a non-admin user.
diff --git a/charts/radosgw/templates/NOTES.txt b/charts/radosgw/templates/NOTES.txt
index 5c14bf9..b63a530 100644
--- a/charts/radosgw/templates/NOTES.txt
+++ b/charts/radosgw/templates/NOTES.txt
@@ -23,4 +23,4 @@
 For administration purposes you can either open a shell in a RadosGW pod or connect to one of your mon hosts:
 
   export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "radosgw.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-  kubectl exec --namespace {{ .Release.Namespace }} $POD_NAME radosgw-admin --help
+  kubectl exec --namespace {{ .Release.Namespace }} $POD_NAME -- radosgw-admin --help