diff --git a/roles/common/handlers/main.yml b/roles/common/handlers/main.yml
deleted file mode 100644
index 230d3e4..0000000
--- a/roles/common/handlers/main.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: upgrade packages
-  apt:
-    upgrade: full
-    update_cache: yes
-
-- name: clean package cache
-  command: apt-get clean
diff --git a/roles/common/tasks/pre-tasks.yml b/roles/common/tasks/pre-tasks.yml
index a6c514d..7052e15 100644
--- a/roles/common/tasks/pre-tasks.yml
+++ b/roles/common/tasks/pre-tasks.yml
@@ -3,6 +3,8 @@
   apt:
     name: "{{ item }}"
     state: present
+    update_cache: yes
+    cache_valid_time: 86400
   with_items:
     - aptitude
     - python-apt
diff --git a/roles/common/tasks/unattended-upgrades.yml b/roles/common/tasks/unattended-upgrades.yml
index 14b5ef6..7f64739 100644
--- a/roles/common/tasks/unattended-upgrades.yml
+++ b/roles/common/tasks/unattended-upgrades.yml
@@ -13,6 +13,3 @@
   template:
     src: templates/50unattended-upgrades.j2
     dest: /etc/apt/apt.conf.d/50unattended-upgrades
-  notify:
-    - upgrade packages
-    - clean package cache