remove username in naming containers