diff --git a/hetzner-debian10-zfs-setup.sh b/hetzner-debian10-zfs-setup.sh
index e47aa7b..77ee1cb 100644
--- a/hetzner-debian10-zfs-setup.sh
+++ b/hetzner-debian10-zfs-setup.sh
@@ -479,6 +479,8 @@ ask_root_password
 
 ask_hostname
 
+determine_kernel_variant
+
 clear
 
 echo "===========remove unused kernels in rescue system========="
diff --git a/hetzner-ubuntu18-zfs-setup.sh b/hetzner-ubuntu18-zfs-setup.sh
index 932909b..238ee92 100644
--- a/hetzner-ubuntu18-zfs-setup.sh
+++ b/hetzner-ubuntu18-zfs-setup.sh
@@ -356,6 +356,8 @@ function ask_hostname {
 function determine_kernel_variant {
   if dmidecode | grep -q vServer; then
     v_kernel_variant="-virtual"
+  else
+    v_kernel_variant="-generic"
   fi
 }
 
@@ -444,6 +446,8 @@ ask_root_password
 
 ask_hostname
 
+determine_kernel_variant
+
 clear
 
 echo "===========remove unused kernels in rescue system========="
@@ -665,7 +669,12 @@ chroot_execute "rm -f /etc/localtime /etc/timezone"
 chroot_execute "dpkg-reconfigure tzdata -f noninteractive "
 
 echo "======= installing latest kernel============="
-chroot_execute "DEBIAN_FRONTEND=noninteractive apt install --yes linux-headers${v_kernel_variant}-hwe-18.04 linux-image${v_kernel_variant}-hwe-18.04 linux-image-extra${v_kernel_variant}-hwe-18.04"
+chroot_execute "DEBIAN_FRONTEND=noninteractive apt install --yes linux-headers${v_kernel_variant}-hwe-18.04 linux-image${v_kernel_variant}-hwe-18.04"
+if [[ $v_kernel_variant == "-virtual" ]]; then
+  # linux-image-extra is only available for virtual hosts
+  chroot_execute "DEBIAN_FRONTEND=noninteractive apt install --yes linux-image-extra-virtual-hwe-18.04"
+fi
+
 
 echo "======= installing aux packages =========="
 chroot_execute "apt install --yes man wget curl software-properties-common nano htop gnupg"