diff --git a/.travis.yml b/.travis.yml
index dc8d9c53..b567d930 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 
 ##########################################################################
 ##                         AUTO-GENERATED FILE                          ##
-##               BUILD_NUMBER=Fri Mar  9 17:48:14 +07 2018              ##
+##               BUILD_NUMBER=Sun Apr  8 00:03:15 CST 2018              ##
 ##########################################################################
 
 sudo: required
@@ -29,15 +29,15 @@ jobs:
     - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-extended-9.5_pgpool-3.3_barman-2.3 ./tests/run.sh
       env:
         - NAME = postgres-extended-9.5_pgpool-3.3_barman-2.3
-    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-extended-10.2_pgpool-3.7_barman-2.3 ./tests/run.sh
+    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-extended-10_pgpool-3.7_barman-2.3 ./tests/run.sh
       env:
-        - NAME = postgres-extended-10.2_pgpool-3.7_barman-2.3
-    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-extended-10.2_pgpool-3.6_barman-2.3 ./tests/run.sh
+        - NAME = postgres-extended-10_pgpool-3.7_barman-2.3
+    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-extended-10_pgpool-3.6_barman-2.3 ./tests/run.sh
       env:
-        - NAME = postgres-extended-10.2_pgpool-3.6_barman-2.3
-    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-extended-10.2_pgpool-3.3_barman-2.3 ./tests/run.sh
+        - NAME = postgres-extended-10_pgpool-3.6_barman-2.3
+    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-extended-10_pgpool-3.3_barman-2.3 ./tests/run.sh
       env:
-        - NAME = postgres-extended-10.2_pgpool-3.3_barman-2.3
+        - NAME = postgres-extended-10_pgpool-3.3_barman-2.3
     - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-9.6_pgpool-3.7_barman-2.3 ./tests/run.sh
       env:
         - NAME = postgres-9.6_pgpool-3.7_barman-2.3
@@ -56,15 +56,15 @@ jobs:
     - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-9.5_pgpool-3.3_barman-2.3 ./tests/run.sh
       env:
         - NAME = postgres-9.5_pgpool-3.3_barman-2.3
-    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-10.2_pgpool-3.7_barman-2.3 ./tests/run.sh
+    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-10_pgpool-3.7_barman-2.3 ./tests/run.sh
       env:
-        - NAME = postgres-10.2_pgpool-3.7_barman-2.3
-    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-10.2_pgpool-3.6_barman-2.3 ./tests/run.sh
+        - NAME = postgres-10_pgpool-3.7_barman-2.3
+    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-10_pgpool-3.6_barman-2.3 ./tests/run.sh
       env:
-        - NAME = postgres-10.2_pgpool-3.6_barman-2.3
-    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-10.2_pgpool-3.3_barman-2.3 ./tests/run.sh
+        - NAME = postgres-10_pgpool-3.6_barman-2.3
+    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-10_pgpool-3.3_barman-2.3 ./tests/run.sh
       env:
-        - NAME = postgres-10.2_pgpool-3.3_barman-2.3
+        - NAME = postgres-10_pgpool-3.3_barman-2.3
     - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=latest ./tests/run.sh
       env:
         - NAME = latest
diff --git a/README.md b/README.md
index a93ccbc4..5b7f0fe6 100644
--- a/README.md
+++ b/README.md
@@ -59,13 +59,13 @@ Taking into account that PostDock project itself has versioning schema, all dock
 
 * `<postdock_version>` - semantic version without `bug-fix` component (can be `1.1`,`1.2`,...)
 * `<component>`, `<component_version>` - depends on component:
-    * `postgres`,`postgres-extended` - major and minor version without dot in between(can be `95`,`96`,`102`)
+    * `postgres`,`postgres-extended` - major and minor version without dot in between(can be `95`,`96`,`10`)
     * `pgpool` - major and minor version of component without dot in between(can be `33`,`36`,`37`)
     * `barman` - major version only (can be `2`)
 * `<sub_component>`, `<sub_component_version>` - depends on component:
     * for `postgres` - `repmgr` can be `3.2`
-    * for `barman` - `postgres` can be `9.6`, `10.2`
-    * for `pgpool` - `postgres` can be `9.6`, `10.2`
+    * for `barman` - `postgres` can be `9.6`, `10`
+    * for `pgpool` - `postgres` can be `9.6`, `10`
 
 Aliases are available **(not recommended to use for production)**:
 
diff --git a/docker-compose/latest.yml b/docker-compose/latest.yml
index 2f552b81..12f8592f 120000
--- a/docker-compose/latest.yml
+++ b/docker-compose/latest.yml
@@ -1 +1 @@
-./postgres-10.2_pgpool-3.7_barman-2.3.yml
\ No newline at end of file
+./postgres-10_pgpool-3.7_barman-2.3.yml
\ No newline at end of file
diff --git a/docker-compose/postgres-10.2_pgpool-3.3_barman-2.3.yml b/docker-compose/postgres-10_pgpool-3.3_barman-2.3.yml
similarity index 92%
rename from docker-compose/postgres-10.2_pgpool-3.3_barman-2.3.yml
rename to docker-compose/postgres-10_pgpool-3.3_barman-2.3.yml
index 5a9b3040..4c883a00 100644
--- a/docker-compose/postgres-10.2_pgpool-3.3_barman-2.3.yml
+++ b/docker-compose/postgres-10_pgpool-3.3_barman-2.3.yml
@@ -1,7 +1,7 @@
 
 ##########################################################################
 ##                         AUTO-GENERATED FILE                          ##
-##               BUILD_NUMBER=Fri Mar  9 17:48:14 +07 2018              ##
+##               BUILD_NUMBER=Sun Apr  8 00:03:15 CST 2018              ##
 ##########################################################################
 
 version: '2'
@@ -21,7 +21,7 @@ services:
     pgmaster:
         build:
             context: ../src
-            dockerfile: Postgres-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-10-Repmgr-3.2.Dockerfile
         environment:
             NODE_ID: 1 # Integer number of node (not required if can be extracted from NODE_NAME var, e.g. node-45 => 1045)
             NODE_NAME: node1 # Node name
@@ -59,7 +59,7 @@ services:
     pgslave1:
         build:
             context: ../src
-            dockerfile: Postgres-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-10-Repmgr-3.2.Dockerfile
         environment:
             NODE_ID: 2
             NODE_NAME: node2
@@ -83,7 +83,7 @@ services:
     pgslave2:
         build:
             context: ../src
-            dockerfile: Postgres-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-10-Repmgr-3.2.Dockerfile
         environment:
             NODE_ID: 3
             NODE_NAME: node3
@@ -106,7 +106,7 @@ services:
     pgslave3:
         build:
             context: ../src
-            dockerfile: Postgres-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-10-Repmgr-3.2.Dockerfile
         environment:
             NODE_ID: 4
             NODE_NAME: node4
@@ -130,7 +130,7 @@ services:
     pgslave4:
         build:
             context: ../src
-            dockerfile: Postgres-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-10-Repmgr-3.2.Dockerfile
         environment:
             NODE_ID: 5
             NODE_NAME: node5
@@ -152,7 +152,7 @@ services:
     backup:
         build:
             context: ../src
-            dockerfile: Barman-2.3-Postgres-10.2.Dockerfile
+            dockerfile: Barman-2.3-Postgres-10.Dockerfile
         environment:
             REPLICATION_USER: replication_user # default is replication_user
             REPLICATION_PASSWORD: replication_pass # default is replication_pass
@@ -171,7 +171,7 @@ services:
     pgpool:
         build:
             context: ../src
-            dockerfile: Pgpool-3.3-Postgres-10.2.Dockerfile
+            dockerfile: Pgpool-3.3-Postgres-10.Dockerfile
         environment:
             PCP_USER: pcp_user
             PCP_PASSWORD: pcp_pass
@@ -204,7 +204,7 @@ services:
     postgres_ext:
         build:
             context: ../src
-            dockerfile: Postgres-extended-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-extended-10-Repmgr-3.2.Dockerfile
         environment:
           NODE_ID: 101 
           NODE_NAME: node101 # Node name
@@ -218,7 +218,7 @@ services:
     postgres_conf:
         build:
           context: ../src/
-          dockerfile: Postgres-10.2-Repmgr-3.2.Dockerfile
+          dockerfile: Postgres-10-Repmgr-3.2.Dockerfile
         environment:
           NODE_NAME: node-102 # Node name
           CLUSTER_NODE_NETWORK_NAME: postgres_conf # (default: hostname of the node)
@@ -232,7 +232,7 @@ services:
     pgpool_conf:
         build:
             context: ../src
-            dockerfile: Pgpool-3.3-Postgres-10.2.Dockerfile
+            dockerfile: Pgpool-3.3-Postgres-10.Dockerfile
         environment:
             PCP_USER: pcp_user
             PCP_PASSWORD: pcp_pass
@@ -251,7 +251,7 @@ services:
     pgmaster2:
         build:
             context: ../src
-            dockerfile: Postgres-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-10-Repmgr-3.2.Dockerfile
         environment:
 
             NODE_ID: 1
@@ -272,7 +272,7 @@ services:
     pgpool2:
         build:
             context: ../src
-            dockerfile: Pgpool-3.3-Postgres-10.2.Dockerfile
+            dockerfile: Pgpool-3.3-Postgres-10.Dockerfile
         depends_on:
             - pgmaster
             - pgmaster2
diff --git a/docker-compose/postgres-10.2_pgpool-3.6_barman-2.3.yml b/docker-compose/postgres-10_pgpool-3.6_barman-2.3.yml
similarity index 92%
rename from docker-compose/postgres-10.2_pgpool-3.6_barman-2.3.yml
rename to docker-compose/postgres-10_pgpool-3.6_barman-2.3.yml
index e522438b..197ac9ca 100644
--- a/docker-compose/postgres-10.2_pgpool-3.6_barman-2.3.yml
+++ b/docker-compose/postgres-10_pgpool-3.6_barman-2.3.yml
@@ -1,7 +1,7 @@
 
 ##########################################################################
 ##                         AUTO-GENERATED FILE                          ##
-##               BUILD_NUMBER=Fri Mar  9 17:48:14 +07 2018              ##
+##               BUILD_NUMBER=Sun Apr  8 00:03:15 CST 2018              ##
 ##########################################################################
 
 version: '2'
@@ -21,7 +21,7 @@ services:
     pgmaster:
         build:
             context: ../src
