Backport 1305 to 1.8

[grcevski]

Backports the fixes from #1305 to 1.8

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 81.02%. Comparing base (61514e0) to head (b150a44).
Report is 2 commits behind head on release-1.8.

Additional details and impacted files

@@               Coverage Diff               @@
##           release-1.8    #1366      +/-   ##
===============================================
- Coverage        81.10%   81.02%   -0.09%     
===============================================
  Files              140      140              
  Lines            14070    14068       -2     
===============================================
- Hits             11411    11398      -13     
- Misses            2138     2147       +9     
- Partials           521      523       +2     

Flag	Coverage Δ
integration-test	57.00% <ø> (-0.05%)	⬇️
k8s-integration-test	58.08% <ø> (-0.02%)	⬇️
oats-test	36.27% <ø> (+<0.01%)	⬆️
unittests	52.06% <ø> (-0.02%)	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

[mariomac]

LGTM! To publish the docker image we'd also need to backport this PR: #1372