diff --git a/.github/workflows/test-versions.yml b/.github/workflows/test-versions.yml
index 44b79250..4066e64f 100644
--- a/.github/workflows/test-versions.yml
+++ b/.github/workflows/test-versions.yml
@@ -78,6 +78,20 @@ jobs:
           - "PGSQL_SERVER=11.0-alpine"
           - "PGSQL_SERVER=11.1"
           - "PGSQL_SERVER=11.1-alpine"
+          - "PGSQL_SERVER=11.2"
+          - "PGSQL_SERVER=11.2-alpine"
+          - "PGSQL_SERVER=11.3"
+          - "PGSQL_SERVER=11.3-alpine"
+          - "PGSQL_SERVER=11.4"
+          - "PGSQL_SERVER=11.4-alpine"
+          - "PGSQL_SERVER=11.5"
+          - "PGSQL_SERVER=11.5-alpine"
+          - "PGSQL_SERVER=11.6"
+          - "PGSQL_SERVER=11.6-alpine"
+          - "PGSQL_SERVER=12.0"
+          - "PGSQL_SERVER=12.0-alpine"
+          - "PGSQL_SERVER=12.1"
+          - "PGSQL_SERVER=12.1-alpine"
           - "PGSQL_SERVER=latest"
           - "PGSQL_SERVER=alpine"
 
diff --git a/.travis.yml b/.travis.yml
index 260d90ce..67529880 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -181,6 +181,22 @@ env:
   - S1=PHP V1=7.2 S2=PGSQL V2=11.0-alpine
   - S1=PHP V1=7.2 S2=PGSQL V2=11.1
   - S1=PHP V1=7.2 S2=PGSQL V2=11.1-alpine
+  - S1=PHP V1=7.2 S2=PGSQL V2=11.2
+  - S1=PHP V1=7.2 S2=PGSQL V2=11.2-alpine
+  - S1=PHP V1=7.2 S2=PGSQL V2=11.3
+  - S1=PHP V1=7.2 S2=PGSQL V2=11.3-alpine
+  - S1=PHP V1=7.2 S2=PGSQL V2=11.4
+  - S1=PHP V1=7.2 S2=PGSQL V2=11.4-alpine
+  - S1=PHP V1=7.2 S2=PGSQL V2=11.5
+  - S1=PHP V1=7.2 S2=PGSQL V2=11.5-alpine
+  - S1=PHP V1=7.2 S2=PGSQL V2=11.6
+  - S1=PHP V1=7.2 S2=PGSQL V2=11.6-alpine
+  - S1=PHP V1=7.2 S2=PGSQL V2=12.0
+  - S1=PHP V1=7.2 S2=PGSQL V2=12.0-alpine
+  - S1=PHP V1=7.2 S2=PGSQL V2=12.1
+  - S1=PHP V1=7.2 S2=PGSQL V2=12.1-alpine
+  - S1=PHP V1=7.2 S2=PGSQL V2=latest
+  - S1=PHP V1=7.2 S2=PGSQL V2=alpine
   # PHP 7.2 vs Redis
   - S1=PHP V1=7.2 S2=REDIS V2=2.8
   - S1=PHP V1=7.2 S2=REDIS V2=3.0
diff --git a/README.md b/README.md
index 518d615c..a7231740 100644
--- a/README.md
+++ b/README.md
@@ -329,7 +329,7 @@ Every single attachable container comes with many different versions. In order t
       <td></td>
       <td></td>
       <td></td>
-      <td><a target="_blank" title="PgSQL 11.1"       href="https://github.com/docker-library/postgres">11.1</a></td>
+      <td><a target="_blank" title="PgSQL 12.0"       href="https://github.com/docker-library/postgres">12.0</a></td>
       <td></td>
       <td></td>
       <td></td>
@@ -341,7 +341,7 @@ Every single attachable container comes with many different versions. In order t
       <td></td>
       <td></td>
       <td></td>
-      <td><a target="_blank" title="PgSQL latest"     href="https://github.com/docker-library/postgres">latest</a></td>
+      <td><a target="_blank" title="PgSQL 12.1"       href="https://github.com/docker-library/postgres">12.1</a></td>
       <td></td>
       <td></td>
       <td></td>
@@ -353,7 +353,7 @@ Every single attachable container comes with many different versions. In order t
       <td></td>
       <td></td>
       <td></td>
-      <td></td>
+      <td><a target="_blank" title="PgSQL latest"     href="https://github.com/docker-library/postgres">latest</a></td>
       <td></td>
       <td></td>
       <td></td>
diff --git a/docker-compose.yml b/docker-compose.yml
index 27d35bd7..0f17a442 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -535,6 +535,20 @@ volumes:
   devilbox-pgsql-11.0-alpine:
   devilbox-pgsql-11.1:
   devilbox-pgsql-11.1-alpine:
+  devilbox-pgsql-11.2:
+  devilbox-pgsql-11.2-alpine:
+  devilbox-pgsql-11.3:
+  devilbox-pgsql-11.3-alpine:
+  devilbox-pgsql-11.4:
+  devilbox-pgsql-11.4-alpine:
+  devilbox-pgsql-11.5:
+  devilbox-pgsql-11.5-alpine:
+  devilbox-pgsql-11.6:
+  devilbox-pgsql-11.6-alpine:
+  devilbox-pgsql-12.0:
+  devilbox-pgsql-12.0-alpine:
+  devilbox-pgsql-12.1:
+  devilbox-pgsql-12.1-alpine:
   devilbox-pgsql-latest:
   devilbox-pgsql-alpine:
 
diff --git a/env-example b/env-example
index b176a693..ecda7741 100644
--- a/env-example
+++ b/env-example
@@ -327,10 +327,32 @@ MYSQL_SERVER=mariadb-10.3
 #PGSQL_SERVER=10.5-alpine
 #PGSQL_SERVER=10.6
 #PGSQL_SERVER=10.6-alpine
+#PGSQL_SERVER=10.7
+#PGSQL_SERVER=10.7-alpine
+#PGSQL_SERVER=10.8
+#PGSQL_SERVER=10.8-alpine
+#PGSQL_SERVER=10.9
+#PGSQL_SERVER=10.9-alpine
+#PGSQL_SERVER=10.10
+#PGSQL_SERVER=10.10-alpine
+#PGSQL_SERVER=10.11
+#PGSQL_SERVER=10.11-alpine
 #PGSQL_SERVER=11.0
 #PGSQL_SERVER=11.0-alpine
-PGSQL_SERVER=11.1
-#PGSQL_SERVER=11.1-alpine
+#PGSQL_SERVER=11.2
+#PGSQL_SERVER=11.2-alpine
+#PGSQL_SERVER=11.3
+#PGSQL_SERVER=11.3-alpine
+#PGSQL_SERVER=11.4
+#PGSQL_SERVER=11.4-alpine
+#PGSQL_SERVER=11.5
+#PGSQL_SERVER=11.5-alpine
+#PGSQL_SERVER=11.6
+#PGSQL_SERVER=11.6-alpine
+#PGSQL_SERVER=12.0
+#PGSQL_SERVER=12.0-alpine
+PGSQL_SERVER=12.1
+#PGSQL_SERVER=12.1-alpine
 #PGSQL_SERVER=latest
 #PGSQL_SERVER=alpine