Refactor some things #2775

Namespace: <a href="https://konflux-ui.apps.stone-prd-rh01.pg1f.p1.openshiftapps.com/ns/crt-redhat-acm-tenant" rel="nofollow">crt-redhat-acm-tenant
PipelineRun: <a href="https://konflux-ui.apps.stone-prd-rh01.pg1f.p1.openshiftapps.com/ns/crt-redhat-acm-tenant/pipelinerun/hive-mce-211-on-pull-request-86tvj" rel="nofollow">hive-mce-211-on-pull-request-86tvj

Success

Red Hat Konflux/hive-mce-211-on-pull-request has successfully validated your commit.

Status	Duration	Name
🟢 Succeeded	5 seconds	init
🟢 Succeeded	31 seconds	clone-repository
🟢 Succeeded	1 minute	prefetch-dependencies
🟢 Succeeded	15 minutes	build-images
🟢 Succeeded	11 seconds	build-image-index
🟢 Succeeded	23 seconds	sast-shell-check
🟢 Succeeded	1 minute	ecosystem-cert-preflight-checks
🟢 Succeeded	43 seconds	sast-snyk-check
🟢 Succeeded	6 seconds	coverity-availability-check
🟢 Succeeded	6 seconds	deprecated-base-image-check
🟢 Succeeded	14 seconds	push-dockerfile
🟢 Succeeded	50 seconds	build-source-image
🟢 Succeeded	31 seconds	clair-scan
🟢 Succeeded	1 minute	clamav-scan
🟢 Succeeded	22 seconds	rpms-signature-scan
🟢 Succeeded	2 minutes	sast-unicode-check
🟢 Succeeded	7 seconds	apply-tags
🟢 Succeeded	6 seconds	show-sbom