-            dockerfile: Postgres-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-10-Repmgr-3.2.Dockerfile
         environment:
             NODE_ID: 1 # Integer number of node (not required if can be extracted from NODE_NAME var, e.g. node-45 => 1045)
             NODE_NAME: node1 # Node name
@@ -59,7 +59,7 @@ services:
     pgslave1:
         build:
             context: ../src
-            dockerfile: Postgres-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-10-Repmgr-3.2.Dockerfile
         environment:
             NODE_ID: 2
             NODE_NAME: node2
@@ -83,7 +83,7 @@ services:
     pgslave2:
         build:
             context: ../src
-            dockerfile: Postgres-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-10-Repmgr-3.2.Dockerfile
         environment:
             NODE_ID: 3
             NODE_NAME: node3
@@ -106,7 +106,7 @@ services:
     pgslave3:
         build:
             context: ../src
-            dockerfile: Postgres-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-10-Repmgr-3.2.Dockerfile
         environment:
             NODE_ID: 4
             NODE_NAME: node4
@@ -130,7 +130,7 @@ services:
     pgslave4:
         build:
             context: ../src
-            dockerfile: Postgres-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-10-Repmgr-3.2.Dockerfile
         environment:
             NODE_ID: 5
             NODE_NAME: node5
@@ -152,7 +152,7 @@ services:
     backup:
         build:
             context: ../src
-            dockerfile: Barman-2.3-Postgres-10.2.Dockerfile
+            dockerfile: Barman-2.3-Postgres-10.Dockerfile
         environment:
             REPLICATION_USER: replication_user # default is replication_user
             REPLICATION_PASSWORD: replication_pass # default is replication_pass
@@ -171,7 +171,7 @@ services:
     pgpool:
         build:
             context: ../src
-            dockerfile: Pgpool-3.6-Postgres-10.2.Dockerfile
+            dockerfile: Pgpool-3.6-Postgres-10.Dockerfile
         environment:
             PCP_USER: pcp_user
             PCP_PASSWORD: pcp_pass
@@ -204,7 +204,7 @@ services:
     postgres_ext:
         build:
             context: ../src
-            dockerfile: Postgres-extended-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-extended-10-Repmgr-3.2.Dockerfile
         environment:
           NODE_ID: 101 
           NODE_NAME: node101 # Node name
@@ -218,7 +218,7 @@ services:
     postgres_conf:
         build:
           context: ../src/
-          dockerfile: Postgres-10.2-Repmgr-3.2.Dockerfile
+          dockerfile: Postgres-10-Repmgr-3.2.Dockerfile
         environment:
           NODE_NAME: node-102 # Node name
           CLUSTER_NODE_NETWORK_NAME: postgres_conf # (default: hostname of the node)
@@ -232,7 +232,7 @@ services:
     pgpool_conf:
         build:
             context: ../src
-            dockerfile: Pgpool-3.6-Postgres-10.2.Dockerfile
+            dockerfile: Pgpool-3.6-Postgres-10.Dockerfile
         environment:
             PCP_USER: pcp_user
             PCP_PASSWORD: pcp_pass
@@ -251,7 +251,7 @@ services:
     pgmaster2:
         build:
             context: ../src
-            dockerfile: Postgres-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-10-Repmgr-3.2.Dockerfile
         environment:
 
             NODE_ID: 1
@@ -272,7 +272,7 @@ services:
     pgpool2:
         build:
             context: ../src
-            dockerfile: Pgpool-3.6-Postgres-10.2.Dockerfile
+            dockerfile: Pgpool-3.6-Postgres-10.Dockerfile
         depends_on:
             - pgmaster
             - pgmaster2
diff --git a/docker-compose/postgres-10.2_pgpool-3.7_barman-2.3.yml b/docker-compose/postgres-10_pgpool-3.7_barman-2.3.yml
similarity index 92%
rename from docker-compose/postgres-10.2_pgpool-3.7_barman-2.3.yml
rename to docker-compose/postgres-10_pgpool-3.7_barman-2.3.yml
index e9613c2d..8c6b7435 100644
--- a/docker-compose/postgres-10.2_pgpool-3.7_barman-2.3.yml
+++ b/docker-compose/postgres-10_pgpool-3.7_barman-2.3.yml
@@ -1,7 +1,7 @@
 
 ##########################################################################
 ##                         AUTO-GENERATED FILE                          ##
-##               BUILD_NUMBER=Fri Mar  9 17:48:14 +07 2018              ##
+##               BUILD_NUMBER=Sun Apr  8 00:03:15 CST 2018              ##
 ##########################################################################
 
 version: '2'
@@ -21,7 +21,7 @@ services:
     pgmaster:
         build:
             context: ../src
-            dockerfile: Postgres-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-10-Repmgr-3.2.Dockerfile
         environment:
             NODE_ID: 1 # Integer number of node (not required if can be extracted from NODE_NAME var, e.g. node-45 => 1045)
             NODE_NAME: node1 # Node name
@@ -59,7 +59,7 @@ services:
     pgslave1:
         build:
             context: ../src
-            dockerfile: Postgres-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-10-Repmgr-3.2.Dockerfile
         environment:
             NODE_ID: 2
             NODE_NAME: node2
@@ -83,7 +83,7 @@ services:
     pgslave2:
         build:
             context: ../src
-            dockerfile: Postgres-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-10-Repmgr-3.2.Dockerfile
         environment:
             NODE_ID: 3
             NODE_NAME: node3
@@ -106,7 +106,7 @@ services:
     pgslave3:
         build:
             context: ../src
-            dockerfile: Postgres-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-10-Repmgr-3.2.Dockerfile
         environment:
             NODE_ID: 4
             NODE_NAME: node4
@@ -130,7 +130,7 @@ services:
     pgslave4:
         build:
             context: ../src
-            dockerfile: Postgres-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-10-Repmgr-3.2.Dockerfile
         environment:
             NODE_ID: 5
             NODE_NAME: node5
@@ -152,7 +152,7 @@ services:
     backup:
         build:
             context: ../src
-            dockerfile: Barman-2.3-Postgres-10.2.Dockerfile
+            dockerfile: Barman-2.3-Postgres-10.Dockerfile
         environment:
             REPLICATION_USER: replication_user # default is replication_user
             REPLICATION_PASSWORD: replication_pass # default is replication_pass
@@ -171,7 +171,7 @@ services:
     pgpool:
         build:
             context: ../src
-            dockerfile: Pgpool-3.7-Postgres-10.2.Dockerfile
+            dockerfile: Pgpool-3.7-Postgres-10.Dockerfile
         environment:
             PCP_USER: pcp_user
             PCP_PASSWORD: pcp_pass
@@ -204,7 +204,7 @@ services:
     postgres_ext:
         build:
             context: ../src
-            dockerfile: Postgres-extended-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-extended-10-Repmgr-3.2.Dockerfile
         environment:
           NODE_ID: 101 
           NODE_NAME: node101 # Node name
@@ -218,7 +218,7 @@ services:
     postgres_conf:
         build:
           context: ../src/
-          dockerfile: Postgres-10.2-Repmgr-3.2.Dockerfile
+          dockerfile: Postgres-10-Repmgr-3.2.Dockerfile
         environment:
           NODE_NAME: node-102 # Node name
           CLUSTER_NODE_NETWORK_NAME: postgres_conf # (default: hostname of the node)
@@ -232,7 +232,7 @@ services:
     pgpool_conf:
         build:
             context: ../src
-            dockerfile: Pgpool-3.7-Postgres-10.2.Dockerfile
+            dockerfile: Pgpool-3.7-Postgres-10.Dockerfile
         environment:
             PCP_USER: pcp_user
             PCP_PASSWORD: pcp_pass
@@ -251,7 +251,7 @@ services:
     pgmaster2:
         build:
             context: ../src
-            dockerfile: Postgres-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-10-Repmgr-3.2.Dockerfile
         environment:
 
             NODE_ID: 1
@@ -272,7 +272,7 @@ services:
     pgpool2:
         build:
             context: ../src
-            dockerfile: Pgpool-3.7-Postgres-10.2.Dockerfile
+            dockerfile: Pgpool-3.7-Postgres-10.Dockerfile
         depends_on:
             - pgmaster
             - pgmaster2
diff --git a/docker-compose/postgres-9.5_pgpool-3.3_barman-2.3.yml b/docker-compose/postgres-9.5_pgpool-3.3_barman-2.3.yml
index ae0d3024..db9d5a4b 100644
--- a/docker-compose/postgres-9.5_pgpool-3.3_barman-2.3.yml
+++ b/docker-compose/postgres-9.5_pgpool-3.3_barman-2.3.yml
@@ -1,7 +1,7 @@
 
 ##########################################################################
 ##                         AUTO-GENERATED FILE                          ##
-##               BUILD_NUMBER=Fri Mar  9 17:48:14 +07 2018              ##
+##               BUILD_NUMBER=Sun Apr  8 00:03:15 CST 2018              ##
 ##########################################################################
 
 version: '2'
diff --git a/docker-compose/postgres-9.5_pgpool-3.6_barman-2.3.yml b/docker-compose/postgres-9.5_pgpool-3.6_barman-2.3.yml
index 4aeb923f..08e44922 100644
--- a/docker-compose/postgres-9.5_pgpool-3.6_barman-2.3.yml
+++ b/docker-compose/postgres-9.5_pgpool-3.6_barman-2.3.yml
@@ -1,7 +1,7 @@
 
 ##########################################################################
 ##                         AUTO-GENERATED FILE                          ##
-##               BUILD_NUMBER=Fri Mar  9 17:48:14 +07 2018              ##
+##               BUILD_NUMBER=Sun Apr  8 00:03:15 CST 2018              ##
 ##########################################################################
 
 version: '2'
diff --git a/docker-compose/postgres-9.5_pgpool-3.7_barman-2.3.yml b/docker-compose/postgres-9.5_pgpool-3.7_barman-2.3.yml
index c4e8d28b..911d948b 100644
--- a/docker-compose/postgres-9.5_pgpool-3.7_barman-2.3.yml
+++ b/docker-compose/postgres-9.5_pgpool-3.7_barman-2.3.yml
@@ -1,7 +1,7 @@
 
 ##########################################################################
 ##                         AUTO-GENERATED FILE                          ##
-##               BUILD_NUMBER=Fri Mar  9 17:48:14 +07 2018              ##
+##               BUILD_NUMBER=Sun Apr  8 00:03:15 CST 2018              ##
 ##########################################################################
 
 version: '2'
