diff --git a/roles/add-repository/tasks/extensions.yml b/roles/add-repository/tasks/extensions.yml
index 3b3032922..dfb44a603 100644
--- a/roles/add-repository/tasks/extensions.yml
+++ b/roles/add-repository/tasks/extensions.yml
@@ -8,7 +8,7 @@
       ansible.builtin.apt_key:
         url: "https://packagecloud.io/timescale/timescaledb/gpgkey"
         state: present
-        keyring: /etc/apt/trusted.gpg.d/{{ item.key | urlsplit('netloc') }}.gpg
+        keyring: /etc/apt/trusted.gpg.d/packagecloud.io.gpg
       when: ansible_os_family == "Debian"
 
     - name: Add TimescaleDB repository
@@ -38,7 +38,7 @@
       ansible.builtin.apt_key:
         url: "https://repos.citusdata.com/community/gpgkey"
         state: present
-        keyring: /etc/apt/trusted.gpg.d/{{ item.key | urlsplit('netloc') }}.gpg
+        keyring: /etc/apt/trusted.gpg.d/repos.citusdata.com.gpg
       when: ansible_os_family == "Debian"
 
     - name: Add Citus repository
diff --git a/roles/consul/tasks/install_linux_repo.yml b/roles/consul/tasks/install_linux_repo.yml
index 2a8f383bc..fec38bd2b 100644
--- a/roles/consul/tasks/install_linux_repo.yml
+++ b/roles/consul/tasks/install_linux_repo.yml
@@ -65,7 +65,7 @@
       ansible.builtin.apt_key:
         url: "{{ consul_repo_url }}/gpg"
         state: present
-        keyring: /etc/apt/trusted.gpg.d/{{ item.key | urlsplit('netloc') }}.gpg
+        keyring: /etc/apt/trusted.gpg.d/{{ consul_repo_url | urlsplit('netloc') }}.gpg
       when: "ansible_os_family|lower == 'debian'"
 
     - name: Add hashicorp repository