diff --git a/tasks/main.yml b/tasks/main.yml
index 19d8350..7684cd1 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -3,9 +3,14 @@
   setup:
   when: ansible_distribution_major_version is not defined or ansible_distribution is not defined or ansible_bios_version is not defined
 
-- name: Configure AWS AMI OS package manager repositories for Apigee
-  become: yes
-  shell: "/usr/bin/yum-config-manager --enable rhui-REGION-rhel-server-extras rhui-REGION-rhel-server-optional"
+- block:
+  - name: Update redhat yum client
+    become: yes
+    shell: "yum update rh-amazon-rhui-client.noarch"
+
+  - name: Configure AWS AMI OS package manager repositories for Apigee
+    become: yes
+    shell: "/usr/bin/yum-config-manager --enable rhui-REGION-rhel-server-extras rhui-REGION-rhel-server-optional"
   when: ansible_bios_version | lower | search('amazon') and ansible_distribution | lower != 'redhat' and ansible_distribution_major_version | version_compare('6', '>')
 
 - name: Register with Redhat Subscription management