diff --git a/docker-compose/postgres-9.6_pgpool-3.3_barman-2.3.yml b/docker-compose/postgres-9.6_pgpool-3.3_barman-2.3.yml
index ee66d8d6..36c2d272 100644
--- a/docker-compose/postgres-9.6_pgpool-3.3_barman-2.3.yml
+++ b/docker-compose/postgres-9.6_pgpool-3.3_barman-2.3.yml
@@ -1,7 +1,7 @@
 
 ##########################################################################
 ##                         AUTO-GENERATED FILE                          ##
-##               BUILD_NUMBER=Fri Mar  9 17:48:14 +07 2018              ##
+##               BUILD_NUMBER=Sun Apr  8 00:03:15 CST 2018              ##
 ##########################################################################
 
 version: '2'
diff --git a/docker-compose/postgres-9.6_pgpool-3.6_barman-2.3.yml b/docker-compose/postgres-9.6_pgpool-3.6_barman-2.3.yml
index 28b75d90..3c63c7db 100644
--- a/docker-compose/postgres-9.6_pgpool-3.6_barman-2.3.yml
+++ b/docker-compose/postgres-9.6_pgpool-3.6_barman-2.3.yml
@@ -1,7 +1,7 @@
 
 ##########################################################################
 ##                         AUTO-GENERATED FILE                          ##
-##               BUILD_NUMBER=Fri Mar  9 17:48:14 +07 2018              ##
+##               BUILD_NUMBER=Sun Apr  8 00:03:15 CST 2018              ##
 ##########################################################################
 
 version: '2'
diff --git a/docker-compose/postgres-9.6_pgpool-3.7_barman-2.3.yml b/docker-compose/postgres-9.6_pgpool-3.7_barman-2.3.yml
index 0bb54717..b117e122 100644
--- a/docker-compose/postgres-9.6_pgpool-3.7_barman-2.3.yml
+++ b/docker-compose/postgres-9.6_pgpool-3.7_barman-2.3.yml
@@ -1,7 +1,7 @@
 
 ##########################################################################
 ##                         AUTO-GENERATED FILE                          ##
-##               BUILD_NUMBER=Fri Mar  9 17:48:14 +07 2018              ##
+##               BUILD_NUMBER=Sun Apr  8 00:03:15 CST 2018              ##
 ##########################################################################
 
 version: '2'
diff --git a/docker-compose/postgres-extended-10.2_pgpool-3.6_barman-2.3.yml b/docker-compose/postgres-extended-10_pgpool-3.3_barman-2.3.yml
similarity index 91%
rename from docker-compose/postgres-extended-10.2_pgpool-3.6_barman-2.3.yml
rename to docker-compose/postgres-extended-10_pgpool-3.3_barman-2.3.yml
index d8664134..649363c0 100644
--- a/docker-compose/postgres-extended-10.2_pgpool-3.6_barman-2.3.yml
+++ b/docker-compose/postgres-extended-10_pgpool-3.3_barman-2.3.yml
@@ -1,7 +1,7 @@
 
 ##########################################################################
 ##                         AUTO-GENERATED FILE                          ##
-##               BUILD_NUMBER=Fri Mar  9 17:48:14 +07 2018              ##
+##               BUILD_NUMBER=Sun Apr  8 00:03:15 CST 2018              ##
 ##########################################################################
 
 version: '2'
@@ -21,7 +21,7 @@ services:
     pgmaster:
         build:
             context: ../src
-            dockerfile: Postgres-extended-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-extended-10-Repmgr-3.2.Dockerfile
         environment:
             NODE_ID: 1 # Integer number of node (not required if can be extracted from NODE_NAME var, e.g. node-45 => 1045)
             NODE_NAME: node1 # Node name
@@ -59,7 +59,7 @@ services:
     pgslave1:
         build:
             context: ../src
-            dockerfile: Postgres-extended-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-extended-10-Repmgr-3.2.Dockerfile
         environment:
             NODE_ID: 2
             NODE_NAME: node2
@@ -83,7 +83,7 @@ services:
     pgslave2:
         build:
             context: ../src
-            dockerfile: Postgres-extended-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-extended-10-Repmgr-3.2.Dockerfile
         environment:
             NODE_ID: 3
             NODE_NAME: node3
@@ -106,7 +106,7 @@ services:
     pgslave3:
         build:
             context: ../src
-            dockerfile: Postgres-extended-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-extended-10-Repmgr-3.2.Dockerfile
         environment:
             NODE_ID: 4
             NODE_NAME: node4
@@ -130,7 +130,7 @@ services:
     pgslave4:
         build:
             context: ../src
-            dockerfile: Postgres-extended-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-extended-10-Repmgr-3.2.Dockerfile
         environment:
             NODE_ID: 5
             NODE_NAME: node5
@@ -152,7 +152,7 @@ services:
     backup:
         build:
             context: ../src
-            dockerfile: Barman-2.3-Postgres-10.2.Dockerfile
+            dockerfile: Barman-2.3-Postgres-10.Dockerfile
         environment:
             REPLICATION_USER: replication_user # default is replication_user
             REPLICATION_PASSWORD: replication_pass # default is replication_pass
@@ -171,7 +171,7 @@ services:
     pgpool:
         build:
             context: ../src
-            dockerfile: Pgpool-3.6-Postgres-10.2.Dockerfile
+            dockerfile: Pgpool-3.3-Postgres-10.Dockerfile
         environment:
             PCP_USER: pcp_user
             PCP_PASSWORD: pcp_pass
@@ -204,7 +204,7 @@ services:
     postgres_ext:
         build:
             context: ../src
-            dockerfile: Postgres-extended-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-extended-10-Repmgr-3.2.Dockerfile
         environment:
           NODE_ID: 101 
           NODE_NAME: node101 # Node name
@@ -218,7 +218,7 @@ services:
     postgres_conf:
         build:
           context: ../src/
-          dockerfile: Postgres-extended-10.2-Repmgr-3.2.Dockerfile
+          dockerfile: Postgres-extended-10-Repmgr-3.2.Dockerfile
         environment:
           NODE_NAME: node-102 # Node name
           CLUSTER_NODE_NETWORK_NAME: postgres_conf # (default: hostname of the node)
@@ -232,7 +232,7 @@ services:
     pgpool_conf:
         build:
             context: ../src
-            dockerfile: Pgpool-3.6-Postgres-10.2.Dockerfile
+            dockerfile: Pgpool-3.3-Postgres-10.Dockerfile
         environment:
             PCP_USER: pcp_user
             PCP_PASSWORD: pcp_pass
@@ -251,7 +251,7 @@ services:
     pgmaster2:
         build:
             context: ../src
-            dockerfile: Postgres-extended-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-extended-10-Repmgr-3.2.Dockerfile
         environment:
 
             NODE_ID: 1
@@ -272,7 +272,7 @@ services:
     pgpool2:
         build:
             context: ../src
-            dockerfile: Pgpool-3.6-Postgres-10.2.Dockerfile
+            dockerfile: Pgpool-3.3-Postgres-10.Dockerfile
         depends_on:
             - pgmaster
             - pgmaster2
diff --git a/docker-compose/postgres-extended-10.2_pgpool-3.7_barman-2.3.yml b/docker-compose/postgres-extended-10_pgpool-3.6_barman-2.3.yml
similarity index 91%
rename from docker-compose/postgres-extended-10.2_pgpool-3.7_barman-2.3.yml
rename to docker-compose/postgres-extended-10_pgpool-3.6_barman-2.3.yml
index ea863a81..aec56ecc 100644
--- a/docker-compose/postgres-extended-10.2_pgpool-3.7_barman-2.3.yml
+++ b/docker-compose/postgres-extended-10_pgpool-3.6_barman-2.3.yml
@@ -1,7 +1,7 @@
 
 ##########################################################################
 ##                         AUTO-GENERATED FILE                          ##
-##               BUILD_NUMBER=Fri Mar  9 17:48:14 +07 2018              ##
+##               BUILD_NUMBER=Sun Apr  8 00:03:15 CST 2018              ##
 ##########################################################################
 
 version: '2'
@@ -21,7 +21,7 @@ services:
     pgmaster:
         build:
             context: ../src
-            dockerfile: Postgres-extended-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-extended-10-Repmgr-3.2.Dockerfile
         environment:
             NODE_ID: 1 # Integer number of node (not required if can be extracted from NODE_NAME var, e.g. node-45 => 1045)
             NODE_NAME: node1 # Node name
@@ -59,7 +59,7 @@ services:
     pgslave1:
         build:
             context: ../src
-            dockerfile: Postgres-extended-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-extended-10-Repmgr-3.2.Dockerfile
         environment:
             NODE_ID: 2
             NODE_NAME: node2
@@ -83,7 +83,7 @@ services:
     pgslave2:
         build:
             context: ../src
-            dockerfile: Postgres-extended-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-extended-10-Repmgr-3.2.Dockerfile
         environment:
             NODE_ID: 3
             NODE_NAME: node3
@@ -106,7 +106,7 @@ services:
     pgslave3:
         build:
             context: ../src
-            dockerfile: Postgres-extended-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-extended-10-Repmgr-3.2.Dockerfile
         environment:
             NODE_ID: 4
             NODE_NAME: node4
@@ -130,7 +130,7 @@ services:
     pgslave4:
         build:
             context: ../src
-            dockerfile: Postgres-extended-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-extended-10-Repmgr-3.2.Dockerfile
         environment:
             NODE_ID: 5
             NODE_NAME: node5
@@ -152,7 +152,7 @@ services:
     backup:
         build:
             context: ../src
-            dockerfile: Barman-2.3-Postgres-10.2.Dockerfile
+            dockerfile: Barman-2.3-Postgres-10.Dockerfile
         environment:
             REPLICATION_USER: replication_user # default is replication_user
             REPLICATION_PASSWORD: replication_pass # default is replication_pass
@@ -171,7 +171,7 @@ services:
     pgpool:
         build:
             context: ../src
-            dockerfile: Pgpool-3.7-Postgres-10.2.Dockerfile
+            dockerfile: Pgpool-3.6-Postgres-10.Dockerfile
         environment:
             PCP_USER: pcp_user
             PCP_PASSWORD: pcp_pass
@@ -204,7 +204,7 @@ services:
     postgres_ext:
         build:
             context: ../src
-            dockerfile: Postgres-extended-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-extended-10-Repmgr-3.2.Dockerfile
         environment:
           NODE_ID: 101 
           NODE_NAME: node101 # Node name
