Remove tenant-id from containers URLs

Change-Id: Icedfc10e7d3872e8194c3c33460cac780c2c6af1