GONRG-1885: refactored vars

2 jobs for !63 with gcp-refactor-url-vars in 55 seconds (queued for 1 second)
latest merge request