@@ -218,7 +218,7 @@ services:
     postgres_conf:
         build:
           context: ../src/
-          dockerfile: Postgres-extended-10.2-Repmgr-3.2.Dockerfile
+          dockerfile: Postgres-extended-10-Repmgr-3.2.Dockerfile
         environment:
           NODE_NAME: node-102 # Node name
           CLUSTER_NODE_NETWORK_NAME: postgres_conf # (default: hostname of the node)
@@ -232,7 +232,7 @@ services:
     pgpool_conf:
         build:
             context: ../src
-            dockerfile: Pgpool-3.7-Postgres-10.2.Dockerfile
+            dockerfile: Pgpool-3.6-Postgres-10.Dockerfile
         environment:
             PCP_USER: pcp_user
             PCP_PASSWORD: pcp_pass
@@ -251,7 +251,7 @@ services:
     pgmaster2:
         build:
             context: ../src
-            dockerfile: Postgres-extended-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-extended-10-Repmgr-3.2.Dockerfile
         environment:
 
             NODE_ID: 1
@@ -272,7 +272,7 @@ services:
     pgpool2:
         build:
             context: ../src
-            dockerfile: Pgpool-3.7-Postgres-10.2.Dockerfile
+            dockerfile: Pgpool-3.6-Postgres-10.Dockerfile
         depends_on:
             - pgmaster
             - pgmaster2
diff --git a/docker-compose/postgres-extended-10.2_pgpool-3.3_barman-2.3.yml b/docker-compose/postgres-extended-10_pgpool-3.7_barman-2.3.yml
similarity index 91%
rename from docker-compose/postgres-extended-10.2_pgpool-3.3_barman-2.3.yml
rename to docker-compose/postgres-extended-10_pgpool-3.7_barman-2.3.yml
index e64896f9..54f86197 100644
--- a/docker-compose/postgres-extended-10.2_pgpool-3.3_barman-2.3.yml
+++ b/docker-compose/postgres-extended-10_pgpool-3.7_barman-2.3.yml
@@ -1,7 +1,7 @@
 
 ##########################################################################
 ##                         AUTO-GENERATED FILE                          ##
-##               BUILD_NUMBER=Fri Mar  9 17:48:14 +07 2018              ##
+##               BUILD_NUMBER=Sun Apr  8 00:03:15 CST 2018              ##
 ##########################################################################
 
 version: '2'
@@ -21,7 +21,7 @@ services:
     pgmaster:
         build:
             context: ../src
-            dockerfile: Postgres-extended-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-extended-10-Repmgr-3.2.Dockerfile
         environment:
             NODE_ID: 1 # Integer number of node (not required if can be extracted from NODE_NAME var, e.g. node-45 => 1045)
             NODE_NAME: node1 # Node name
@@ -59,7 +59,7 @@ services:
     pgslave1:
         build:
             context: ../src
-            dockerfile: Postgres-extended-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-extended-10-Repmgr-3.2.Dockerfile
         environment:
             NODE_ID: 2
             NODE_NAME: node2
@@ -83,7 +83,7 @@ services:
     pgslave2:
         build:
             context: ../src
-            dockerfile: Postgres-extended-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-extended-10-Repmgr-3.2.Dockerfile
         environment:
             NODE_ID: 3
             NODE_NAME: node3
@@ -106,7 +106,7 @@ services:
     pgslave3:
         build:
             context: ../src
-            dockerfile: Postgres-extended-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-extended-10-Repmgr-3.2.Dockerfile
         environment:
             NODE_ID: 4
             NODE_NAME: node4
@@ -130,7 +130,7 @@ services:
     pgslave4:
         build:
             context: ../src
-            dockerfile: Postgres-extended-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-extended-10-Repmgr-3.2.Dockerfile
         environment:
             NODE_ID: 5
             NODE_NAME: node5
@@ -152,7 +152,7 @@ services:
     backup:
         build:
             context: ../src
-            dockerfile: Barman-2.3-Postgres-10.2.Dockerfile
+            dockerfile: Barman-2.3-Postgres-10.Dockerfile
         environment:
             REPLICATION_USER: replication_user # default is replication_user
             REPLICATION_PASSWORD: replication_pass # default is replication_pass
@@ -171,7 +171,7 @@ services:
     pgpool:
         build:
             context: ../src
-            dockerfile: Pgpool-3.3-Postgres-10.2.Dockerfile
+            dockerfile: Pgpool-3.7-Postgres-10.Dockerfile
         environment:
             PCP_USER: pcp_user
             PCP_PASSWORD: pcp_pass
@@ -204,7 +204,7 @@ services:
     postgres_ext:
         build:
             context: ../src
-            dockerfile: Postgres-extended-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-extended-10-Repmgr-3.2.Dockerfile
         environment:
           NODE_ID: 101 
           NODE_NAME: node101 # Node name
@@ -218,7 +218,7 @@ services:
     postgres_conf:
         build:
           context: ../src/
-          dockerfile: Postgres-extended-10.2-Repmgr-3.2.Dockerfile
+          dockerfile: Postgres-extended-10-Repmgr-3.2.Dockerfile
         environment:
           NODE_NAME: node-102 # Node name
           CLUSTER_NODE_NETWORK_NAME: postgres_conf # (default: hostname of the node)
@@ -232,7 +232,7 @@ services:
     pgpool_conf:
         build:
             context: ../src
-            dockerfile: Pgpool-3.3-Postgres-10.2.Dockerfile
+            dockerfile: Pgpool-3.7-Postgres-10.Dockerfile
         environment:
             PCP_USER: pcp_user
             PCP_PASSWORD: pcp_pass
@@ -251,7 +251,7 @@ services:
     pgmaster2:
         build:
             context: ../src
-            dockerfile: Postgres-extended-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-extended-10-Repmgr-3.2.Dockerfile
         environment:
 
             NODE_ID: 1
@@ -272,7 +272,7 @@ services:
     pgpool2:
         build:
             context: ../src
-            dockerfile: Pgpool-3.3-Postgres-10.2.Dockerfile
+            dockerfile: Pgpool-3.7-Postgres-10.Dockerfile
         depends_on:
             - pgmaster
             - pgmaster2
diff --git a/docker-compose/postgres-extended-9.5_pgpool-3.3_barman-2.3.yml b/docker-compose/postgres-extended-9.5_pgpool-3.3_barman-2.3.yml
index 6def99de..5f3a5c6f 100644
--- a/docker-compose/postgres-extended-9.5_pgpool-3.3_barman-2.3.yml
+++ b/docker-compose/postgres-extended-9.5_pgpool-3.3_barman-2.3.yml
@@ -1,7 +1,7 @@
 
 ##########################################################################
 ##                         AUTO-GENERATED FILE                          ##
-##               BUILD_NUMBER=Fri Mar  9 17:48:14 +07 2018              ##
+##               BUILD_NUMBER=Sun Apr  8 00:03:15 CST 2018              ##
 ##########################################################################
 
 version: '2'
diff --git a/docker-compose/postgres-extended-9.5_pgpool-3.6_barman-2.3.yml b/docker-compose/postgres-extended-9.5_pgpool-3.6_barman-2.3.yml
index 5ca02d64..7b45d709 100644
--- a/docker-compose/postgres-extended-9.5_pgpool-3.6_barman-2.3.yml
+++ b/docker-compose/postgres-extended-9.5_pgpool-3.6_barman-2.3.yml
@@ -1,7 +1,7 @@
 
 ##########################################################################
 ##                         AUTO-GENERATED FILE                          ##
-##               BUILD_NUMBER=Fri Mar  9 17:48:14 +07 2018              ##
+##               BUILD_NUMBER=Sun Apr  8 00:03:15 CST 2018              ##
 ##########################################################################
 
 version: '2'
diff --git a/docker-compose/postgres-extended-9.5_pgpool-3.7_barman-2.3.yml b/docker-compose/postgres-extended-9.5_pgpool-3.7_barman-2.3.yml
index 07e78dd7..6dce959a 100644
--- a/docker-compose/postgres-extended-9.5_pgpool-3.7_barman-2.3.yml
+++ b/docker-compose/postgres-extended-9.5_pgpool-3.7_barman-2.3.yml
@@ -1,7 +1,7 @@
 
 ##########################################################################
 ##                         AUTO-GENERATED FILE                          ##
-##               BUILD_NUMBER=Fri Mar  9 17:48:14 +07 2018              ##
+##               BUILD_NUMBER=Sun Apr  8 00:03:15 CST 2018              ##
 ##########################################################################
 
 version: '2'
diff --git a/docker-compose/postgres-extended-9.6_pgpool-3.3_barman-2.3.yml b/docker-compose/postgres-extended-9.6_pgpool-3.3_barman-2.3.yml
index 7931b698..00e4f998 100644
--- a/docker-compose/postgres-extended-9.6_pgpool-3.3_barman-2.3.yml
+++ b/docker-compose/postgres-extended-9.6_pgpool-3.3_barman-2.3.yml
@@ -1,7 +1,7 @@
 
 ##########################################################################
 ##                         AUTO-GENERATED FILE                          ##
-##               BUILD_NUMBER=Fri Mar  9 17:48:14 +07 2018              ##
+##               BUILD_NUMBER=Sun Apr  8 00:03:15 CST 2018              ##
 ##########################################################################
 
 version: '2'
diff --git a/docker-compose/postgres-extended-9.6_pgpool-3.6_barman-2.3.yml b/docker-compose/postgres-extended-9.6_pgpool-3.6_barman-2.3.yml
index 0ac73979..86146b1e 100644
--- a/docker-compose/postgres-extended-9.6_pgpool-3.6_barman-2.3.yml
+++ b/docker-compose/postgres-extended-9.6_pgpool-3.6_barman-2.3.yml
@@ -1,7 +1,7 @@
 
 ##########################################################################
 ##                         AUTO-GENERATED FILE                          ##
-##               BUILD_NUMBER=Fri Mar  9 17:48:14 +07 2018              ##
+##               BUILD_NUMBER=Sun Apr  8 00:03:15 CST 2018              ##
 ##########################################################################
 
 version: '2'
diff --git a/docker-compose/postgres-extended-9.6_pgpool-3.7_barman-2.3.yml b/docker-compose/postgres-extended-9.6_pgpool-3.7_barman-2.3.yml
index 4f4be0dd..19f8dc58 100644
--- a/docker-compose/postgres-extended-9.6_pgpool-3.7_barman-2.3.yml
+++ b/docker-compose/postgres-extended-9.6_pgpool-3.7_barman-2.3.yml
@@ -1,7 +1,7 @@
 
 ##########################################################################
 ##                         AUTO-GENERATED FILE                          ##
