diff --git a/deploy/main.yml b/deploy/main.yml
index a061593..e92778e 100644
--- a/deploy/main.yml
+++ b/deploy/main.yml
@@ -1,15 +1,17 @@
 ---
 - name: Configure compute nodes
   hosts: compute
   roles:
     - role: common
     #- role: slurm
+    - role: ldap_auth
     - role: collectd
 #  tasks:
 #      - include: roles/slurm/tasks/client.yml
 
 - name: Frontal
   hosts: frontal
   roles:
     - role: common
+    - role: ldap_auth
     - role: frontal
diff --git a/deploy/roles/frontal/handlers/main.yml b/deploy/roles/frontal/handlers/main.yml
index a032253..08064c7 100644
--- a/deploy/roles/frontal/handlers/main.yml
+++ b/deploy/roles/frontal/handlers/main.yml
@@ -1,9 +1,5 @@
 ---
 - name: restart dnsmasq
   service:
     name: dnsmasq
     state: restarted
-- name: restart nslcd
-  service:
-    name: nslcd
-    state: restarted
diff --git a/deploy/roles/frontal/tasks/main.yaml b/deploy/roles/frontal/tasks/main.yaml
index 4e78d22..f7c3f61 100644
--- a/deploy/roles/frontal/tasks/main.yaml
+++ b/deploy/roles/frontal/tasks/main.yaml
@@ -1,75 +1,54 @@
 ---
 - name:  Packages
   block:
     - apt:
         name: "{{ item }}"
         update_cache: yes
       with_items:
         - bash-completion
         - dnsmasq
         - iptables-persistent
         - acl
         - git
         - ansible
         - binutils
         - make
         - man-db
         - locales
     - debconf:
         name: locales
         question: locales/locales_to_be_generated
         value: en_US.UTF-8 UTF-8
         vtype: multiselect
   tags:
     - packages
 
     
 - name: Setting config files
   block:
     - copy:
         src: "etc/{{ item }}"
         dest: /etc/
       with_items:
         - dhcp
         - modprobe.d
         - network
         - iptables
     - sysctl:
         name: net.ipv4.ip_forward
         value: 1
         sysctl_set: yes
         state: present
         reload: yes
     - copy:
         src: boot/firmware/cmdline.txt
         dest: /boot/firmware/cmdline.txt
     - template:
         src: etc/ethers
         dest: /etc/ethers
         mode: 0644
       notify: restart dnsmasq
     - copy:
         src: etc/dnsmasq.d
         dest: /etc/
       notify: restart dnsmasq
-
-- name: Configure ldap authentication
-  block:
-    - apt:
-        name: libnss-ldapd
-    - template:
-        src: etc/nslcd.conf
-        dest: /etc/nslcd.conf
-      notify: restart nslcd
-    - copy:
-        src: etc/pam.d/common-session
-        dest: /etc/pam.d/common-session
-    - copy:
-        src: etc/nsswitch.conf
-        dest: /etc/nsswitch.conf
-  vars:
-    # ldapsearch -b o=epfl,c=ch -H ldaps://scoldap.epfl.ch/ -LLL -x "cn=hpc-cluster-users" uniqueIdentifier
-    user_group: S14274
-  tags:
-    - ldap
-    - packages
diff --git a/deploy/roles/frontal/files/etc/nsswitch.conf b/deploy/roles/ldap_auth/files/etc/nsswitch.conf
similarity index 100%
rename from deploy/roles/frontal/files/etc/nsswitch.conf
rename to deploy/roles/ldap_auth/files/etc/nsswitch.conf
diff --git a/deploy/roles/frontal/files/etc/pam.d/common-session b/deploy/roles/ldap_auth/files/etc/pam.d/common-session
similarity index 100%
rename from deploy/roles/frontal/files/etc/pam.d/common-session
rename to deploy/roles/ldap_auth/files/etc/pam.d/common-session
diff --git a/deploy/roles/frontal/handlers/main.yml b/deploy/roles/ldap_auth/handlers/main.yaml
similarity index 50%
copy from deploy/roles/frontal/handlers/main.yml
copy to deploy/roles/ldap_auth/handlers/main.yaml
index a032253..c189691 100644
--- a/deploy/roles/frontal/handlers/main.yml
+++ b/deploy/roles/ldap_auth/handlers/main.yaml
@@ -1,9 +1,5 @@
 ---
-- name: restart dnsmasq
-  service:
-    name: dnsmasq
-    state: restarted
 - name: restart nslcd
   service:
     name: nslcd
     state: restarted
diff --git a/deploy/roles/ldap_auth/tasks/main.yaml b/deploy/roles/ldap_auth/tasks/main.yaml
new file mode 100644
index 0000000..828f3c4
--- /dev/null
+++ b/deploy/roles/ldap_auth/tasks/main.yaml
@@ -0,0 +1,21 @@
+---
+- name: Configure ldap authentication
+  block:
+    - apt:
+        name: libnss-ldapd
+    - template:
+        src: etc/nslcd.conf
+        dest: /etc/nslcd.conf
+      notify: restart nslcd
+    - copy:
+        src: etc/pam.d/common-session
+        dest: /etc/pam.d/common-session
+    - copy:
+        src: etc/nsswitch.conf
+        dest: /etc/nsswitch.conf
+  vars:
+    # ldapsearch -b o=epfl,c=ch -H ldaps://scoldap.epfl.ch/ -LLL -x "cn=hpc-cluster-users" uniqueIdentifier
+    user_group: S14274
+  tags:
+    - ldap
+    - packages
diff --git a/deploy/roles/frontal/templates/etc/nslcd.conf b/deploy/roles/ldap_auth/templates/etc/nslcd.conf
similarity index 100%
rename from deploy/roles/frontal/templates/etc/nslcd.conf
rename to deploy/roles/ldap_auth/templates/etc/nslcd.conf