diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2260ee81..714e161e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,8 @@ The **patch** part changes is incremented if multiple releases happen the same m
 
 ### Added
 
+* evolinux-base: replace regular kernel by cloud kernel on virtual servers
+
 ### Changed
 
 * evolinux-base: utils.yml can be excluded
diff --git a/evolinux-base/defaults/main.yml b/evolinux-base/defaults/main.yml
index 80db9d3b..d75a23bf 100644
--- a/evolinux-base/defaults/main.yml
+++ b/evolinux-base/defaults/main.yml
@@ -48,6 +48,7 @@ evolinux_internal_fqdn:     "{{ evolinux_internal_hostname }}.{{ evolinux_intern
 
 evolinux_kernel_include: True
 
+evolinux_kernel_cloud_auto: True
 evolinux_kernel_reboot_after_panic: True
 evolinux_kernel_disable_tcp_timestamps: True
 evolinux_kernel_customize_swappiness: True
diff --git a/evolinux-base/tasks/kernel.yml b/evolinux-base/tasks/kernel.yml
index 6ddeb57f..62569b08 100644
--- a/evolinux-base/tasks/kernel.yml
+++ b/evolinux-base/tasks/kernel.yml
@@ -1,5 +1,23 @@
 ---
 
+- name: "Use Cloud kernel on virtual servers"
+  apt:
+    name: "linux-image-cloud-amd64"
+    state: present
+  when:
+    - ansible_machine == "x86_64"
+    - ansible_virtualization_role == "guest"
+    - evolinux_kernel_cloud_auto | bool
+
+- name: "Remove non-Cloud kernel on virtual servers"
+  apt:
+    name: "linux-image-amd64"
+    state: absent
+  when:
+    - ansible_machine == "x86_64"
+    - ansible_virtualization_role == "guest"
+    - evolinux_kernel_cloud_auto | bool
+
 - name: Reboot after panic
   sysctl:
     name: "{{ item.name }}"