diff --git a/inventory/group_vars/all b/inventory/group_vars/all
index b5bd90e552..00e33a563b 100644
--- a/inventory/group_vars/all
+++ b/inventory/group_vars/all
@@ -1,4 +1,2 @@
 ---
-files: /home/fedora/skvidal/ansible/public/files/
-is_fedora: "'$ansible_distribution' == 'Fedora'"
-is_rhel:   "'$ansible_distribution' == 'RedHat'"
+files: /srv/web/infra/ansible/files
diff --git a/playbooks/cloud_el6_prep.yml b/playbooks/cloud_el6_prep.yml
index af55ded787..46020dd1e8 100644
--- a/playbooks/cloud_el6_prep.yml
+++ b/playbooks/cloud_el6_prep.yml
@@ -2,7 +2,7 @@
 - hosts: 209.132.184.*
   user: root
   vars_files: 
-   - /home/fedora/skvidal/ansible/public/vars/global.yml
+   - /srv/web/infra/ansible/vars/global.yml
    - $vars/${ansible_distribution}.yml
    - $private/playbooks/vars.yml
 
diff --git a/playbooks/jenkins_slave_el6.yml b/playbooks/jenkins_slave_el6.yml
index 1c166ed82a..3b765a8a63 100644
--- a/playbooks/jenkins_slave_el6.yml
+++ b/playbooks/jenkins_slave_el6.yml
@@ -2,13 +2,13 @@
 - hosts: 209.132.184.*
   user: root
   vars_files: 
-   - /home/fedora/skvidal/ansible/public/vars/global.yml
+   - /srv/web/infra/ansible/vars/global.yml
    - $vars/${ansible_distribution}.yml
    - $private/playbooks/vars.yml
 
   
   tasks:
-  - include: $tasks/cloud_setup_el6.yml
+  - include: $tasks/cloud_setup_${dist_tag}.yml
   - include: $tasks/jenkins_slave.yml
 
 
diff --git a/vars/global.yml b/vars/global.yml
index 1836bb421d..720fd7d77f 100644
--- a/vars/global.yml
+++ b/vars/global.yml
@@ -1,9 +1,9 @@
 ---
-private: /home/fedora/skvidal/ansible/private
-files: /home/fedora/skvidal/ansible/public/files
-handlers: /home/fedora/skvidal/ansible/public/handlers
-tasks: /home/fedora/skvidal/ansible/public/tasks
-vars:  /home/fedora/skvidal/ansible/public/vars
+private: /srv/private/ansible
+files: /srv/web/infra/ansible/files
+handlers: /srv/web/infra/ansible/handlers
+tasks: /srv/web/infra/ansible/tasks
+vars:  /srv/web/infra/ansible/vars
 is_fedora: "'$ansible_distribution' == 'Fedora'"                      
 is_rhel:   "'$ansible_distribution' == 'RedHat'"
 dist_tag: unknown