Merge "Fix Docker Container Build Tagging"