🐛 Cherry picks to release-0.6 for hub SCC fixes (#765) #1978

Job	Run time
fmt	15s
test-unit	10m 46s
vet	1m 26s
build	2m 14s
test-api	2m 38s
build-image	2m 5s
test-integration / check-images	2s
test-integration / e2e-api-integration-tests	21m 10s
test-integration / e2e-ui-integration-tests	0s
	40m 36s

Provide feedback