diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7cf1560..1c7efa7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,10 @@ Changelog
 
 - Allow to generate keys and configuration for non-ansible hosts like smartphones with `wireguard_unmanaged_hosts` (see `defaults/main.yml`) (contribution by @juju4)
 
+**6.3.1**
+
+- Support Openstack Debian images (contribution by @pallinger)
+
 **6.3.0**
 
 - Support Raspbian (contribution by @penguineer)
diff --git a/tasks/setup-debian-vanilla.yml b/tasks/setup-debian-vanilla.yml
index d874d65..0b6aa0b 100644
--- a/tasks/setup-debian-vanilla.yml
+++ b/tasks/setup-debian-vanilla.yml
@@ -18,10 +18,13 @@
   register: dpkg_arch
   changed_when: False
 
+- set_fact:
+    kernel_header_version: "{{ ('-cloud-' in ansible_kernel) | ternary(ansible_kernel,dpkg_arch.stdout) }}"
+
 - name: (Debian) Install kernel headers to compile Wireguard with DKMS
   apt:
     name:
-      - "linux-headers-{{ dpkg_arch.stdout }}"
+      - "linux-headers-{{ kernel_header_version }}"
     state: present
 
 - name: (Debian) Install wireguard packages