diff --git a/control-server.yml b/control-server.yml
index 38f3d5d..9ba9ab8 100644
--- a/control-server.yml
+++ b/control-server.yml
@@ -8,8 +8,10 @@
 
 - hosts: control
   become: yes
+
   vars_files:
   - ~/.apigee/credentials.yml
+
   tasks:
   - name: Install system packages
     yum:
@@ -19,15 +21,18 @@
     - python-devel
     - openssl-devel
     - gcc
+    when: ansible_os_family | lower == 'redhat'
 
   - name: Install pip
     easy_install:
       name: pip
       state: latest
+    when: ansible_os_family | lower == 'redhat'
 
   - name: Install ansible
     pip:
       name: ansible
       state: latest
     register: result
+    when: ansible_os_family | lower == 'redhat'
 
diff --git a/resources/boto.j2 b/resources/boto.j2
index 96dd88a..500b16f 100644
--- a/resources/boto.j2
+++ b/resources/boto.j2
@@ -1,4 +1,4 @@
 [Credentials]
-aws_access_key_id = {{ aws_access_key_id }}
-aws_secret_access_key = {{ aws_secret_access_key }}
-ec2_region_name = {{ secure_aws_region }}
+aws_access_key_id = {{ aws_access_key }}
+aws_secret_access_key = {{ aws_secret_key }}
+ec2_region_name = {{ aws_region }}
diff --git a/setup-base.yml b/setup-base.yml
index d507540..6af078f 100644
--- a/setup-base.yml
+++ b/setup-base.yml
@@ -1,5 +1,5 @@
 ---
-- hosts: control
+- hosts: '{{ hosts }}'
   vars:
     ansible_config: ~/.ansible
     apigee_config: ~/.apigee
@@ -23,6 +23,7 @@
     with_items:
     - git
     - tree
+    when: ansible_os_family | lower == 'redhat'
 
   - name: Git checkout of sample configurations
     ignore_errors: yes
diff --git a/setup-ec2.yml b/setup-ec2.yml
index 2db0f00..9622765 100644
--- a/setup-ec2.yml
+++ b/setup-ec2.yml
@@ -11,12 +11,14 @@
       state: present
     with_items:
     - elasticache-auto-discovery
+    when: ansible_os_family | lower == 'redhat'
+
 
   - name: Create a template .boto config file
     template: 
       src: resources/boto.j2
       dest: ~/.boto
-    when: aws_access_key_id is defined and aws_secret_access_key is defined and secure_aws_region is defined 
+    when: aws_access_key is defined and aws_secret_key is defined and aws_region is defined
 
   - name: Create a template ec2.ini config file
     copy:
@@ -29,26 +31,26 @@
       dest: ~/.bashrc
       state: present
       line: 'export EC2_INI_PATH={{ ansible_config }}/ec2.ini'
-    when: aws_access_key_id is defined and aws_secret_access_key is defined and secure_aws_region is defined 
+    when: aws_access_key is defined and aws_secret_key is defined and aws_region is defined
 
 #  - name: Copy ec2.py script
 #    copy:
 #      src: resources/ec2.py
 #      dest: '{{ ansible_config }}/ec2.py'
       
-  - name: Update .bashrc with AWS_ACCESS_KEY_ID
+  - name: Update .bashrc with aws_access_key
     lineinfile: 
       backup: yes
       dest: ~/.bashrc
       state: present
-      line: 'export AWS_ACCESS_KEY_ID={{ aws_access_key_id }}'
-    when: aws_access_key_id is defined
+      line: 'export AWS_SECRET_ACCESS_KEY={{ aws_access_key }}'
+    when: aws_access_key is defined and update_env is defined and update_env
     
-  - name: Update .bashrc with AWS_SECRET_ACCESS_KEY
+  - name: Update .bashrc with aws_secret_key
     lineinfile: 
       backup: yes
       dest: ~/.bashrc
       state: present
-      line: 'export AWS_SECRET_ACCESS_KEY={{ aws_secret_access_key }}'
-    when: aws_secret_access_key is defined
+      line: 'export AWS_ACCESS_KEY_ID={{ aws_secret_key }}'
+    when: aws_secret_key is defined and update_env is defined and update_env
     
\ No newline at end of file