diff --git a/README.md b/README.md
index c000757..64bb911 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ repositories.
 
 ### Quick start ###
 
-You may proceed in using the files in this repo proceeding as follows:
+You may use this repo proceeding as follows:
 
     $ vim hosts
     $ vim domain.yml
@@ -43,7 +43,6 @@ a *bridged* one.
 
 ### To Do List ###
 
-* Splitting and finalize pxe roles (pxe + kickstart)
 * Implement backup
 * Detail physical installation procedure for the server machine within the
   Wiki.
diff --git a/roles/kickstart/files/ansible-pull-logrotate b/roles/ansible-pull/files/logrotate
similarity index 100%
rename from roles/kickstart/files/ansible-pull-logrotate
rename to roles/ansible-pull/files/logrotate
diff --git a/roles/ansible-pull/tasks/ansible-pull.yml b/roles/ansible-pull/tasks/ansible-pull.yml
new file mode 100644
index 0000000..761b285
--- /dev/null
+++ b/roles/ansible-pull/tasks/ansible-pull.yml
@@ -0,0 +1,16 @@
+---
+- name: Creazione directory per ansible-pull
+  file: path=/var/lib/nethserver/ibay/ks/ansible-pull state=directory
+  sudo: yes
+
+- name: Template
+  template: src={{ item }} dest=/var/lib/nethserver/ibay/ks/ansible-pull/{{ item }}
+  with_items:
+    - run.sh
+    - getvaultpass.py
+    - crontab
+  sudo: yes
+
+- name: Logrotate
+  copy: src=logrotate dest=/var/lib/nethserver/ibay/ks/ansible-pull/logrotate
+  sudo: yes
diff --git a/roles/ansible-pull/tasks/main.yml b/roles/ansible-pull/tasks/main.yml
new file mode 100644
index 0000000..c72ba28
--- /dev/null
+++ b/roles/ansible-pull/tasks/main.yml
@@ -0,0 +1,4 @@
+---
+
+- include: ansible-pull.yml
+  tags: ansible-pull
diff --git a/roles/kickstart/templates/post-ks/ansible-pull-crontab b/roles/ansible-pull/templates/crontab
similarity index 100%
rename from roles/kickstart/templates/post-ks/ansible-pull-crontab
rename to roles/ansible-pull/templates/crontab
diff --git a/roles/kickstart/templates/post-ks/getvaultpass.py b/roles/ansible-pull/templates/getvaultpass.py
similarity index 100%
rename from roles/kickstart/templates/post-ks/getvaultpass.py
rename to roles/ansible-pull/templates/getvaultpass.py
diff --git a/roles/kickstart/templates/post-ks/ansible-pull.sh b/roles/ansible-pull/templates/run.sh
similarity index 100%
rename from roles/kickstart/templates/post-ks/ansible-pull.sh
rename to roles/ansible-pull/templates/run.sh
diff --git a/roles/client-install/meta/main.yml b/roles/client-install/meta/main.yml
index 48f2039..c5a1545 100644
--- a/roles/client-install/meta/main.yml
+++ b/roles/client-install/meta/main.yml
@@ -1,7 +1,8 @@
 ---
 dependencies:
-  - { role: pxe, tags: [ 'client-install', 'pxe' ] }
-  - { role: kickstart, tags: [ 'client-install', 'kickstart', 'ks' ] }
-  - { role: ubuntu-mirror, tags: [ 'client-install', 'ubuntu-mirror' ] }
-  - { role: doraemon, tags: [ 'client-install', 'doraemon' ] }
-  - { role: git-daemon, tags: [ 'client-install', 'git-daemon' ] }
+  - { role: pxe, tags: [ 'client-install' ] }
+  - { role: kickstart, tags: [ 'client-install' ] }
+  - { role: ansible-pull, tags: [ 'client-install' ] }
+  - { role: ubuntu-mirror, tags: [ 'client-install' ] }
+  - { role: doraemon, tags: [ 'client-install' ] }
+  - { role: git-daemon, tags: [ 'client-install' ] }
diff --git a/roles/doraemon/tasks/main.yml b/roles/doraemon/tasks/main.yml
index d5ad240..83219fc 100644
--- a/roles/doraemon/tasks/main.yml
+++ b/roles/doraemon/tasks/main.yml
@@ -1,5 +1,3 @@
 ---
 - include: doraemon.yml
