Updating to use service prefix on env variables