diff --git a/roles/linux_common/tasks/amazon-2022.yml b/roles/linux_common/tasks/amazon-2022.yml
index 3687784..b301456 100644
--- a/roles/linux_common/tasks/amazon-2022.yml
+++ b/roles/linux_common/tasks/amazon-2022.yml
@@ -8,3 +8,9 @@
       - git
       - libxml2
       - shadow-utils
+
+- name: Uninstall curl-minimal (conflicts with curl)
+  ansible.builtin.dnf:
+    name: curl-minimal
+    state: absent
+    autoremove: no
diff --git a/roles/product_common/tasks/amazon-2022.yml b/roles/product_common/tasks/amazon-2022.yml
index 0ff3e1c..576945b 100644
--- a/roles/product_common/tasks/amazon-2022.yml
+++ b/roles/product_common/tasks/amazon-2022.yml
@@ -3,12 +3,14 @@
 - name: Add Adoptium repo and install Eclipse Temurin JDK if necessary on Amazon Linux 2022
   block:
 
+    # There is no amazonlinux/2022 package available from the Adoptium repo; AL2022 docs point to upstream compatiblity
+    # with Fedora 34, 35, and 36, so we use the latest of those for the Temurin package for now
     - name: Add Adoptium yum repository
       ansible.builtin.yum_repository:
         name: Adoptium
         file: adoptium
         description: Adoptium Repo
-        baseurl: "https://packages.adoptium.net/artifactory/rpm/amazonlinux/{{ ansible_distribution_version }}/{{ ansible_architecture }}"
+        baseurl: "https://packages.adoptium.net/artifactory/rpm/fedora/36/{{ ansible_architecture }}"
         gpgkey: https://packages.adoptium.net/artifactory/api/gpg/key/public
         gpgcheck: yes
         state: present
@@ -32,4 +34,4 @@
 - name: Install other base packages on Amazon Linux 2022
   ansible.builtin.dnf:
     name:
-      - dejavu-fonts-common  # Required by the installer
+      - dejavu-fonts-all  # Required by the installer