-##               BUILD_NUMBER=Fri Mar  9 17:48:14 +07 2018              ##
+##               BUILD_NUMBER=Sun Apr  8 00:03:15 CST 2018              ##
 ##########################################################################
 
 version: '2'
diff --git a/make/barman/make.sh b/make/barman/make.sh
index 18335ca3..6d7e2518 100644
--- a/make/barman/make.sh
+++ b/make/barman/make.sh
@@ -1,11 +1,13 @@
 echo ">>> Making barman"
 
-for VALS in "BARMAN_VERSION=2.3 BARMAN_PACKAGE_VERSION=2.3-2.pgdg80+1 PG_CLIENT_MAJOR_VERSION=9.6 PG_CLIENT_VERSION=9.6 PG_CLIENT_PACKAGE_VERSION=9.6.7-1.pgdg80+1" \
-            "BARMAN_VERSION=2.3 BARMAN_PACKAGE_VERSION=2.3-2.pgdg80+1 PG_CLIENT_MAJOR_VERSION=10.2 PG_CLIENT_VERSION=10 PG_CLIENT_PACKAGE_VERSION=10.2-1.pgdg80+1"; do
+for VALS in "BARMAN_VERSION=2.3 BARMAN_PACKAGE_VERSION=2.3-2.pgdg80+1"; do
     eval $VALS
-    
-    FILE_FROM="./src/includes/dockerfile/Barman-$BARMAN_VERSION.part.Dockerfile"
-    FILE_TO="./src/Barman-$BARMAN_VERSION-Postgres-$PG_CLIENT_MAJOR_VERSION.Dockerfile"
-    
-    template $FILE_FROM $FILE_TO $VALS
+
+    for PG_CLIENT_VERSION in 9.6 10; do
+        VALS="BARMAN_VERSION=$BARMAN_VERSION BARMAN_PACKAGE_VERSION=$BARMAN_PACKAGE_VERSION PG_CLIENT_VERSION=$PG_CLIENT_VERSION PG_CLIENT_LATEST=1"
+        FILE_FROM="./src/includes/dockerfile/Barman-$BARMAN_VERSION.part.Dockerfile"
+        FILE_TO="./src/Barman-$BARMAN_VERSION-Postgres-$PG_CLIENT_VERSION.Dockerfile"
+        
+        template $FILE_FROM $FILE_TO $VALS
+    done
 done
diff --git a/make/docker-compose/make.sh b/make/docker-compose/make.sh
index a2ffbb3f..5b17c223 100644
--- a/make/docker-compose/make.sh
+++ b/make/docker-compose/make.sh
@@ -1,7 +1,7 @@
 echo ">>> Making docker-compose"
 
 FILE_FROM='./src/includes/docker-compose/docker-compose.yml'
-for POSTGRES_VERSION in 9.5 9.6 10.2; do
+for POSTGRES_VERSION in 9.5 9.6 10; do
     for POSTGRES_EXTENDED in '' '1'; do
         for REPMGR_VERSION in 3.2; do
             for PGPOOL_VERSION in 3.3 3.6 3.7; do
@@ -26,4 +26,4 @@ for POSTGRES_VERSION in 9.5 9.6 10.2; do
             done
         done
     done
-done
\ No newline at end of file
+done
diff --git a/make/pgpool/make.sh b/make/pgpool/make.sh
index 9519bfba..8556201a 100644
--- a/make/pgpool/make.sh
+++ b/make/pgpool/make.sh
@@ -1,15 +1,16 @@
 echo ">>> Making pgpool"
 
-for VALS in "PGPOOL_VERSION=3.3 PGPOOL_PACKAGE_VERSION=3.3.4-1.pgdg70+1 PG_CLIENT_MAJOR_VERSION=9.6 PG_CLIENT_VERSION=9.6 PG_CLIENT_PACKAGE_VERSION=9.6.7-1.pgdg80+1" \
-            "PGPOOL_VERSION=3.3 PGPOOL_PACKAGE_VERSION=3.3.4-1.pgdg70+1 PG_CLIENT_MAJOR_VERSION=10.2 PG_CLIENT_VERSION=10 PG_CLIENT_PACKAGE_VERSION=10.2-1.pgdg80+1" \
-            "PGPOOL_VERSION=3.6 PGPOOL_PACKAGE_VERSION=3.6.7-1.pgdg90+1 PG_CLIENT_MAJOR_VERSION=9.6 PG_CLIENT_VERSION=9.6 PG_CLIENT_PACKAGE_VERSION=9.6.7-1.pgdg80+1" \
-            "PGPOOL_VERSION=3.6 PGPOOL_PACKAGE_VERSION=3.6.7-1.pgdg90+1 PG_CLIENT_MAJOR_VERSION=10.2 PG_CLIENT_VERSION=10 PG_CLIENT_PACKAGE_VERSION=10.2-1.pgdg80+1" \
-            "PGPOOL_LATEST=1 PGPOOL_VERSION=3.7 PGPOOL_PACKAGE_VERSION=3.7 PG_CLIENT_MAJOR_VERSION=9.6 PG_CLIENT_VERSION=9.6 PG_CLIENT_PACKAGE_VERSION=9.6.7-1.pgdg80+1" \
-            "PGPOOL_LATEST=1 PGPOOL_VERSION=3.7 PGPOOL_PACKAGE_VERSION=3.7 PG_CLIENT_MAJOR_VERSION=10.2 PG_CLIENT_VERSION=10 PG_CLIENT_PACKAGE_VERSION=10.2-1.pgdg80+1";  do
+for VALS in "PGPOOL_VERSION=3.3 PGPOOL_PACKAGE_VERSION=3.3.4-1.pgdg70+1" \
+            "PGPOOL_VERSION=3.6 PGPOOL_PACKAGE_VERSION=3.6.7-1.pgdg80+1" \
+            "PGPOOL_VERSION=3.7 PGPOOL_LATEST=1";  do
     eval $VALS
     
-    FILE_FROM="./src/includes/dockerfile/Pgpool-$PGPOOL_VERSION.part.Dockerfile"
-    FILE_TO="./src/Pgpool-$PGPOOL_VERSION-Postgres-$PG_CLIENT_MAJOR_VERSION.Dockerfile"
-    
-    template $FILE_FROM $FILE_TO $VALS
-done
\ No newline at end of file
+    for PG_CLIENT_VERSION in 9.6 10; do
+        VALS="$VALS PG_CLIENT_VERSION=$PG_CLIENT_VERSION PG_CLIENT_LATEST=1"
+
+        FILE_FROM="./src/includes/dockerfile/Pgpool-$PGPOOL_VERSION.part.Dockerfile"
+        FILE_TO="./src/Pgpool-$PGPOOL_VERSION-Postgres-$PG_CLIENT_VERSION.Dockerfile"
+        
+        template $FILE_FROM $FILE_TO $VALS
+    done
+done
diff --git a/make/postgres/make.sh b/make/postgres/make.sh
index dd8c0c89..49933006 100644
--- a/make/postgres/make.sh
+++ b/make/postgres/make.sh
@@ -1,6 +1,6 @@
 echo ">>> Making postgres"
 
-for POSTGRES_VERSION in 9.5 9.6 10.2; do
+for POSTGRES_VERSION in 9.5 9.6 10; do
     for REPMGR_VERSION in 3.2; do
         FILE_FROM="./src/includes/dockerfile/Postgres-$POSTGRES_VERSION-Repmgr-$REPMGR_VERSION.part.Dockerfile"
         FILE_FROM_EXT="./src/includes/dockerfile/Postgres-extended-$POSTGRES_VERSION-Repmgr-$REPMGR_VERSION.part.Dockerfile"
@@ -15,4 +15,4 @@ for POSTGRES_VERSION in 9.5 9.6 10.2; do
         template $FILE_FROM $FILE_TO_EXT $VALS
         template $FILE_FROM_EXT $FILE_TO_EXT
     done
-done
\ No newline at end of file
+done
diff --git a/src/Barman-2.3-Postgres-10.2.Dockerfile b/src/Barman-2.3-Postgres-10.Dockerfile
similarity index 88%
rename from src/Barman-2.3-Postgres-10.2.Dockerfile
rename to src/Barman-2.3-Postgres-10.Dockerfile
index aeb901cf..5d6f1f3d 100644
--- a/src/Barman-2.3-Postgres-10.2.Dockerfile
+++ b/src/Barman-2.3-Postgres-10.Dockerfile
@@ -1,7 +1,7 @@
 
 ##########################################################################
 ##                         AUTO-GENERATED FILE                          ##
-##               BUILD_NUMBER=Fri Mar  9 17:48:14 +07 2018              ##
+##               BUILD_NUMBER=Sun Apr  8 00:03:15 CST 2018              ##
 ##########################################################################
 
 FROM golang:1.8-jessie
@@ -24,12 +24,9 @@ RUN  wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O - | apt-key a
      apt-get update && \
      apt-get install -y libffi-dev libssl-dev openssh-server
 
+RUN  apt-get install -y postgresql-client-10
 
-RUN TEMP_DEB="$(mktemp)" && \
-    wget -O "$TEMP_DEB"  "http://atalia.postgresql.org/morgue/p/postgresql-10/postgresql-client-10_10.2-1.pgdg80+1_amd64.deb" && \
-    (dpkg -i "$TEMP_DEB" || apt-get install -y -f) && rm -f "$TEMP_DEB"
-
-RUN  apt-get install -y barman=2.3-2.pgdg80+1
+RUN  apt-get install -y barman=2.3\*
 
 RUN apt-get -y install cron
 ADD barman/crontab /etc/cron.d/barman
diff --git a/src/Barman-2.3-Postgres-9.6.Dockerfile b/src/Barman-2.3-Postgres-9.6.Dockerfile
index e87d8952..0afa603b 100644
--- a/src/Barman-2.3-Postgres-9.6.Dockerfile
+++ b/src/Barman-2.3-Postgres-9.6.Dockerfile
@@ -1,7 +1,7 @@
 
 ##########################################################################
 ##                         AUTO-GENERATED FILE                          ##
-##               BUILD_NUMBER=Fri Mar  9 17:48:14 +07 2018              ##
+##               BUILD_NUMBER=Sun Apr  8 00:03:15 CST 2018              ##
 ##########################################################################
 
 FROM golang:1.8-jessie
