diff --git a/live-build/ubuntu-cpc/hooks/ovf/ubuntu-ova-v1-cloudcfg-vmdk.tmpl b/live-build/ubuntu-cpc/hooks/ovf/ubuntu-ova-v1-cloudcfg-vmdk.tmpl
new file mode 100644
index 00000000..f91b75b2
--- /dev/null
+++ b/live-build/ubuntu-cpc/hooks/ovf/ubuntu-ova-v1-cloudcfg-vmdk.tmpl
@@ -0,0 +1,179 @@
+
+
+
+
+
+
+
+ Virtual disk information
+
+
+
+
+ The list of logical networks
+
+ The VM Network network
+
+
+
+ A virtual machine
+ @@NAME@@
+
+ The kind of installed guest operating system
+
+
+
+ Cloud-Init customization
+ Ubuntu @@VERSION@@ Server (@@DATE@@)
+
+
+ Specifies the instance id. This is required and used to determine if the machine should take "first boot" actions
+
+
+ Specifies the hostname for the appliance
+
+
+
+ This field is optional, but indicates that the instance should 'seed' user-data and meta-data from the given url. If set to 'http://tinyurl.com/sm-' is given, meta-data will be pulled from http://tinyurl.com/sm-meta-data and user-data from http://tinyurl.com/sm-user-data. Leave this empty if you do not want to seed from a url.
+
+
+
+ This field is optional, but indicates that the instance should populate the default user's 'authorized_keys' with this value
+
+
+
+ In order to fit into a xml attribute, this value is base64 encoded . It will be decoded, and then processed normally as user-data.
+
+
+
+
+ If set, the default user's password will be set to this value to allow password based login. The password will be good for only a single login. If set to the string 'RANDOM' then a random password will be generated, and written to the console.
+
+
+
+
+ Virtual hardware requirements
+
+ Virtual Hardware Family
+ 0
+ @@NAME@@
+ vmx-10
+
+
+ hertz * 10^6
+ Number of Virtual CPUs
+ @@NUM_CPUS@@ virtual CPU(s)
+ 1
+ 3
+ @@NUM_CPUS@@
+
+
+ byte * 2^20
+ Memory Size
+ @@MEM_SIZE@@MB of memory
+ 2
+ 4
+ @@MEM_SIZE@@
+
+
+ 0
+ SCSI Controller
+ SCSI Controller 0
+ 3
+ VirtualSCSI
+ 6
+
+
+ 1
+ IDE Controller
+ VirtualIDEController 1
+ 4
+ 5
+
+
+ 0
+ IDE Controller
+ VirtualIDEController 0
+ 5
+ 5
+
+
+ false
+ VirtualVideoCard
+ 6
+ 24
+
+
+
+
+
+
+
+ false
+ VirtualVMCIDevice
+ 7
+ vmware.vmci
+ 1
+
+
+
+ 0
+ false
+ CD-ROM 1
+ 8
+ 4
+ vmware.cdrom.remotepassthrough
+ 15
+
+
+
+ 0
+ Hard Disk 1
+ ovf:/disk/vmdisk1
+ 9
+ 3
+ 17
+
+
+
+ 1
+ ConfigDriveDisk
+ ovf:/disk/vmdisk2
+ 10
+ 3
+ 17
+
+
+
+ 7
+ true
+ VM Network
+ VmxNet3 ethernet adapter on "VM Network"
+ Ethernet 1
+ 11
+ VmxNet3
+ 10
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/live-build/ubuntu-cpc/hooks/ovf/ubuntu-ova-v1-vmdk.tmpl b/live-build/ubuntu-cpc/hooks/ovf/ubuntu-ova-v1-vmdk.tmpl
new file mode 100644
index 00000000..0eaa85a4
--- /dev/null
+++ b/live-build/ubuntu-cpc/hooks/ovf/ubuntu-ova-v1-vmdk.tmpl
@@ -0,0 +1,177 @@
+
+
+
+
+
+
+ Virtual disk information
+
+
+
+ The list of logical networks
+
+ The VM Network network
+
+
+
+ A virtual machine
+ @@NAME@@
+
+ The kind of installed guest operating system
+
+
+
+ Cloud-Init customization
+ Ubuntu @@VERSION@@ Server (@@DATE@@)
+
+
+ Specifies the instance id. This is required and used to determine if the machine should take "first boot" actions
+
+
+ Specifies the hostname for the appliance
+
+
+
+ This field is optional, but indicates that the instance should 'seed' user-data and meta-data from the given url. If set to 'http://tinyurl.com/sm-' is given, meta-data will be pulled from http://tinyurl.com/sm-meta-data and user-data from http://tinyurl.com/sm-user-data. Leave this empty if you do not want to seed from a url.
+
+
+
+ This field is optional, but indicates that the instance should populate the default user's 'authorized_keys' with this value
+
+
+
+ In order to fit into a xml attribute, this value is base64 encoded . It will be decoded, and then processed normally as user-data.
+
+
+
+
+ If set, the default user's password will be set to this value to allow password based login. The password will be good for only a single login. If set to the string 'RANDOM' then a random password will be generated, and written to the console.
+
+
+
+
+ Virtual hardware requirements
+
+ Virtual Hardware Family
+ 0
+ @@NAME@@
+ vmx-10
+
+
+ hertz * 10^6
+ Number of Virtual CPUs
+ @@NUM_CPUS@@ virtual CPU(s)
+ 1
+ 3
+ @@NUM_CPUS@@
+
+
+ byte * 2^20
+ Memory Size
+ @@MEM_SIZE@@MB of memory
+ 2
+ 4
+ @@MEM_SIZE@@
+
+
+ 0
+ SCSI Controller
+ SCSI Controller 0
+ 3
+ VirtualSCSI
+ 6
+
+
+ 1
+ IDE Controller
+ VirtualIDEController 1
+ 4
+ 5
+
+
+ 0
+ IDE Controller
+ VirtualIDEController 0
+ 5
+ 5
+
+
+ false
+ VirtualVideoCard
+ 6
+ 24
+
+
+
+
+
+
+
+ false
+ VirtualVMCIDevice
+ 7
+ vmware.vmci
+ 1
+
+
+
+ 0
+ false
+ CD-ROM 1
+ 8
+ 4
+ vmware.cdrom.remotepassthrough
+ 15
+
+
+
+ 0
+ Hard Disk 1
+ ovf:/disk/vmdisk1
+ 9
+ 3
+ 17
+
+
+
+ 0
+ false
+ Floppy Drive
+ Floppy 1
+ 10
+ vmware.floppy.remotedevice
+ 14
+
+
+ 7
+ true
+ VM Network
+ VmxNet3 ethernet adapter on "VM Network"
+ Ethernet 1
+ 11
+ VmxNet3
+ 10
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/live-build/ubuntu-cpc/hooks/ovf/ubuntu-ovf-v1-img.tmpl b/live-build/ubuntu-cpc/hooks/ovf/ubuntu-ovf-v1-img.tmpl
new file mode 100644
index 00000000..161b8f61
--- /dev/null
+++ b/live-build/ubuntu-cpc/hooks/ovf/ubuntu-ovf-v1-img.tmpl
@@ -0,0 +1,130 @@
+
+
+
+
+
+
+ Virtual disk information
+
+
+
+ The list of logical networks
+
+ The bridged network
+
+
+
+ A virtual machine
+ $VIRTUAL_SYSTEM_NAME
+
+ $VIRTUAL_SYSTEM_OS_INFO
+
+
+ Cloud-Init customization
+ $VIRTUAL_SYSTEM_OS_INFO
+
+
+ Specifies the instance id. This is required and used to determine if the machine should take "first boot" actions
+
+
+ Specifies the hostname for the appliance
+
+
+
+ This field is optional, but indicates that the instance should 'seed' user-data and meta-data from the given url. If set to 'http://tinyurl.com/sm-' is given, meta-data will be pulled from http://tinyurl.com/sm-meta-data and user-data from http://tinyurl.com/sm-user-data. Leave this empty if you do not want to seed from a url.
+
+
+
+ This field is optional, but indicates that the instance should populate the default user's 'authorized_keys' with this value
+
+
+
+ In order to fit into a xml attribute, this value is base64 encoded . It will be decoded, and then processed normally as user-data.
+
+
+
+
+ If set, the default user's password will be set to this value to allow password based login. The password will be good for only a single login. If set to the string 'RANDOM' then a random password will be generated, and written to the console.
+
+
+
+ Virtual hardware requirements
+
+ Virtual Hardware Family
+ 0
+ $VIRTUAL_SYSTEM_IDENTIFIER
+ $VIRTUAL_SYSTEM_TYPES
+
+
+ hertz * 10^6
+ Number of Virtual CPUs
+ 1 virtual CPU(s)
+ 1
+ 3
+ 1
+
+
+ byte * 2^20
+ Memory Size
+ 256MB of memory
+ 2
+ 4
+ 256
+
+
+ 0
+ USB Controller
+ usb
+ 3
+ 23
+
+
+ 0
+ SCSI Controller
+ scsiController0
+ 4
+ lsilogic
+ 6
+
+
+ 1
+ IDE Controller
+ ideController1
+ 5
+ 5
+
+
+ 0
+ false
+ cdrom1
+ 6
+ 5
+ 15
+
+
+ 0
+ disk1
+ ovf:/disk/vmdisk1
+ 7
+ 4
+ 17
+
+
+ 2
+ true
+ bridged
+ ethernet adapter on "bridged"
+ ethernet0
+ 8
+ E1000
+ 10
+
+
+
+ $ANNOTATION_INFO
+ $ANNOTATION
+
+
+