diff --git a/manifests/kvm-virtio.manifest.json b/manifests/kvm-virtio.manifest.json
index 689ad4a..01452f9 100644
--- a/manifests/kvm-virtio.manifest.json
+++ b/manifests/kvm-virtio.manifest.json
@@ -2,20 +2,20 @@
 	"provider": "kvm",
 	"bootstrapper": {
 		"workspace":      "/target",
-		"mirror": "http://ftp.fr.debian.org/debian/",
-		"virtio" : [ "virtio_pci", "virtio_blk" ]
+		"mirror": "http://ftp.fr.debian.org/debian/"
 	},
 	"image": {
 		"name":        "debian-{system.release}-{system.architecture}-{%y}{%m}{%d}",
 		"description": "Debian {system.release} {system.architecture}"
 	},
 	"system": {
-		"release":      "wheezy",
-		"architecture": "amd64",
-		"bootloader":   "grub",
-		"timezone":     "UTC",
-		"locale":       "en_US",
-		"charmap":      "UTF-8"
+		"release":        "wheezy",
+		"architecture":   "amd64",
+		"bootloader":     "grub",
+		"timezone":       "UTC",
+		"locale":         "en_US",
+		"charmap":        "UTF-8",
+		"virtio_modules": [ "virtio_pci", "virtio_blk" ]
 	},
 	"packages": {},
 	"volume": {
diff --git a/providers/kvm/manifest-schema.json b/providers/kvm/manifest-schema.json
index 12937c8..3586e4e 100644
--- a/providers/kvm/manifest-schema.json
+++ b/providers/kvm/manifest-schema.json
@@ -3,21 +3,22 @@
 	"title": "KVM manifest",
 	"type": "object",
 	"properties": {
-		"bootstrapper": {
+		"system": {
 			"type": "object",
 			"properties": {
 				"virtio": {
 					"type": "array",
 					"items": {
-						"type": "string"
+						"type": "string",
+						"enum": ["virtio",
+						         "virtio_pci",
+						         "virtio_balloon",
+						         "virtio_blk",
+						         "virtio_net",
+						         "virtio_ring"]
 					},
 					"minItems": 1
-				}
-			}
-		},
-		"system": {
-			"type": "object",
-			"properties": {
+				},
 				"bootloader": {
 					"type": "string",
 					"enum": ["grub", "extlinux"]
diff --git a/providers/kvm/tasks/virtio.py b/providers/kvm/tasks/virtio.py
index 06bb603..96c05cb 100644
--- a/providers/kvm/tasks/virtio.py
+++ b/providers/kvm/tasks/virtio.py
@@ -12,5 +12,5 @@ class VirtIO(Task):
 		modules = os.path.join(info.root, '/etc/initramfs-tools/modules')
 		with open(modules, "a") as modules_file:
 			modules_file.write("\n")
-			for module in info.manifest.bootstrapper.get('virtio', []):
+			for module in info.manifest.system.get('virtio', []):
 				modules_file.write(module + "\n")