diff --git a/charts/tenant/templates/minio-setup.yaml b/charts/tenant/templates/minio-setup.yaml
index 67f0750..04b22d1 100644
--- a/charts/tenant/templates/minio-setup.yaml
+++ b/charts/tenant/templates/minio-setup.yaml
@@ -94,5 +94,6 @@ spec:
 
               # 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"
+              # 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 }}"