diff --git a/playbooks/postgresql.yml b/playbooks/postgresql.yml
index 1b587f1..de81123 100755
--- a/playbooks/postgresql.yml
+++ b/playbooks/postgresql.yml
@@ -1,11 +1,20 @@
 #!/usr/bin/env ansible-playbook
 ---
-# Install and configure database servers at Saclay and at OVH
-- hosts: bdd.adm.auro.re,bdd-ovh.adm.auro.re
+# Install and configure database servers at Saclay
+- hosts: bdd.adm.auro.re
   vars:
     update_motd:
       postgresql: PostgreSQL est déployé.
   roles:
-    - postgresql_server
+    - postgresql
+    - update_motd
+
+# Install and configure database servers at OVH
+- hosts: bdd-ovh.adm.auro.re
+  vars:
+    update_motd:
+      postgresql: PostgreSQL est déployé.
+  roles:
+    - postgresql
     - update_motd
 ...
diff --git a/roles/postgresql_server/defaults/main.yml b/roles/postgresql/defaults/main.yml
similarity index 100%
rename from roles/postgresql_server/defaults/main.yml
rename to roles/postgresql/defaults/main.yml
diff --git a/roles/postgresql_server/handlers/main.yml b/roles/postgresql/handlers/main.yml
similarity index 100%
rename from roles/postgresql_server/handlers/main.yml
rename to roles/postgresql/handlers/main.yml
diff --git a/roles/postgresql_server/tasks/main.yml b/roles/postgresql/tasks/main.yml
similarity index 100%
rename from roles/postgresql_server/tasks/main.yml
rename to roles/postgresql/tasks/main.yml
diff --git a/roles/postgresql_server/templates/postgresql/pg_hba.conf.j2 b/roles/postgresql/templates/postgresql/pg_hba.conf.j2
similarity index 100%
rename from roles/postgresql_server/templates/postgresql/pg_hba.conf.j2
rename to roles/postgresql/templates/postgresql/pg_hba.conf.j2
diff --git a/roles/postgresql_server/templates/postgresql/pg_ident.conf.j2 b/roles/postgresql/templates/postgresql/pg_ident.conf.j2
similarity index 100%
rename from roles/postgresql_server/templates/postgresql/pg_ident.conf.j2
rename to roles/postgresql/templates/postgresql/pg_ident.conf.j2
diff --git a/roles/postgresql_server/templates/postgresql/postgresql.conf.j2 b/roles/postgresql/templates/postgresql/postgresql.conf.j2
similarity index 100%
rename from roles/postgresql_server/templates/postgresql/postgresql.conf.j2
rename to roles/postgresql/templates/postgresql/postgresql.conf.j2