eliminate hardcoded container prefix