Fix the CSP
Fix up the warehouse repository
Switch to the new apt repo