[backport-1.3]: Proxy vars are causing rolling update on CI runs

Issue #2424 (closed) needs to be backported to 1.3.x