diff --git a/playbooks/luks_ssh.yml b/playbooks/luks_ssh.yml
index a617489..8ce255c 100644
--- a/playbooks/luks_ssh.yml
+++ b/playbooks/luks_ssh.yml
@@ -1,5 +1,4 @@
 ---
-
 # Infrastructure
 # Ansible instructions to deploy the infrastructure
 # Copyright (C) 2019-2020  Christoph (Sheogorath) Kern
@@ -18,6 +17,12 @@
 
 - name: Install & configure LUKS SSH setup
   hosts: luks_ssh
-  roles:
-    - haveged
-    - luks_ssh
+  tasks:
+    - name: Install haveged
+      ansible.builtin.include_role:
+        name: haveged
+      when: ansible_kernel is version('5.4', '<')
+
+    - name: Install LUKS SSH
+      ansible.builtin.include_role:
+        name: luks_ssh