Fix base for new api-gateway
Fix user for new api-gateway
Fix roles for api-gateway update