Tag / detox and upgrade