@@ -24,12 +24,9 @@ RUN  wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O - | apt-key a
      apt-get update && \
      apt-get install -y libffi-dev libssl-dev openssh-server
 
+RUN  apt-get install -y postgresql-client-9.6
 
-RUN TEMP_DEB="$(mktemp)" && \
-    wget -O "$TEMP_DEB"  "http://atalia.postgresql.org/morgue/p/postgresql-9.6/postgresql-client-9.6_9.6.7-1.pgdg80+1_amd64.deb" && \
-    (dpkg -i "$TEMP_DEB" || apt-get install -y -f) && rm -f "$TEMP_DEB"
-
-RUN  apt-get install -y barman=2.3-2.pgdg80+1
+RUN  apt-get install -y barman=2.3\*
 
 RUN apt-get -y install cron
 ADD barman/crontab /etc/cron.d/barman
diff --git a/src/Barman-latest.Dockerfile b/src/Barman-latest.Dockerfile
index d3d297b8..c8e37e87 120000
--- a/src/Barman-latest.Dockerfile
+++ b/src/Barman-latest.Dockerfile
@@ -1 +1 @@
-Barman-2.3-Postgres-10.2.Dockerfile
\ No newline at end of file
+Barman-2.3-Postgres-10.Dockerfile
\ No newline at end of file
diff --git a/src/Pgpool-3.7-Postgres-10.2.Dockerfile b/src/Pgpool-3.3-Postgres-10.Dockerfile
similarity index 89%
rename from src/Pgpool-3.7-Postgres-10.2.Dockerfile
rename to src/Pgpool-3.3-Postgres-10.Dockerfile
index 730d929a..b15a0936 100644
--- a/src/Pgpool-3.7-Postgres-10.2.Dockerfile
+++ b/src/Pgpool-3.3-Postgres-10.Dockerfile
@@ -1,7 +1,7 @@
 
 ##########################################################################
 ##                         AUTO-GENERATED FILE                          ##
-##               BUILD_NUMBER=Fri Mar  9 17:48:14 +07 2018              ##
+##               BUILD_NUMBER=Sun Apr  8 00:03:15 CST 2018              ##
 ##########################################################################
 
 FROM debian:jessie
@@ -28,13 +28,13 @@ RUN  wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O - | apt-key a
 
 RUN  apt-get install -y libffi-dev libssl-dev openssh-server
 
+RUN  apt-get install -y postgresql-client-10
+
 
 RUN TEMP_DEB="$(mktemp)" && \
-    wget -O "$TEMP_DEB"  "http://atalia.postgresql.org/morgue/p/postgresql-10/postgresql-client-10_10.2-1.pgdg80+1_amd64.deb" && \
+    wget -O "$TEMP_DEB" "http://atalia.postgresql.org/morgue/p/pgpool2/pgpool2_3.3.4-1.pgdg70+1_amd64.deb" && \
     (dpkg -i "$TEMP_DEB" || apt-get install -y -f) && rm -f "$TEMP_DEB"
 
-RUN  apt-get install -y libpgpool0=3.7\* pgpool2=3.7\* 
-
 RUN  wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && \
      tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
 
@@ -65,4 +65,4 @@ EXPOSE 9898
 HEALTHCHECK --interval=1m --timeout=10s --retries=5 \
   CMD /usr/local/bin/pgpool/has_write_node.sh
 
-CMD ["/usr/local/bin/pgpool/entrypoint.sh"]
\ No newline at end of file
+CMD ["/usr/local/bin/pgpool/entrypoint.sh"]
diff --git a/src/Pgpool-3.3-Postgres-9.6.Dockerfile b/src/Pgpool-3.3-Postgres-9.6.Dockerfile
index 48d1badf..afb34a00 100644
--- a/src/Pgpool-3.3-Postgres-9.6.Dockerfile
+++ b/src/Pgpool-3.3-Postgres-9.6.Dockerfile
@@ -1,7 +1,7 @@
 
 ##########################################################################
 ##                         AUTO-GENERATED FILE                          ##
-##               BUILD_NUMBER=Fri Mar  9 17:48:14 +07 2018              ##
+##               BUILD_NUMBER=Sun Apr  8 00:03:15 CST 2018              ##
 ##########################################################################
 
 FROM debian:jessie
@@ -28,10 +28,7 @@ RUN  wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O - | apt-key a
 
 RUN  apt-get install -y libffi-dev libssl-dev openssh-server
 
-
-RUN TEMP_DEB="$(mktemp)" && \
-    wget -O "$TEMP_DEB"  "http://atalia.postgresql.org/morgue/p/postgresql-9.6/postgresql-client-9.6_9.6.7-1.pgdg80+1_amd64.deb" && \
-    (dpkg -i "$TEMP_DEB" || apt-get install -y -f) && rm -f "$TEMP_DEB"
+RUN  apt-get install -y postgresql-client-9.6
 
 
 RUN TEMP_DEB="$(mktemp)" && \
@@ -68,4 +65,4 @@ EXPOSE 9898
 HEALTHCHECK --interval=1m --timeout=10s --retries=5 \
   CMD /usr/local/bin/pgpool/has_write_node.sh
 
-CMD ["/usr/local/bin/pgpool/entrypoint.sh"]
\ No newline at end of file
+CMD ["/usr/local/bin/pgpool/entrypoint.sh"]
diff --git a/src/Pgpool-3.3-Postgres-10.2.Dockerfile b/src/Pgpool-3.6-Postgres-10.Dockerfile
similarity index 87%
rename from src/Pgpool-3.3-Postgres-10.2.Dockerfile
rename to src/Pgpool-3.6-Postgres-10.Dockerfile
index 2f8b963a..e63cef08 100644
--- a/src/Pgpool-3.3-Postgres-10.2.Dockerfile
+++ b/src/Pgpool-3.6-Postgres-10.Dockerfile
@@ -1,7 +1,7 @@
 
 ##########################################################################
 ##                         AUTO-GENERATED FILE                          ##
-##               BUILD_NUMBER=Fri Mar  9 17:48:14 +07 2018              ##
+##               BUILD_NUMBER=Sun Apr  8 00:03:15 CST 2018              ##
 ##########################################################################
 
 FROM debian:jessie
@@ -28,14 +28,11 @@ RUN  wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O - | apt-key a
 
 RUN  apt-get install -y libffi-dev libssl-dev openssh-server
 
-
-RUN TEMP_DEB="$(mktemp)" && \
-    wget -O "$TEMP_DEB"  "http://atalia.postgresql.org/morgue/p/postgresql-10/postgresql-client-10_10.2-1.pgdg80+1_amd64.deb" && \
-    (dpkg -i "$TEMP_DEB" || apt-get install -y -f) && rm -f "$TEMP_DEB"
+RUN  apt-get install -y postgresql-client-10
 
 
 RUN TEMP_DEB="$(mktemp)" && \
-    wget -O "$TEMP_DEB" "http://atalia.postgresql.org/morgue/p/pgpool2/pgpool2_3.3.4-1.pgdg70+1_amd64.deb" && \
+    wget -O "$TEMP_DEB" "http://atalia.postgresql.org/morgue/p/pgpool2/pgpool2_3.6.7-1.pgdg80+1_amd64.deb" && \
     (dpkg -i "$TEMP_DEB" || apt-get install -y -f) && rm -f "$TEMP_DEB"
 
 RUN  wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && \
@@ -68,4 +65,4 @@ EXPOSE 9898
 HEALTHCHECK --interval=1m --timeout=10s --retries=5 \
   CMD /usr/local/bin/pgpool/has_write_node.sh
 
-CMD ["/usr/local/bin/pgpool/entrypoint.sh"]
\ No newline at end of file
+CMD ["/usr/local/bin/pgpool/entrypoint.sh"]
diff --git a/src/Pgpool-3.6-Postgres-9.6.Dockerfile b/src/Pgpool-3.6-Postgres-9.6.Dockerfile
index 44031141..49db58ae 100644
--- a/src/Pgpool-3.6-Postgres-9.6.Dockerfile
+++ b/src/Pgpool-3.6-Postgres-9.6.Dockerfile
@@ -1,7 +1,7 @@
 
 ##########################################################################
 ##                         AUTO-GENERATED FILE                          ##
-##               BUILD_NUMBER=Fri Mar  9 17:48:14 +07 2018              ##
+##               BUILD_NUMBER=Sun Apr  8 00:03:15 CST 2018              ##
 ##########################################################################
 
 FROM debian:jessie
@@ -28,14 +28,11 @@ RUN  wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O - | apt-key a
 
 RUN  apt-get install -y libffi-dev libssl-dev openssh-server
 
-
-RUN TEMP_DEB="$(mktemp)" && \
-    wget -O "$TEMP_DEB"  "http://atalia.postgresql.org/morgue/p/postgresql-9.6/postgresql-client-9.6_9.6.7-1.pgdg80+1_amd64.deb" && \
-    (dpkg -i "$TEMP_DEB" || apt-get install -y -f) && rm -f "$TEMP_DEB"
+RUN  apt-get install -y postgresql-client-9.6
 
 
 RUN TEMP_DEB="$(mktemp)" && \
-    wget -O "$TEMP_DEB" "http://atalia.postgresql.org/morgue/p/pgpool2/pgpool2_3.6.7-1.pgdg90+1_amd64.deb" && \
+    wget -O "$TEMP_DEB" "http://atalia.postgresql.org/morgue/p/pgpool2/pgpool2_3.6.7-1.pgdg80+1_amd64.deb" && \
     (dpkg -i "$TEMP_DEB" || apt-get install -y -f) && rm -f "$TEMP_DEB"
 
 RUN  wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && \
@@ -68,4 +65,4 @@ EXPOSE 9898
 HEALTHCHECK --interval=1m --timeout=10s --retries=5 \
   CMD /usr/local/bin/pgpool/has_write_node.sh
 
-CMD ["/usr/local/bin/pgpool/entrypoint.sh"]
\ No newline at end of file
+CMD ["/usr/local/bin/pgpool/entrypoint.sh"]
diff --git a/src/Pgpool-3.6-Postgres-10.2.Dockerfile b/src/Pgpool-3.7-Postgres-10.Dockerfile
similarity index 81%
rename from src/Pgpool-3.6-Postgres-10.2.Dockerfile
rename to src/Pgpool-3.7-Postgres-10.Dockerfile
index e46b4e41..d354e3ab 100644
--- a/src/Pgpool-3.6-Postgres-10.2.Dockerfile
+++ b/src/Pgpool-3.7-Postgres-10.Dockerfile
@@ -1,7 +1,7 @@
 
 ##########################################################################
 ##                         AUTO-GENERATED FILE                          ##
