diff --git a/tasks/main.yml b/tasks/main.yml
index 10d79a5..1e635ec 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -10,7 +10,7 @@
     owner: root
     group: root
   when: item.credentials is defined
-  with_items: "{{ _ops_tools.apt_repos | default([]) }}"
+  with_items: "{{ _ops_tools.credentials | default([]) }}"
   register: new_credentials
 
 - name: Download APT keys
@@ -57,8 +57,8 @@
     suites: "{{ item.suites }}"
     components: "{{ item.components }}"
     signed_by: "{{ item.signed_by }}"
-  when: item.deb822_repository is defined
-  with_items: "{{ _ops_tools.apt_repos | default([]) }}"
+  when: item.name is defined
+  with_items: "{{ _ops_tools.deb822_repository | default([]) }}"
   register: new_deb822
 
 - name: Update APT Cache # noqa: no-handler