diff --git a/charts/tenant/templates/minio-setup.yaml b/charts/tenant/templates/minio-setup.yaml
index eb2b669..67f0750 100644
--- a/charts/tenant/templates/minio-setup.yaml
+++ b/charts/tenant/templates/minio-setup.yaml
@@ -52,15 +52,18 @@ spec:
             - /bin/sh
             - -c
             - |
-              # Connect to MinIO using admin secret from env
-              mc alias set minioadmin http://minio.minio.svc.cluster.local:9000 $MINIO_ADMIN_USER $MINIO_ADMIN_PASS
+              # Fail immediately if any command fails
+              set -e 
+
+              # Connect to MinIO using quotes to protect special characters in passwords
+              mc alias set minioadmin http://minio.minio.svc.cluster.local:9000 "$MINIO_ADMIN_USER" "$MINIO_ADMIN_PASS"
 
               # Create buckets
               mc mb --ignore-existing minioadmin/$BUCKET_REF
               mc mb --ignore-existing minioadmin/$BUCKET_WORK
 
-              # Create tenant user using randomly generated password
-              mc admin user add minioadmin $TENANT_USER $TENANT_PASS || true
+              # Create tenant user (REMOVED || true)
+              mc admin user add minioadmin "$TENANT_USER" "$TENANT_PASS"
 
               # Apply IAM isolation policy
               cat <<EOF > /tmp/policy.json
@@ -89,6 +92,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 attach minioadmin {{ .Values.name }}-policy --user=$TENANT_USER
+              mc admin policy attach minioadmin {{ .Values.name }}-policy --user="$TENANT_USER"
               echo "MinIO setup completed for {{ .Values.name }}"