diff --git a/tasks/main.yml b/tasks/main.yml
index 8e6b9f4..b9cd5da 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,16 +1,17 @@
 - name: Add keys
-  loop: "{{ apt.keys }}"
+  loop: "{{ apt.sign_keys }}"
   apt_key:
-        url: "{{ item }}"
+        url: '{{ item }}'
   tags:
-        - packages
         - apt
-  when: (apt.keys| default([])) | length
+  when: (apt.sign_keys| default([])) | length
 - name: Add repositories
   loop: "{{ apt.repos }}"
   apt_repository:
         repo: 'deb {{ item.repo }}'
         filename: '{{ item.file }}'
+  tags:
+        - apt
   when: (apt.repos| default([])) | length
 - name: Install packages
   loop: "{{ apt.packages }}"
@@ -28,6 +29,7 @@
         name: "*"
         state: latest
   tags:
+        - apt
         - packages
   when: (apt.upgrade| default(false))
 - name: Clean up unused dependencies and packages
@@ -35,5 +37,6 @@
         autoremove: yes
         autoclean: yes
   tags:
+        - apt
         - packages
   when: (apt.clean| default(false))