diff --git a/tasks/keys/apt-key.yml b/tasks/keys/apt-key.yml
index d25e52a..a52bbe0 100644
--- a/tasks/keys/apt-key.yml
+++ b/tasks/keys/apt-key.yml
@@ -1,5 +1,4 @@
 ---
 - name: "(Install: APT OSs) Add APT NGINX Signing Key"
   apt_key:
-    id: 573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62
-    keyserver: "{{ 'hkp://p80.pool.sks-keyservers.net:80' | default('hkps://hkps.pool.sks-keyservers.net:443') }}"
+    url: "{{ 'http://nginx.org/keys/nginx_signing.key' | default('https://nginx.org/keys/nginx_signing.key') }}"
diff --git a/tasks/keys/rpm-key.yml b/tasks/keys/rpm-key.yml
index 1c4e047..5857349 100644
--- a/tasks/keys/rpm-key.yml
+++ b/tasks/keys/rpm-key.yml
@@ -1,4 +1,4 @@
 ---
 - name: "(Install: RPM OSs) Add RPM NGINX Signing Key"
   rpm_key:
-    key: "{{ (ansible_os_family == 'RedHat' and ansible_distribution_major_version|int == 6) | ternary('http://nginx.org/keys/nginx_signing.key', 'https://nginx.org/keys/nginx_signing.key') }}" 
+    key: "{{ 'http://nginx.org/keys/nginx_signing.key' | default('https://nginx.org/keys/nginx_signing.key') }}"