EB-8090 - Updated to get correct http/https schema