QEMU - Is it possible to merge a kernel image and drive image into a single raw or qcow2 image?

Question

We are currently using a qemu kvm, on physical systems, that contains a custom kernel and our drive image that we us for our testing and would like to move this to run within ou