diff --git a/tasks/main.yml b/tasks/main.yml
index 4390df8..f5e84b5 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -7,12 +7,12 @@
       become: true
       get_url: 
         url: https://repo.powerdns.com/FD380FBB-pub.asc
-        dest: "/etc/apt/keyrings/{{ repo_signed_key }}"
+        dest: "/etc/apt/trusted.gpg.d/{{ repo_signed_key }}"
     
     - name: "powerdns-recursor {{ powerdns_version }} repo"
       become: true
       apt_repository:
-        repo: deb [signed-by=/etc/apt/keyrings/{{ repo_signed_key }} arch=amd64] {{ repo_uri }} {{ repo_components }}
+        repo: deb [signed-by=/etc/apt/trusted.gpg.d/{{ repo_signed_key }} arch=amd64] {{ repo_uri }} {{ repo_components }}
         state: "{{ repo_state }}"
         update_cache: yes
         filename: powerdns-rec-{{ powerdns_version }}
@@ -35,8 +35,8 @@
     - name: "template powerdns-recursor configs"
       become: true
       template:
-        src: "templates{{ item }}.j2"
-        dest: "{{ item }}"
+        src: "templates{{ cfile }}.j2"
+        dest: "{{ cfile }}"
         owner: root
         group: root
         mode: 0644
@@ -46,5 +46,7 @@
         - /etc/powerdns/recursor.d/allow.lst
         - /etc/powerdns/recursor.d/forward.lst
         - /etc/powerdns/recursor.d/dns-script.lua
+      loop_control:
+        loop_var: cfile
   notify:
     - Restart powerdns-recursor