-  tags:
-    - "client-install"
-    - doraemon
+  tags: doraemon
diff --git a/roles/git-daemon/tasks/main.yml b/roles/git-daemon/tasks/main.yml
index 06cb5ed..982d853 100644
--- a/roles/git-daemon/tasks/main.yml
+++ b/roles/git-daemon/tasks/main.yml
@@ -1,5 +1,3 @@
 ---
 - include: git-daemon.yml
-  tags:
-    - client-install
-    - git-daemon
+  tags: git-daemon
diff --git a/roles/kickstart/tasks/kickstart.yml b/roles/kickstart/tasks/kickstart.yml
index bdf18f2..29449de 100644
--- a/roles/kickstart/tasks/kickstart.yml
+++ b/roles/kickstart/tasks/kickstart.yml
@@ -49,15 +49,5 @@
     - ubuntu-trusty.cfg
 
 - name: Copia configurazioni kickstart
-  template: src=post-ks/{{ item }} dest=/var/lib/nethserver/ibay/ks/{{ item }}
+  template: src=post-ks.sh dest=/var/lib/nethserver/ibay/ks/{{ item }}
   sudo: yes
-  with_items:
-    - post-ks.sh
-    - getvaultpass.py
-    - ansible-pull.sh
-    - ansible-pull-crontab
-
-- name: Copio logrotate per configurazione pull
-  copy: src=ansible-pull-logrotate dest=/var/lib/nethserver/ibay/ks/ansible-pull-logrotate
-  sudo: yes
-
diff --git a/roles/kickstart/templates/post-ks/post-ks.sh b/roles/kickstart/templates/post-ks.sh
similarity index 86%
rename from roles/kickstart/templates/post-ks/post-ks.sh
rename to roles/kickstart/templates/post-ks.sh
index f58dc20..409e249 100644
--- a/roles/kickstart/templates/post-ks/post-ks.sh
+++ b/roles/kickstart/templates/post-ks.sh
@@ -16,20 +16,20 @@ install -d -o root -g root /var/lib/{{ ansible_local.domain.domainfull }}/config
 install -d -o root -g root /var/lib/{{ ansible_local.domain.domainfull }}/bin
 
 # Installo lo script per la decrittazione della password del vault
-wget -q http://{{ ansible_local.domain.serverfqdn }}/ks/getvaultpass.py -O /tmp/getvaultpass.py
+wget -q http://{{ ansible_local.domain.serverfqdn }}/ks/ansible-pull/getvaultpass.py -O /tmp/getvaultpass.py
 install -m744 -o root -g root /tmp/getvaultpass.py /var/lib/{{ ansible_local.domain.domainfull}}/bin/getvaultpass.py
 rm -f /tmp/getvaultpass.py
 
 # Installo lo script per l'avvio di ansible-pull da root
-wget -q http://{{ ansible_local.domain.serverfqdn }}/ks/ansible-pull.sh -O /tmp/ansible-pull.sh
+wget -q http://{{ ansible_local.domain.serverfqdn }}/ks/ansible-pull/run.sh -O /tmp/ansible-pull.sh
 install -m744 -o root -g root /tmp/ansible-pull.sh /var/lib/{{ ansible_local.domain.domainfull }}/bin/ansible-pull.sh
 rm -f /tmp/ansible-pull.sh
 
 # Installo il cronjob
-wget -q http://{{ ansible_local.domain.serverfqdn }}/ks/ansible-pull-crontab -O /tmp/ansible-pull-crontab
+wget -q http://{{ ansible_local.domain.serverfqdn }}/ks/ansible-pull/crontab -O /tmp/ansible-pull-crontab
 install -m644 -o root -g root /tmp/ansible-pull-crontab /etc/cron.d/ansible-pull
 rm -f /tmp/ansible-pull-crontab
 # Installo il logrotate
-wget -q http://{{ ansible_local.domain.serverfqdn }}/ks/ansible-pull-logrotate -O /tmp/ansible-pull-logrotate
+wget -q http://{{ ansible_local.domain.serverfqdn }}/ks/ansible-pull/logrotate -O /tmp/ansible-pull-logrotate
 install -m644 -o root -g root /tmp/ansible-pull-logrotate /etc/logrotate.d/ansible
 rm -f /tmp/ansible-pull-logrotate
diff --git a/roles/pxe/tasks/main.yml b/roles/pxe/tasks/main.yml
index fdab152..5e6acd5 100644
--- a/roles/pxe/tasks/main.yml
+++ b/roles/pxe/tasks/main.yml
@@ -1,4 +1,3 @@
 ---
 - include: pxe.yml
-  tags:
-    - "client-install"
+  tags: pxe