Fix builder spec
Fix deploy spec