Port a71da850d93 from gitlab-ce See merge request gitlab-org/cluster-integration/auto-deploy-image!13