Improve housekeeping (Workshop, Z1 and Z2)
Hazard category: Housekeeping