diff --git a/tasks/with_no_proxy.yml b/tasks/with_no_proxy.yml
index 965b6ef..5ff8660 100644
--- a/tasks/with_no_proxy.yml
+++ b/tasks/with_no_proxy.yml
@@ -2,12 +2,12 @@
 # tasks file for apigee-opdk-setup-epel
 - name: Configure AWS AMI OS package manager repositories for Apigee
   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', '>')
+  when: ansible_bios_version | lower | search('amazon') and ansible_distribution | lower != 'redhat' and ansible_distribution_major_version | version_compare('6', '>')
 
 # TODO: Look up the ansible_distribution name for RHEL systems
-#- name: If using RHEL then register RHEL on RHN
-#  shell: "subscription-manager register --username={{ rhel_user_name }} --password={{ rhel_password }} --auto-attach"
-#  when: ansible_bios_version | lower | search('amazon') and ansible_os_family | lower == 'redhat' and ansible_distribution_major_version | version_compare('7', '>')
+- name: If using RHEL then register RHEL on RHN
+  shell: "subscription-manager register --username={{ rhel_user_name }} --password={{ rhel_password }} --auto-attach"
+  when: ansible_bios_version | lower | search('amazon') and ansible_distribution | lower == 'redhat' and ansible_distribution_major_version | version_compare('7', '>')
 
 - name: Update EPEL with no proxy
   yum: