diff --git a/charts/tenant/templates/minio-setup.yaml b/charts/tenant/templates/minio-setup.yaml
index 04b22d1..9bdbe1c 100644
--- a/charts/tenant/templates/minio-setup.yaml
+++ b/charts/tenant/templates/minio-setup.yaml
@@ -93,7 +93,7 @@ spec:
               EOF
 
               # The rest remains the same...
-              mc admin policy create minioadmin {{ .Values.name }}-policy /tmp/policy.json || mc admin policy update minioadmin {{ .Values.name }}-policy /tmp/policy.json
+              mc admin policy create minioadmin tenant-{{ .Values.name }}-policy /tmp/policy.json || mc admin policy update minioadmin {{ .Values.name }}-policy /tmp/policy.json
               # Good enough for now, would need better error handeling
-              mc admin policy attach minioadmin {{ .Values.name }}-policy --user="$TENANT_USER" || echo "Policy already attached, skipping."
-              echo "MinIO setup completed for {{ .Values.name }}"
+              mc admin policy attach minioadmin tenant-{{ .Values.name }}-policy --user="$TENANT_USER" || echo "Policy already attached, skipping."
+              echo "MinIO setup completed for tenant-{{ .Values.name }}"