Merge pull request #594 from jgehrcke/jp/backport-fix-593 #547

Job	Run time
basic / variables / variables	5s
basic / golang / check	1m 17s
basic / code-scanning / Analyze Go code with CodeQL	3m 47s
basic / golang / Unit test	2m 13s
basic / golang / Build	31s
image / build	4m 1s
chart / build-push	12s
	12m 6s

Provide feedback