diff --git a/roles/base/templates/dnf-automatic-install.service-36.j2 b/roles/base/templates/dnf-automatic-install.service-36.j2
new file mode 100644
index 0000000..58b55d1
--- /dev/null
+++ b/roles/base/templates/dnf-automatic-install.service-36.j2
@@ -0,0 +1,2 @@
+[Service]
+ExecStartPost=/bin/sh -ec 'dnf needs-restarting -r | grep -q "Reboot is req.*" && shutdown -r +5 Rebooting after applying package updates || exit 0'