Some minor change

These modification allow user to reuse api key accross container deployments (For potential upgrade)