During March 2026, Samaity focused on enhancing the reliability of container shutdowns in the cri-o/cri-o repository. Addressing a race condition that could cause panics when StopContainer interacted with a closed stopTimeoutChan, Samaity introduced a guard leveraging the internal stopDone state within WaitOnStopTimeout. This approach ensured that shutdown operations would safely early-return if the container was already stopped, reducing operational risk and downtime. The solution was implemented using Go, with an emphasis on concurrent programming and container orchestration principles. Samaity’s work addressed OCPBUGS-76451, contributing a targeted bug fix that improved container lifecycle stability across orchestrated environments.