Better deploy setup