[WIP] Fix implementation based on feedback for PR #7#9

danielbodnar merged 2 commits intocopilot/fix-cef75252-0b61-4f39-977f-b9f896d82b67bitbuilder-io/bitbuilder-hypervisor:copilot/fix-cef75252-0b61-4f39-977f-b9f896d82b67from

copilot/sub-pr-7-againbitbuilder-io/bitbuilder-hypervisor:copilot/sub-pr-7-againCopy head branch name to clipboard