diff --git a/.gitmodules b/.gitmodules
index 4e7d983..592e728 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,15 +1,18 @@
 [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
diff --git a/main.yml b/main.yml
index 9132fee..91c7b11 100644
--- a/main.yml
+++ b/main.yml
@@ -1,117 +1,118 @@
 ---
 - name: Create Instances
   hosts: 127.0.0.1
   connection: local
   gather_facts: false
   vars_files:
     - "vars/main.yml"
   tasks:
     - include: tasks/create-instances.yml
 
 - name: Configure Jump Server
   hosts: lbs 
   vars_files:
     - "vars/main.yml"
   user: centos
   sudo: yes
   roles:
       - role: common
         tags: [ 'common' ]
       - role: swap/roles/swap
         tags: [ 'common' ]
 #      - role: sensu
 #        sensu_rabbitmq_host: "{{ groups['monit'][0] }}"
       - role: ganglia-gmond
       - role: haproxy
       - role: jump
       - role: nfs
         nfs_server_daemon: nfs-server # doesn't work as it's in vars not default
   handlers:
     - include: handlers/main.yml
 
 - name: Configure Monitoring Server
   hosts: 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
+      - role: galera/tasks/install.yml
 #      - role: rabbitmq
 #      - role: redis
 #      - role: uchiwa
 #      - role: sensu
 #        sensu_install_server: true
 #        sensu_install_api: true
   handlers:
     - include: handlers/main.yml
 
 - name: Configure Databases
   hosts: dbs
   vars_files:
     - "vars/main.yml"
   user: centos
   sudo: yes
   roles:
       - role: common
         tags: [ 'common' ]
       - role: swap/roles/swap
         tags: [ 'common' ]
       - role: ganglia-gmond
 #      - role: sensu
 #        sensu_rabbitmq_host: "{{ groups['monit'][0] }}"
       - role: galera
   handlers:
     - include: handlers/main.yml
 
 - name: Configure App
   hosts: app
   vars_files:
     - "vars/main.yml"
   user: centos
   sudo: yes
   roles:
       - role: common
         tags: [ 'common' ]
       - role: swap/roles/swap
         tags: [ 'common' ]
       - role: ganglia-gmond
 #      - role: sensu
 #        sensu_rabbitmq_host: "{{ groups['monit'][0] }}"
       - { role: nginx, nginx_config: nginx-phabricator.conf }
       - 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: ganglia-gmond
 #      - role: sensu
 #        sensu_rabbitmq_host: "{{ groups['monit'][0] }}"
       - role: ci
       - role: jenkins
         plugins:
           - 'ldap'
           - 'preSCMbuildstep'
         prefix: '/build'
         email:
           smtp_host: 'mail.epfl.ch'
           smtp_ssl: 'true'
           default_email_suffix: '@epfl.ch'
 
diff --git a/roles/keepalived b/roles/keepalived
new file mode 160000
index 0000000..2bcd95f
--- /dev/null
+++ b/roles/keepalived
@@ -0,0 +1 @@
+Subproject commit 2bcd95f5258ff06d4618b1123bf517e1fa3ad8d3