diff --git a/bootstrapvz/providers/azure/tasks/packages-kernels.yml b/bootstrapvz/providers/azure/tasks/packages-kernels.yml
new file mode 100644
index 0000000..1279faf
--- /dev/null
+++ b/bootstrapvz/providers/azure/tasks/packages-kernels.yml
@@ -0,0 +1,14 @@
+---
+# This is a mapping of Debian release codenames to processor architectures to kernel packages
+squeeze:
+  amd64: linux-image-amd64
+  i386: linux-image-686
+wheezy:
+  amd64: linux-image-amd64
+  i386: linux-image-686
+jessie:
+  amd64: linux-image-amd64
+  i386: linux-image-686-pae
+sid:
+  amd64: linux-image-amd64
+  i386: linux-image-686-pae
diff --git a/bootstrapvz/providers/azure/tasks/packages.py b/bootstrapvz/providers/azure/tasks/packages.py
index 40a51e2..b7d2558 100644
--- a/bootstrapvz/providers/azure/tasks/packages.py
+++ b/bootstrapvz/providers/azure/tasks/packages.py
@@ -11,14 +11,18 @@ class DefaultPackages(Task):
 
 	@classmethod
 	def run(cls, info):
-		kernels = {'amd64': 'linux-image-amd64',
-		           'i386':  'linux-image-686', }
-		info.packages.add(kernels.get(info.manifest.system['architecture']))
 		info.packages.add('openssl')
 		info.packages.add('python-openssl')
 		info.packages.add('python-pyasn1')
 		info.packages.add('sudo')
 
+		import os.path
+		kernel_packages_path = os.path.join(os.path.dirname(__file__), 'packages-kernels.yml')
+		from bootstrapvz.common.tools import config_get
+		kernel_package = config_get(kernel_packages_path, [info.release_codename,
+		                                                   info.manifest.system['architecture']])
+		info.packages.add(kernel_package)
+
 
 class Waagent(Task):
 	description = 'Add waagent'
diff --git a/bootstrapvz/providers/gce/tasks/packages-kernels.yml b/bootstrapvz/providers/gce/tasks/packages-kernels.yml
new file mode 100644
index 0000000..1d5a4a0
--- /dev/null
+++ b/bootstrapvz/providers/gce/tasks/packages-kernels.yml
@@ -0,0 +1,14 @@
+---
+# This is a mapping of Debian release codenames to processor architectures to kernel packages
+squeeze: # In squeeze, we need a special kernel flavor for xen
+  amd64: linux-image-xen-amd64
+  i386: linux-image-xen-686
+wheezy:
+  amd64: linux-image-amd64
+  i386: linux-image-686
+jessie:
+  amd64: linux-image-amd64
+  i386: linux-image-686-pae
+sid:
+  amd64: linux-image-amd64
+  i386: linux-image-686-pae
diff --git a/bootstrapvz/providers/gce/tasks/packages.py b/bootstrapvz/providers/gce/tasks/packages.py
index 8bee994..dc964e5 100644
--- a/bootstrapvz/providers/gce/tasks/packages.py
+++ b/bootstrapvz/providers/gce/tasks/packages.py
@@ -21,7 +21,7 @@ class DefaultPackages(Task):
 		info.packages.add('openssh-server')
 		info.packages.add('dhcpd')
 
-		kernel_packages_path = os.path.join(os.path.dirname(__file__), '../../ec2/tasks/packages-kernels.yml')
+		kernel_packages_path = os.path.join(os.path.dirname(__file__), 'packages-kernels.yml')
 		from bootstrapvz.common.tools import config_get
 		kernel_package = config_get(kernel_packages_path, [info.release_codename,
 		                                                   info.manifest.system['architecture']])
diff --git a/bootstrapvz/providers/kvm/tasks/packages-kernels.yml b/bootstrapvz/providers/kvm/tasks/packages-kernels.yml
new file mode 100644
index 0000000..1279faf
--- /dev/null
+++ b/bootstrapvz/providers/kvm/tasks/packages-kernels.yml
@@ -0,0 +1,14 @@
+---
+# This is a mapping of Debian release codenames to processor architectures to kernel packages
+squeeze:
+  amd64: linux-image-amd64
+  i386: linux-image-686
+wheezy:
+  amd64: linux-image-amd64
+  i386: linux-image-686
+jessie:
+  amd64: linux-image-amd64
+  i386: linux-image-686-pae
+sid:
+  amd64: linux-image-amd64
+  i386: linux-image-686-pae
diff --git a/bootstrapvz/providers/kvm/tasks/packages.py b/bootstrapvz/providers/kvm/tasks/packages.py
index 85ad028..7498c53 100644
--- a/bootstrapvz/providers/kvm/tasks/packages.py
+++ b/bootstrapvz/providers/kvm/tasks/packages.py
@@ -10,6 +10,9 @@ class DefaultPackages(Task):
 
 	@classmethod
 	def run(cls, info):
-		kernels = {'amd64': 'linux-image-amd64',
-		           'i386':  'linux-image-686', }
-		info.packages.add(kernels.get(info.manifest.system['architecture']))
+		import os.path
+		kernel_packages_path = os.path.join(os.path.dirname(__file__), 'packages-kernels.yml')
+		from bootstrapvz.common.tools import config_get
+		kernel_package = config_get(kernel_packages_path, [info.release_codename,
+		                                                   info.manifest.system['architecture']])
+		info.packages.add(kernel_package)
diff --git a/bootstrapvz/providers/virtualbox/tasks/packages-kernels.yml b/bootstrapvz/providers/virtualbox/tasks/packages-kernels.yml
new file mode 100644
index 0000000..1279faf
--- /dev/null
+++ b/bootstrapvz/providers/virtualbox/tasks/packages-kernels.yml
@@ -0,0 +1,14 @@
+---
+# This is a mapping of Debian release codenames to processor architectures to kernel packages
+squeeze:
+  amd64: linux-image-amd64
+  i386: linux-image-686
+wheezy:
+  amd64: linux-image-amd64
+  i386: linux-image-686
+jessie:
+  amd64: linux-image-amd64
+  i386: linux-image-686-pae
+sid:
+  amd64: linux-image-amd64
+  i386: linux-image-686-pae
diff --git a/bootstrapvz/providers/virtualbox/tasks/packages.py b/bootstrapvz/providers/virtualbox/tasks/packages.py
index 8235c32..ccdb419 100644
--- a/bootstrapvz/providers/virtualbox/tasks/packages.py
+++ b/bootstrapvz/providers/virtualbox/tasks/packages.py
@@ -10,6 +10,9 @@ class DefaultPackages(Task):
 
 	@classmethod
 	def run(cls, info):
-		kernels = {'amd64': 'linux-image-amd64',
-		           'i386':  'linux-image-686', }
-		info.packages.add(kernels.get(info.manifest.system['architecture']))
+		import os.path
+		kernel_packages_path = os.path.join(os.path.dirname(__file__), 'packages-kernels.yml')
+		from bootstrapvz.common.tools import config_get
+		kernel_package = config_get(kernel_packages_path, [info.release_codename,
+		                                                   info.manifest.system['architecture']])
+		info.packages.add(kernel_package)