-##               BUILD_NUMBER=Fri Mar  9 17:48:14 +07 2018              ##
+##               BUILD_NUMBER=Sun Apr  8 00:03:15 CST 2018              ##
 ##########################################################################
 
 FROM debian:jessie
@@ -28,15 +28,9 @@ RUN  wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O - | apt-key a
 
 RUN  apt-get install -y libffi-dev libssl-dev openssh-server
 
+RUN  apt-get install -y postgresql-client-10
 
-RUN TEMP_DEB="$(mktemp)" && \
-    wget -O "$TEMP_DEB"  "http://atalia.postgresql.org/morgue/p/postgresql-10/postgresql-client-10_10.2-1.pgdg80+1_amd64.deb" && \
-    (dpkg -i "$TEMP_DEB" || apt-get install -y -f) && rm -f "$TEMP_DEB"
-
-
-RUN TEMP_DEB="$(mktemp)" && \
-    wget -O "$TEMP_DEB" "http://atalia.postgresql.org/morgue/p/pgpool2/pgpool2_3.6.7-1.pgdg90+1_amd64.deb" && \
-    (dpkg -i "$TEMP_DEB" || apt-get install -y -f) && rm -f "$TEMP_DEB"
+RUN  apt-get install -y libpgpool0=3.7\* pgpool2=3.7\*
 
 RUN  wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && \
      tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
@@ -68,4 +62,4 @@ EXPOSE 9898
 HEALTHCHECK --interval=1m --timeout=10s --retries=5 \
   CMD /usr/local/bin/pgpool/has_write_node.sh
 
-CMD ["/usr/local/bin/pgpool/entrypoint.sh"]
\ No newline at end of file
+CMD ["/usr/local/bin/pgpool/entrypoint.sh"]
diff --git a/src/Pgpool-3.7-Postgres-9.6.Dockerfile b/src/Pgpool-3.7-Postgres-9.6.Dockerfile
index 71b0fab1..09afea8e 100644
--- a/src/Pgpool-3.7-Postgres-9.6.Dockerfile
+++ b/src/Pgpool-3.7-Postgres-9.6.Dockerfile
@@ -1,7 +1,7 @@
 
 ##########################################################################
 ##                         AUTO-GENERATED FILE                          ##
-##               BUILD_NUMBER=Fri Mar  9 17:48:14 +07 2018              ##
+##               BUILD_NUMBER=Sun Apr  8 00:03:15 CST 2018              ##
 ##########################################################################
 
 FROM debian:jessie
@@ -28,12 +28,9 @@ RUN  wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O - | apt-key a
 
 RUN  apt-get install -y libffi-dev libssl-dev openssh-server
 
+RUN  apt-get install -y postgresql-client-9.6
 
-RUN TEMP_DEB="$(mktemp)" && \
-    wget -O "$TEMP_DEB"  "http://atalia.postgresql.org/morgue/p/postgresql-9.6/postgresql-client-9.6_9.6.7-1.pgdg80+1_amd64.deb" && \
-    (dpkg -i "$TEMP_DEB" || apt-get install -y -f) && rm -f "$TEMP_DEB"
-
-RUN  apt-get install -y libpgpool0=3.7\* pgpool2=3.7\* 
+RUN  apt-get install -y libpgpool0=3.7\* pgpool2=3.7\*
 
 RUN  wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && \
      tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
@@ -65,4 +62,4 @@ EXPOSE 9898
 HEALTHCHECK --interval=1m --timeout=10s --retries=5 \
   CMD /usr/local/bin/pgpool/has_write_node.sh
 
-CMD ["/usr/local/bin/pgpool/entrypoint.sh"]
\ No newline at end of file
+CMD ["/usr/local/bin/pgpool/entrypoint.sh"]
diff --git a/src/Pgpool-latest.Dockerfile b/src/Pgpool-latest.Dockerfile
index 6194941d..5953a862 120000
--- a/src/Pgpool-latest.Dockerfile
+++ b/src/Pgpool-latest.Dockerfile
@@ -1 +1 @@
-Pgpool-3.7-Postgres-10.2.Dockerfile
\ No newline at end of file
+Pgpool-3.7-Postgres-10.Dockerfile
\ No newline at end of file
diff --git a/src/Postgres-10.2-Repmgr-3.2.Dockerfile b/src/Postgres-10-Repmgr-3.2.Dockerfile
similarity index 98%
rename from src/Postgres-10.2-Repmgr-3.2.Dockerfile
rename to src/Postgres-10-Repmgr-3.2.Dockerfile
index 0a65edc6..409162a8 100644
--- a/src/Postgres-10.2-Repmgr-3.2.Dockerfile
+++ b/src/Postgres-10-Repmgr-3.2.Dockerfile
@@ -1,10 +1,10 @@
 
 ##########################################################################
 ##                         AUTO-GENERATED FILE                          ##
-##               BUILD_NUMBER=Fri Mar  9 17:48:14 +07 2018              ##
+##               BUILD_NUMBER=Sun Apr  8 00:03:15 CST 2018              ##
 ##########################################################################
 
-FROM postgres:10.2
+FROM postgres:10
 
 RUN apt-get update --fix-missing && \
     apt-get install -y postgresql-server-dev-$PG_MAJOR wget openssh-server barman-cli
diff --git a/src/Postgres-9.5-Repmgr-3.2.Dockerfile b/src/Postgres-9.5-Repmgr-3.2.Dockerfile
index 303a172b..65950e33 100644
--- a/src/Postgres-9.5-Repmgr-3.2.Dockerfile
+++ b/src/Postgres-9.5-Repmgr-3.2.Dockerfile
@@ -1,7 +1,7 @@
 
 ##########################################################################
 ##                         AUTO-GENERATED FILE                          ##
-##               BUILD_NUMBER=Fri Mar  9 17:48:14 +07 2018              ##
+##               BUILD_NUMBER=Sun Apr  8 00:03:15 CST 2018              ##
 ##########################################################################
 
 FROM postgres:9.5
diff --git a/src/Postgres-9.6-Repmgr-3.2.Dockerfile b/src/Postgres-9.6-Repmgr-3.2.Dockerfile
index ac68ad4c..94edc788 100644
--- a/src/Postgres-9.6-Repmgr-3.2.Dockerfile
+++ b/src/Postgres-9.6-Repmgr-3.2.Dockerfile
@@ -1,7 +1,7 @@
 
 ##########################################################################
 ##                         AUTO-GENERATED FILE                          ##
-##               BUILD_NUMBER=Fri Mar  9 17:48:14 +07 2018              ##
+##               BUILD_NUMBER=Sun Apr  8 00:03:15 CST 2018              ##
 ##########################################################################
 
 FROM postgres:9.6
diff --git a/src/Postgres-extended-10.2-Repmgr-3.2.Dockerfile b/src/Postgres-extended-10-Repmgr-3.2.Dockerfile
similarity index 98%
rename from src/Postgres-extended-10.2-Repmgr-3.2.Dockerfile
rename to src/Postgres-extended-10-Repmgr-3.2.Dockerfile
index e0b9f5d1..40c9b79f 100644
--- a/src/Postgres-extended-10.2-Repmgr-3.2.Dockerfile
+++ b/src/Postgres-extended-10-Repmgr-3.2.Dockerfile
@@ -1,10 +1,10 @@
 
 ##########################################################################
 ##                         AUTO-GENERATED FILE                          ##
-##               BUILD_NUMBER=Fri Mar  9 17:48:14 +07 2018              ##
+##               BUILD_NUMBER=Sun Apr  8 00:03:15 CST 2018              ##
 ##########################################################################
 
-FROM postgres:10.2
+FROM postgres:10
 
 RUN apt-get update --fix-missing && \
     apt-get install -y postgresql-server-dev-$PG_MAJOR wget openssh-server barman-cli
diff --git a/src/Postgres-extended-9.5-Repmgr-3.2.Dockerfile b/src/Postgres-extended-9.5-Repmgr-3.2.Dockerfile
index 14afd4d8..579816d4 100644
--- a/src/Postgres-extended-9.5-Repmgr-3.2.Dockerfile
+++ b/src/Postgres-extended-9.5-Repmgr-3.2.Dockerfile
@@ -1,7 +1,7 @@
 
 ##########################################################################
 ##                         AUTO-GENERATED FILE                          ##
-##               BUILD_NUMBER=Fri Mar  9 17:48:14 +07 2018              ##
+##               BUILD_NUMBER=Sun Apr  8 00:03:15 CST 2018              ##
 ##########################################################################
 
 FROM postgres:9.5
diff --git a/src/Postgres-extended-9.6-Repmgr-3.2.Dockerfile b/src/Postgres-extended-9.6-Repmgr-3.2.Dockerfile
index c40f5c89..74d8510e 100644
--- a/src/Postgres-extended-9.6-Repmgr-3.2.Dockerfile
+++ b/src/Postgres-extended-9.6-Repmgr-3.2.Dockerfile
@@ -1,7 +1,7 @@
 
 ##########################################################################
 ##                         AUTO-GENERATED FILE                          ##
-##               BUILD_NUMBER=Fri Mar  9 17:48:14 +07 2018              ##
+##               BUILD_NUMBER=Sun Apr  8 00:03:15 CST 2018              ##
 ##########################################################################
 
 FROM postgres:9.6
