Remove entrypoint from container_system_option_names as well