diff --git a/roles/common/tasks/main.yaml b/roles/common/tasks/main.yaml
index d1397d4..92defe1 100644
--- a/roles/common/tasks/main.yaml
+++ b/roles/common/tasks/main.yaml
@@ -16,16 +16,13 @@
   with_items:
     - { src: "apt.conf.j2", dest: "/etc/apt/apt.conf" }
     - { src: "sources.list.j2", dest: "/etc/apt/sources.list" }
+    - { src: "apt-auto-upgrades.j2", dest: "/etc/apt/apt.conf.d/20auto-upgrades" }
+    - { src: "apt-unattended-upgrades.j2", dest: "/etc/apt/apt.conf.d/50unattended-upgrades" }
   when:
     - ansible_os_family == "Debian"
   tags:
     - sourceslist
 
-- name: Import unattended-updates
-  ansible.builtin.import_tasks:
-    file: unattended-updates.yaml
-  tags: unattended_updates
-
 - name: Update authorized_keys
   ansible.builtin.template:
     src: authorized_keys.j2
@@ -72,6 +69,8 @@
       - tree
       - neovim
       - vim
+      - unattended-upgrades
+      - apt-listchanges
 
 - name: Configure FZF for Bash
   ansible.builtin.lineinfile:
diff --git a/roles/common/tasks/unattended-updates.yaml b/roles/common/tasks/unattended-updates.yaml
deleted file mode 100644
index 43a7f96..0000000
--- a/roles/common/tasks/unattended-updates.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-- name: Install unattended-upgrades
-  ansible.builtin.apt:
-    name:
-      - unattended-upgrades
-      - apt-listchanges
-    state: present
-
-- name: Configure auto-upgrades
-  ansible.builtin.template:
-    src: auto-upgrades
-    dest: /etc/apt/apt.conf.d/20auto-upgrades
-    owner: root
-    group: root
-    mode: 0644
-
-- name: Configure unattended-upgrades
-  ansible.builtin.template:
-    src: unattended-upgrades
-    dest: /etc/apt/apt.conf.d/50unattended-upgrades
-    owner: root
-    group: root
-    mode: 0644
diff --git a/roles/common/templates/auto-upgrades b/roles/common/templates/apt-auto-upgrades.j2
similarity index 100%
rename from roles/common/templates/auto-upgrades
rename to roles/common/templates/apt-auto-upgrades.j2
diff --git a/roles/common/templates/unattended-upgrades b/roles/common/templates/apt-unattended-upgrades.j2
similarity index 100%
rename from roles/common/templates/unattended-upgrades
rename to roles/common/templates/apt-unattended-upgrades.j2