Worked on the xcp-ng/xcp-ng-tests repository to enhance the robustness of Storage Repository (SR) lifecycle management. Addressed a critical reliability issue by ensuring that when SR destruction fails, essential tooling for XFS, Linstor, and GlusterFS is preserved rather than automatically uninstalled. This approach allows for manual cleanup and troubleshooting, reducing downtime and supporting faster recovery in failure scenarios. The solution was implemented through targeted Python code changes and DevOps practices, with comprehensive testing using pytest. The work focused on non-destructive cleanup behavior, improving system reliability and maintainability for complex storage environments without introducing new features during the period.