diff --git a/playbooks/cloud_prep.yml b/playbooks/cloud_prep.yml
index 06a5c85cd6..64fc9eaa65 100644
--- a/playbooks/cloud_prep.yml
+++ b/playbooks/cloud_prep.yml
@@ -3,9 +3,8 @@
   user: root
   vars_files: 
    - /srv/web/infra/ansible/vars/global.yml
-   - $vars/${ansible_distribution}.yml
    - $private/vars.yml
-
+   - $vars/${ansible_distribution}.yml
   
   tasks:
   - include: $tasks/cloud_setup_basic.yml
diff --git a/playbooks/jenkins_slave.yml b/playbooks/jenkins_slave.yml
index 6a5de2285f..b711db1cc5 100644
--- a/playbooks/jenkins_slave.yml
+++ b/playbooks/jenkins_slave.yml
@@ -3,10 +3,9 @@
   user: root
   vars_files: 
    - /srv/web/infra/ansible/vars/global.yml
-   - $vars/${ansible_distribution}.yml
-   - $private/vars.yml
+   - ${private}/vars.yml
+   - ${vars}/${ansible_distribution}.yml
 
-  
   tasks:
   - include: $tasks/cloud_setup_basic.yml
   - name: install pkgs for jenkins
@@ -52,8 +51,9 @@
     - config
   
   - name: setup jenkins_slave user
-    action: user name=jenkins_slave state=present createhome=yes system=no password=$jenkins_slave_pw
-  
+    action: user name=jenkins_slave state=present createhome=yes system=no password=${jenkins_slave_pw}
+    tags:
+    - jenkinsuser  
   - name: jenkins_slave to mock group
     action: user name=jenkins_slave groups=mock
   
diff --git a/playbooks/openshift-el6.yml b/playbooks/openshift-el6.yml
index f913fffad9..4a5af2e4a8 100644
--- a/playbooks/openshift-el6.yml
+++ b/playbooks/openshift-el6.yml
@@ -3,9 +3,8 @@
   user: root
   vars_files: 
    - /srv/web/infra/ansible/vars/global.yml
-   - $vars/${ansible_distribution}.yml
    - $private/vars.yml
-
+   - $vars/${ansible_distribution}.yml
   
   tasks:
   - include: $tasks/cloud_setup_basic.yml