diff --git a/postgres/Dockerfile b/postgres/Dockerfile.95
similarity index 100%
rename from postgres/Dockerfile
rename to postgres/Dockerfile.95
diff --git a/postgres/Dockerfile.96 b/postgres/Dockerfile.96
new file mode 100644
index 0000000..054c60d
--- /dev/null
+++ b/postgres/Dockerfile.96
@@ -0,0 +1,5 @@
+FROM postgres:9.6
+MAINTAINER Fabien Bourgeois <fabien@yaltik.com>
+
+RUN localedef -i fr_FR -c -f UTF-8 -A /usr/share/locale/locale.alias fr_FR.UTF-8
+ENV LANG fr_FR.utf8
diff --git a/postgres/base.yml b/postgres/base.yml
new file mode 100644
index 0000000..21d0e79
--- /dev/null
+++ b/postgres/base.yml
@@ -0,0 +1,12 @@
+version: '2'
+services:
+  postgres95:
+    build:
+      context: .
+      dockerfile: Dockerfile.95
+    image: frpg:9.5
+  postgres96:
+    build:
+      context: .
+      dockerfile: Dockerfile.96
+    image: frpg:9.6