VER-503 updates for easier deployment