Undercloud scripts tweaks