Re-jig make/deploy