diff --git a/src/Postgres-extended-latest.Dockerfile b/src/Postgres-extended-latest.Dockerfile
index 7b1574e0..6327ace3 120000
--- a/src/Postgres-extended-latest.Dockerfile
+++ b/src/Postgres-extended-latest.Dockerfile
@@ -1 +1 @@
-Postgres-10.2-Repmgr-3.2.Dockerfile
\ No newline at end of file
+Postgres-extended-10-Repmgr-3.2.Dockerfile
\ No newline at end of file
diff --git a/src/Postgres-latest.Dockerfile b/src/Postgres-latest.Dockerfile
index 7b1574e0..bf87c711 120000
--- a/src/Postgres-latest.Dockerfile
+++ b/src/Postgres-latest.Dockerfile
@@ -1 +1 @@
-Postgres-10.2-Repmgr-3.2.Dockerfile
\ No newline at end of file
+Postgres-10-Repmgr-3.2.Dockerfile
\ No newline at end of file
diff --git a/src/includes/dockerfile/Barman-2.3.part.Dockerfile b/src/includes/dockerfile/Barman-2.3.part.Dockerfile
index ab703146..a41492b6 100644
--- a/src/includes/dockerfile/Barman-2.3.part.Dockerfile
+++ b/src/includes/dockerfile/Barman-2.3.part.Dockerfile
@@ -19,14 +19,14 @@ RUN  wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O - | apt-key a
      apt-get install -y libffi-dev libssl-dev openssh-server
 
 {{ #PG_CLIENT_LATEST }}
-RUN  apt-get install -y postgresql-client-{{ PG_CLIENT_VERSION }}={{ PG_CLIENT_PACKAGE_VERSION }}\* 
+RUN  apt-get install -y postgresql-client-{{ PG_CLIENT_VERSION }}
 {{ /PG_CLIENT_LATEST }}{{ ^PG_CLIENT_LATEST }}
 RUN TEMP_DEB="$(mktemp)" && \
     wget -O "$TEMP_DEB"  "http://atalia.postgresql.org/morgue/p/postgresql-{{ PG_CLIENT_VERSION }}/postgresql-client-{{ PG_CLIENT_VERSION }}_{{ PG_CLIENT_PACKAGE_VERSION }}_amd64.deb" && \
     (dpkg -i "$TEMP_DEB" || apt-get install -y -f) && rm -f "$TEMP_DEB"
 {{ /PG_CLIENT_LATEST }}
 
-RUN  apt-get install -y barman={{ BARMAN_PACKAGE_VERSION }}
+RUN  apt-get install -y barman={{ BARMAN_VERSION }}\*
 
 RUN apt-get -y install cron
 ADD barman/crontab /etc/cron.d/barman
diff --git a/src/includes/dockerfile/Pgpool-3.3-3.7.part.Dockerfile b/src/includes/dockerfile/Pgpool-3.3-3.7.part.Dockerfile
index 20c8b128..d56afe47 100644
--- a/src/includes/dockerfile/Pgpool-3.3-3.7.part.Dockerfile
+++ b/src/includes/dockerfile/Pgpool-3.3-3.7.part.Dockerfile
@@ -23,7 +23,7 @@ RUN  wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O - | apt-key a
 RUN  apt-get install -y libffi-dev libssl-dev openssh-server
 
 {{ #PG_CLIENT_LATEST }}
-RUN  apt-get install -y postgresql-client-{{ PG_CLIENT_VERSION }}={{ PG_CLIENT_PACKAGE_VERSION }}\* 
+RUN  apt-get install -y postgresql-client-{{ PG_CLIENT_VERSION }}
 {{ /PG_CLIENT_LATEST }}{{ ^PG_CLIENT_LATEST }}
 RUN TEMP_DEB="$(mktemp)" && \
     wget -O "$TEMP_DEB"  "http://atalia.postgresql.org/morgue/p/postgresql-{{ PG_CLIENT_VERSION }}/postgresql-client-{{ PG_CLIENT_VERSION }}_{{ PG_CLIENT_PACKAGE_VERSION }}_amd64.deb" && \
@@ -31,7 +31,7 @@ RUN TEMP_DEB="$(mktemp)" && \
 {{ /PG_CLIENT_LATEST }}
 
 {{ #PGPOOL_LATEST }}
-RUN  apt-get install -y libpgpool0={{ PGPOOL_PACKAGE_VERSION }}\* pgpool2={{ PGPOOL_PACKAGE_VERSION }}\* 
+RUN  apt-get install -y libpgpool0={{ PGPOOL_VERSION }}\* pgpool2={{ PGPOOL_VERSION }}\*
 {{ /PGPOOL_LATEST }}{{ ^PGPOOL_LATEST }}
 RUN TEMP_DEB="$(mktemp)" && \
     wget -O "$TEMP_DEB" "http://atalia.postgresql.org/morgue/p/pgpool2/pgpool2_{{ PGPOOL_PACKAGE_VERSION }}_amd64.deb" && \
@@ -68,4 +68,4 @@ EXPOSE 9898
 HEALTHCHECK --interval=1m --timeout=10s --retries=5 \
   CMD /usr/local/bin/pgpool/has_write_node.sh
 
-CMD ["/usr/local/bin/pgpool/entrypoint.sh"]
\ No newline at end of file
+CMD ["/usr/local/bin/pgpool/entrypoint.sh"]
diff --git a/src/includes/dockerfile/Postgres-10-Repmgr-3.2.part.Dockerfile b/src/includes/dockerfile/Postgres-10-Repmgr-3.2.part.Dockerfile
new file mode 120000
index 00000000..e926e33f
--- /dev/null
+++ b/src/includes/dockerfile/Postgres-10-Repmgr-3.2.part.Dockerfile
@@ -0,0 +1 @@
+Postgres-9.5-10-Repmgr-3.2.part.Dockerfile
\ No newline at end of file
diff --git a/src/includes/dockerfile/Postgres-10.2-Repmgr-3.2.part.Dockerfile b/src/includes/dockerfile/Postgres-10.2-Repmgr-3.2.part.Dockerfile
deleted file mode 120000
index d8e31672..00000000
--- a/src/includes/dockerfile/Postgres-10.2-Repmgr-3.2.part.Dockerfile
+++ /dev/null
@@ -1 +0,0 @@
-Postgres-9.5-10.2-Repmgr-3.2.part.Dockerfile
\ No newline at end of file
diff --git a/src/includes/dockerfile/Postgres-9.5-10.2-Repmgr-3.2.part.Dockerfile b/src/includes/dockerfile/Postgres-9.5-10-Repmgr-3.2.part.Dockerfile
similarity index 100%
rename from src/includes/dockerfile/Postgres-9.5-10.2-Repmgr-3.2.part.Dockerfile
rename to src/includes/dockerfile/Postgres-9.5-10-Repmgr-3.2.part.Dockerfile
diff --git a/src/includes/dockerfile/Postgres-9.5-Repmgr-3.2.part.Dockerfile b/src/includes/dockerfile/Postgres-9.5-Repmgr-3.2.part.Dockerfile
index d8e31672..e926e33f 120000
--- a/src/includes/dockerfile/Postgres-9.5-Repmgr-3.2.part.Dockerfile
+++ b/src/includes/dockerfile/Postgres-9.5-Repmgr-3.2.part.Dockerfile
@@ -1 +1 @@
-Postgres-9.5-10.2-Repmgr-3.2.part.Dockerfile
\ No newline at end of file
+Postgres-9.5-10-Repmgr-3.2.part.Dockerfile
\ No newline at end of file
diff --git a/src/includes/dockerfile/Postgres-9.6-Repmgr-3.2.part.Dockerfile b/src/includes/dockerfile/Postgres-9.6-Repmgr-3.2.part.Dockerfile
index d8e31672..e926e33f 120000
--- a/src/includes/dockerfile/Postgres-9.6-Repmgr-3.2.part.Dockerfile
+++ b/src/includes/dockerfile/Postgres-9.6-Repmgr-3.2.part.Dockerfile
@@ -1 +1 @@
-Postgres-9.5-10.2-Repmgr-3.2.part.Dockerfile
\ No newline at end of file
+Postgres-9.5-10-Repmgr-3.2.part.Dockerfile
\ No newline at end of file
diff --git a/src/includes/dockerfile/Postgres-extended-10-Repmgr-3.2.part.Dockerfile b/src/includes/dockerfile/Postgres-extended-10-Repmgr-3.2.part.Dockerfile
new file mode 120000
index 00000000..9a78b653
--- /dev/null
+++ b/src/includes/dockerfile/Postgres-extended-10-Repmgr-3.2.part.Dockerfile
@@ -0,0 +1 @@
+Postgres-extended-9.5-10-Repmgr-3.2.part.Dockerfile
\ No newline at end of file
diff --git a/src/includes/dockerfile/Postgres-extended-10.2-Repmgr-3.2.part.Dockerfile b/src/includes/dockerfile/Postgres-extended-10.2-Repmgr-3.2.part.Dockerfile
deleted file mode 120000
index f3ff4f95..00000000
--- a/src/includes/dockerfile/Postgres-extended-10.2-Repmgr-3.2.part.Dockerfile
+++ /dev/null
@@ -1 +0,0 @@
-Postgres-extended-9.5-10.2-Repmgr-3.2.part.Dockerfile
\ No newline at end of file
diff --git a/src/includes/dockerfile/Postgres-extended-9.5-10.2-Repmgr-3.2.part.Dockerfile b/src/includes/dockerfile/Postgres-extended-9.5-10-Repmgr-3.2.part.Dockerfile
similarity index 100%
rename from src/includes/dockerfile/Postgres-extended-9.5-10.2-Repmgr-3.2.part.Dockerfile
rename to src/includes/dockerfile/Postgres-extended-9.5-10-Repmgr-3.2.part.Dockerfile
diff --git a/src/includes/dockerfile/Postgres-extended-9.5-Repmgr-3.2.part.Dockerfile b/src/includes/dockerfile/Postgres-extended-9.5-Repmgr-3.2.part.Dockerfile
index f3ff4f95..9a78b653 120000
--- a/src/includes/dockerfile/Postgres-extended-9.5-Repmgr-3.2.part.Dockerfile
+++ b/src/includes/dockerfile/Postgres-extended-9.5-Repmgr-3.2.part.Dockerfile
@@ -1 +1 @@
-Postgres-extended-9.5-10.2-Repmgr-3.2.part.Dockerfile
\ No newline at end of file
+Postgres-extended-9.5-10-Repmgr-3.2.part.Dockerfile
\ No newline at end of file
diff --git a/src/includes/dockerfile/Postgres-extended-9.6-Repmgr-3.2.part.Dockerfile b/src/includes/dockerfile/Postgres-extended-9.6-Repmgr-3.2.part.Dockerfile
index f3ff4f95..9a78b653 120000
--- a/src/includes/dockerfile/Postgres-extended-9.6-Repmgr-3.2.part.Dockerfile
+++ b/src/includes/dockerfile/Postgres-extended-9.6-Repmgr-3.2.part.Dockerfile
@@ -1 +1 @@
-Postgres-extended-9.5-10.2-Repmgr-3.2.part.Dockerfile
\ No newline at end of file
+Postgres-extended-9.5-10-Repmgr-3.2.part.Dockerfile
\ No newline at end of file