ci: Move non-image-tag variables back to .gitlab-ci.yml