diff --git a/8/postgres-tomcat/docker-compose.yml b/8/postgres-tomcat/docker-compose.yml
index ddda6e3e3703508795851c53340aa97f4422771f..34c8cae780e327db3cfd4b70e0f37e2cb5289ca6 100644
--- a/8/postgres-tomcat/docker-compose.yml
+++ b/8/postgres-tomcat/docker-compose.yml
@@ -46,7 +46,7 @@ services:
       - bridge
   # The container that runs the database (postgres)
   db:
-    image: "postgres:9.6"
+    image: "postgres:9.5"
     container_name: xwiki-postgres-db
     volumes:
       - postgres-data:/var/lib/postgresql/data
diff --git a/9/postgres-tomcat/docker-compose.yml b/9/postgres-tomcat/docker-compose.yml
index ddda6e3e3703508795851c53340aa97f4422771f..34c8cae780e327db3cfd4b70e0f37e2cb5289ca6 100644
--- a/9/postgres-tomcat/docker-compose.yml
+++ b/9/postgres-tomcat/docker-compose.yml
@@ -46,7 +46,7 @@ services:
       - bridge
   # The container that runs the database (postgres)
   db:
-    image: "postgres:9.6"
+    image: "postgres:9.5"
     container_name: xwiki-postgres-db
     volumes:
       - postgres-data:/var/lib/postgresql/data
diff --git a/template/docker-compose.yml b/template/docker-compose.yml
index a70be18ee35c02d9d855e90b5fe67625ab1d5a6b..ffaa6decc3432a00bfd09ae3d7df6b4e0d7faa82 100644
--- a/template/docker-compose.yml
+++ b/template/docker-compose.yml
@@ -65,7 +65,7 @@ services:
       - MYSQL_PASSWORD=\${DB_PASSWORD}
       - MYSQL_DATABASE=\${DB_DATABASE}'''
 
-    else if (db == 'postgres') print '''image: "postgres:9.6"
+    else if (db == 'postgres') print '''image: "postgres:9.5"
     container_name: xwiki-postgres-db
     volumes:
       - postgres-data:/var/lib/postgresql/data