diff --git a/images/capi/ansible/roles/providers/tasks/awscliv2.yml b/images/capi/ansible/roles/providers/tasks/awscliv2.yml
index 8ef42ce2a7..d81d76ee79 100644
--- a/images/capi/ansible/roles/providers/tasks/awscliv2.yml
+++ b/images/capi/ansible/roles/providers/tasks/awscliv2.yml
@@ -21,7 +21,7 @@
       - gnupg
       - unzip
     state: present
-  when: ansible_distribution == "RedHat"
+  when: ansible_distribution == "RedHat" or packer_build_name is search('rockylinux')
 
 - name: Install AWS CLI prerequisites
   ansible.builtin.apt:
diff --git a/images/capi/packer/ami/rockylinux-8.json b/images/capi/packer/ami/rockylinux-8.json
index fc1fd164db..44212be90b 100644
--- a/images/capi/packer/ami/rockylinux-8.json
+++ b/images/capi/packer/ami/rockylinux-8.json
@@ -1,5 +1,5 @@
 {
-  "ami_filter_name": "Rocky-8-ec2-8.5-*",
+  "ami_filter_name": "Rocky-8-EC2-Base-8.9-*",
   "ami_filter_owners": "679593333241",
   "build_name": "rockylinux-8",
   "distribution": "rockylinux",