diff --git a/CHANGELOG.md b/CHANGELOG.md
index b32db66..4521f21 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,8 @@ BREAKING CHANGES:
 
 FEATURES:
 
-Backwards support for older versions of Ansible (e.g. Ansible `<2.12`).
+* Backwards support for older versions of Ansible (e.g. Ansible `<2.12`).
+* Update NGINX Amplify repositories to use Python 3 when possible.
 
 ENHANCEMENTS:
 
diff --git a/README.md b/README.md
index 7faba29..ea3a32c 100644
--- a/README.md
+++ b/README.md
@@ -130,17 +130,16 @@ Ubuntu:
 ### NGINX Amplify Agent
 
 ```yaml
-Amazon Linux:
-  - 2017.09
+Amazon Linux 2:
+  - any
 CentOS:
   - 7
 Debian:
-  - jessie
-  - stretch
+  - buster (10)
+  - bullseye (11)
 Red Hat:
-  - 7
+  - 8
 Ubuntu:
-  - xenial
   - bionic
   - focal
 ```
diff --git a/tasks/amplify/install-amplify.yml b/tasks/amplify/install-amplify.yml
index 0584ec7..32bdbfd 100644
--- a/tasks/amplify/install-amplify.yml
+++ b/tasks/amplify/install-amplify.yml
@@ -8,7 +8,7 @@
     name: nginx-amplify-agent
     state: present
 
-- name: Copy NGINX configurator agent configuration template
+- name: Copy NGINX Amplify configurator agent configuration template
   copy:
     remote_src: true
     src: /etc/amplify-agent/agent.conf.default
diff --git a/tasks/amplify/setup-debian.yml b/tasks/amplify/setup-debian.yml
index 4d7db28..cbc369b 100644
--- a/tasks/amplify/setup-debian.yml
+++ b/tasks/amplify/setup-debian.yml
@@ -1,25 +1,8 @@
 ---
-
-- name: (Ubuntu 20.04) Add NGINX Amplify apt key
-  apt_key:
-    url: https://nginx.org/keys/nginx_signing.key
-    state: present
-  become: true
-  when: ansible_facts['distribution_release'] == "focal"
-
 - name: (Debian/Ubuntu) Add NGINX Amplify agent repository
   apt_repository:
     filename: nginx-amplify
-    repo: "deb [arch=amd64] https://packages.amplify.nginx.com/{{ ansible_facts['distribution'] | lower }}/
+    repo: "deb [arch=amd64 signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] https://packages.amplify.nginx.com/py3/{{ ansible_facts['distribution'] | lower }}/
           {{ ansible_facts['distribution_release'] | lower }} amplify-agent"
     update_cache: true
     mode: 0644
-  when: ansible_facts['distribution_release'] != "focal"
-
-- name: (Ubuntu 20.04) Add NGINX Amplify agent repository
-  apt_repository:
-    filename: nginx-amplify
-    repo: deb [arch=amd64] https://packages.amplify.nginx.com/py3/ubuntu focal amplify-agent
-    update_cache: true
-    mode: 0644
-  when: ansible_facts['distribution_release'] == "focal"
diff --git a/tasks/amplify/setup-redhat.yml b/tasks/amplify/setup-redhat.yml
index debfab7..b4dfb9c 100644
--- a/tasks/amplify/setup-redhat.yml
+++ b/tasks/amplify/setup-redhat.yml
@@ -2,7 +2,7 @@
 - name: (Amazon Linux/CentOS/RHEL) Add NGINX Amplify agent repository
   yum_repository:
     name: nginx-amplify
-    baseurl: http://packages.amplify.nginx.com/{{ (ansible_facts['distribution'] == "Amazon") | ternary('amzn/', 'centos/') }}/$releasever/$basearch/
+    baseurl: https://packages.amplify.nginx.com/{{ (ansible_facts['distribution_major_version'] == "7") | ternary('', 'py3/') }}{{ (ansible_facts['distribution'] == "Amazon") | ternary('amzn', 'centos') }}/$releasever/$basearch/
     description: NGINX Amplify Agent
     enabled: true
     gpgcheck: true