[GONRG-4396] Small refactor

5 jobs for GONRG-4396-Add-https-option in 48 seconds (queued for 1 second)