Merge remote-tracking branch 'lorenzboguhn/fix/378-adjust-CRD-objects' into use-image-for-helm-testing-in-ci