diff --git a/fluent-bit.yml b/fluent-bit.yml
index ea08e78..2b3ea82 100644
--- a/fluent-bit.yml
+++ b/fluent-bit.yml
@@ -1,4 +1,4 @@
-- hosts: all
+- hosts: '!kubelet'
   roles:
   - role: fluent-bit
     tags: fluent-bit
diff --git a/group_vars/k8s-controller.yml b/group_vars/k8s-controller.yml
index ae75c43..f72f948 100644
--- a/group_vars/k8s-controller.yml
+++ b/group_vars/k8s-controller.yml
@@ -1,5 +1,4 @@
 collectd_processes: '{{ collectd_processes_kubelet + collectd_processes_controller}}'
-dnf_automatic_reboot: never
 
 keepalived_global_defs: |-
   max_auto_priority 79
diff --git a/group_vars/kubelet.yml b/group_vars/kubelet.yml
index c65a79c..e972f39 100644
--- a/group_vars/kubelet.yml
+++ b/group_vars/kubelet.yml
@@ -1,3 +1,5 @@
+dnf_automatic_reboot_command: touch /run/reboot-needed
+
 samba_interfaces:
 - '{{ ansible_default_ipv4.interface }}'
 host_uses_firewalld: false
diff --git a/roles/dnf-automatic/defaults/main.yml b/roles/dnf-automatic/defaults/main.yml
index 3474e71..4169e3b 100644
--- a/roles/dnf-automatic/defaults/main.yml
+++ b/roles/dnf-automatic/defaults/main.yml
@@ -1,4 +1,6 @@
 dnf_automatic_reboot: when-needed
+dnf_automatic_reboot_command: >-
+  shutdown -r +5 'Rebooting after applying package updates'
 dnf_automatic_email_from: root@example.com
 dnf_automatic_email_to: root
 dnf_automatic_email_host: localhost
diff --git a/roles/dnf-automatic/files/pre-reboot.sh b/roles/dnf-automatic/files/pre-reboot.sh
new file mode 100644
index 0000000..57f5c61
--- /dev/null
+++ b/roles/dnf-automatic/files/pre-reboot.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+find /etc/dnf/automatic/pre-reboot.d \
+	-type f \
+	-perm -u+x \
+	-exec {} \;
+shutdown -r +5 'Rebooting after applying package updates'
diff --git a/roles/dnf-automatic/templates/dnf-automatic.conf.j2 b/roles/dnf-automatic/templates/dnf-automatic.conf.j2
index 40a4197..4751d39 100644
--- a/roles/dnf-automatic/templates/dnf-automatic.conf.j2
+++ b/roles/dnf-automatic/templates/dnf-automatic.conf.j2
@@ -28,7 +28,7 @@ apply_updates = yes
 reboot = {{ dnf_automatic_reboot }}
 
 # The command that is run to trigger a system reboot.
-reboot_command = "shutdown -r +5 'Rebooting after applying package updates'"
+reboot_command = "{{ dnf_automatic_reboot_command }}"
 
 
 [emitters]