Include the container name in the source parameter.
Uset the old metric keys