diff --git a/.gitmodules b/.gitmodules
index c456e21..cc9d7c0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,21 +1,24 @@
 [submodule "nfs"]
 	path = roles/nfs
 	url = https://github.com/geerlingguy/ansible-role-nfs.git
 [submodule "roles/jenkins"]
 	path = roles/jenkins
 	url = https://github.com/ICTO/ansible-jenkins.git
 [submodule "roles/swap"]
 	path = roles/swap
 	url = https://github.com/tribou/ansible-swap.git
 [submodule "roles/yumrepo"]
 	path = roles/yumrepo
 	url = https://github.com/picotrading/ansible-yumrepo.git
 [submodule "templates/encoder"]
 	path = templates/encoder
 	url = https://github.com/picotrading/config-encoder-macros
 [submodule "roles/keepalived"]
 	path = roles/keepalived
 	url = https://github.com/tcomerma/ansible-keepalived.git
 [submodule "roles/glusterfs"]
 	path = roles/glusterfs
 	url = https://github.com/geerlingguy/ansible-role-glusterfs.git
+[submodule "roles/nagios"]
+	path = roles/nagios
+	url = https://github.com/Mooash/nagios-nrpe-server.git
diff --git a/main.yml b/main.yml
index a695538..cbae973 100644
--- a/main.yml
+++ b/main.yml
@@ -1,146 +1,154 @@
 ---
 - name: Create Instances
   hosts: 127.0.0.1
   tags: always
   connection: local
   gather_facts: false
   vars_files:
     - "vars/main.yml"
   tasks:
     - include: tasks/create-security-groups.yml
       tags: [ 'init' ]
     - include: tasks/create-instances.yml
       tags: [ 'always' ]
     - include: tasks/create-volumes.yml
       tags: [ 'init' ]
 
 - name: Configure Jump Server
   hosts: lbs 
   tags: conf-lbs
   vars_files:
     - "vars/main.yml"
   user: centos
   sudo: yes
   roles:
       - role: common
         tags: [ 'common' ]
       - role: swap/roles/swap
         tags: [ 'common' ]
       - role: ganglia-gmond
+      - role: nagios
+        tags: [ 'common' ]
       - role: haproxy
       - role: jump
   handlers:
     - include: handlers/main.yml
 
 #- name: Configure keepalived for jump1
 #  hosts: c4science-jump01
 #  roles:
 #      - role: keepalived
 #        keepalived_shared_ip: "{{ external_ip }}"
 #        keepalived_role: "master"
 
 #- name: Configure keepalived for jump2
 #  hosts: c4science-jump02
 #  roles:
 #      - role: keepalived
 #        keepalived_shared_ip: "{{ external_ip }}"
 #        keepalived_role: "slave"
 
 - name: Configure Monitoring Server
   hosts: monit
   tags: conf-monit
   vars_files:
     - "vars/main.yml"
   user: centos
   sudo: yes
   roles:
       - role: common
         tags: [ 'common' ]
       - role: swap/roles/swap
         tags: [ 'common' ]
       - role: nginx
         nginx_config: nginx-monit.conf
       - role: ganglia-gmond
       - role: ganglia-gmetad
   tasks:
       - include: roles/galera/tasks/install.yml
         yum_repo: roles/galera/files/yum.repo
   handlers:
     - include: handlers/main.yml
 
 - name: Configure Databases
   hosts: dbs
   tags: conf-dbs
   vars_files:
     - "vars/main.yml"
   user: centos
   sudo: yes
   roles:
       - role: common
         tags: [ 'common' ]
       - role: swap/roles/swap
         tags: [ 'common' ]
+      - role: nagios
+        tags: [ 'common' ]
       - role: ganglia-gmond
       - role: galera
   handlers:
     - include: handlers/main.yml
 
 - name: Configure App
   hosts: app
   tags: conf-app
   vars_files:
     - "vars/main.yml"
   user: centos
   sudo: yes
   roles:
       - role: common
         tags: [ 'common' ]
       - role: swap/roles/swap
         tags: [ 'common' ]
+      - role: nagios
+        tags: [ 'common' ]
       - role: ganglia-gmond
       - { role: nginx, nginx_config: nginx-phabricator.conf }
       - role: glusterfs
       - role: phabricator
   handlers:
     - include: handlers/main.yml
 
 - name: Configure Jenkins
   hosts: ci
   vars_files:
     - "vars/main.yml"
   user: centos
   sudo: yes
   roles:
       - role: common
         tags: [ 'common' ]
       - role: swap/roles/swap
         tags: [ 'common' ]
+      - role: nagios
+        tags: [ 'common' ]
       - role: ganglia-gmond
       - role: ci
       - role: jenkins
         plugins:
           - 'ldap'
           - 'preSCMbuildstep'
           - 'git'
           - 'build-token-root'
           - 'phabricator-plugin'
         prefix: '/build'
         email:
           smtp_host: 'mail.epfl.ch'
           smtp_ssl: 'true'
           default_email_suffix: '@epfl.ch'
 
 - name: Configure Backup server
   hosts: backup
   tags: conf-backup
   vars_files:
     - "vars/main.yml"
   user: centos
   sudo: yes
   roles:
       - role: common
         tags: [ 'common' ]
       - role: swap/roles/swap
         tags: [ 'common' ]
       - role: backup
 
diff --git a/roles/nagios b/roles/nagios
new file mode 160000
index 0000000..7b224a8
--- /dev/null
+++ b/roles/nagios
@@ -0,0 +1 @@
+Subproject commit 7b224a86767a1ad4bf913c2a64095c062bec1aa1