diff --git a/deploy/roles/collectd/tasks/main.yml b/deploy/roles/collectd/tasks/main.yml
index af256bf..0d6ec52 100644
--- a/deploy/roles/collectd/tasks/main.yml
+++ b/deploy/roles/collectd/tasks/main.yml
@@ -1,38 +1,44 @@
 ---
 # Packages
 - apt:
     name="{{ item }}"
   with_items:
     - collectd-core
     - libpython2.7
     - lm-sensors
+  tags:
+    - packages
+    - collectd
 
 - name: Only for controller
   block:
     - apt:
         name="{{ item }}"
       with_items:
         - python-serial
+      tags: packages
+
     - template:
         src: demo.py
         dest: /root/demo.py
         mode: 0755
   when: ctrl_leds
+  tags: collectd
 
 # Configuration
 - name: Collectd configuration
   block:
     - debug:
         var: ctrl_leds
     - template:
         src: "{{ 'admin.conf' if ctrl_leds else 'compute.conf' }}"
         dest: /etc/collectd/collectd.conf
         mode: 0644
       notify: restart collectd
     - template:
         src: leds.py
         dest: /etc/collectd/leds.py
         mode: 0644
       notify: restart collectd
-  
+  tags: collectd
   
diff --git a/deploy/roles/filesystem/tasks/main.yml b/deploy/roles/filesystem/tasks/main.yml
index ca537af..4e78c6d 100644
--- a/deploy/roles/filesystem/tasks/main.yml
+++ b/deploy/roles/filesystem/tasks/main.yml
@@ -1,19 +1,19 @@
 ---
 - name: prepare eMMC
   block:
     - apt: name=parted
-      tags: package
+      tags: packages
     - parted:
         device: /dev/mmcblk0
         number: 1
         state: present
     - filesystem:
         fstype: ext4
         dev: /dev/mmcblk0p1
     - mount:
         path: /local_scratch
         src: /dev/mmcblk0p1
         fstype: ext4
         state: mounted
   tags: partition
         
diff --git a/deploy/roles/spack/tasks/main.yml b/deploy/roles/spack/tasks/main.yml
index 7311acc..5963f17 100644
--- a/deploy/roles/spack/tasks/main.yml
+++ b/deploy/roles/spack/tasks/main.yml
@@ -1,112 +1,113 @@
 ---
 - name: setting spack env
   block:
     - copy:
         src: .bashrc
         dest: /home/spack
         owner: spack
         group: spack
     - apt:
         name: "{{ item }}"
       with_items:
+        - curl
         - g++
         - gfortran
         - g++-6
         - gfortran-6
         - cmake
         - python
         - python3
         - automake
       tags:
         - packages
     - shell: spack compiler find
       become_flags: --login
       become: yes
 
   tags: spack
 
 - name: gathering facts
   block:
     - shell: gcc-6 -dumpversion
       register: gcc_version_gather
 
     - shell: "spack find -p lmod arch=$(spack arch) | tail -n1 | awk '{ print $2; }'"
       become: yes
       become_flags: --login
       register: lmod_path_gather
       tags: lmod
 
     - shell: "spack arch"
       become: yes
       become_flags: --login
       register: spack_arch_gather
       
     - set_fact:
         gcc_version: "{{ gcc_version_gather.stdout }}"
 
     - set_fact:
         spack_arch: "{{ spack_arch_gather.stdout }}"
 
     - set_fact:
         lmod_path: "{{ lmod_path_gather.stdout }}"
       
     - setup:
       delegate_to: "{{ item }}"
       delegate_facts: True
       with_items: "{{ groups['frontal'] }}"
   tags:
     - facts
     - spack
     - lmod
 
 - name: setup lmod
   block:
     - file:
         src: "{{ lmod_path_gather.stdout }}/lmod/lmod/init/sh"
         state: link
         dest: "/etc/profile.d/lmod.sh"
         force: yes
     - template:
         src: lmod_conf.sh
         dest: "/etc/profile.d/lmod_conf.sh"
   tags: lmod
    
 - name: installing spack
   block:
     - debug:
         var: gcc_versions
     - git:
         repo: 'https://github.com/spack/spack.git'
         dest: /softs/spack
         update: no
     - template:
         src: modules.yaml
         dest: /softs/spack/etc/spack
   vars:
     gcc_versions: "{{ groups['all'] | map('extract', hostvars, 'gcc_version') | list | select('defined') | sort | unique }}"
   become: yes
   tags: spack
   when: "'frontal' in group_names"
 
 - name: setting up distcc
   block:
     - apt:
         name: "{{ item }}"
       with_items:
         - distcc
       tags:
         - packages
     - template:
         src: distcc_hosts
         dest: /etc/distcc/hosts
       notify: restart distcc
       
     - template:
         src: distcc
         dest: /etc/default/distcc
       notify: restart distcc
 
       when: "'frontal' not in group_names"
   tags:
     - spack
     - distcc