INFRA-39 Adding workaround for QA Hosts