Improved/corrected https URL assignment, and limited to production