diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index e09c34500..85b0e9a90 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -10,6 +10,7 @@ on:
       - '4.0'
       - '5.0'
       - '5.2'
+      - '5.4'
       - 'trunk'
     paths-ignore:
       - '.env*'
diff --git a/agent/alpine/README.md b/agent/alpine/README.md
index 37fb7f9c8..fc147047e 100644
--- a/agent/alpine/README.md
+++ b/agent/alpine/README.md
@@ -30,9 +30,11 @@ These are the only official Zabbix agent Docker images. They are based on Alpine
     Zabbix agent 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported)
     Zabbix agent 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest )
     Zabbix agent 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*)
-    Zabbix agent 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix agent 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest)
     Zabbix agent 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, centos-5.2.*)
-    Zabbix agent 5.4 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
+    Zabbix agent 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, centos-5.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix agent 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, centos-5.4.*)
+    Zabbix agent 6.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
 
 Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
 
diff --git a/agent/centos/README.md b/agent/centos/README.md
index 143597d19..bc52e230c 100644
--- a/agent/centos/README.md
+++ b/agent/centos/README.md
@@ -30,9 +30,11 @@ These are the only official Zabbix agent Docker images. They are based on Alpine
     Zabbix agent 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported)
     Zabbix agent 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest)
     Zabbix agent 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*)
-    Zabbix agent 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix agent 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest)
     Zabbix agent 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, centos-5.2.*)
-    Zabbix agent 5.4 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
+    Zabbix agent 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, centos-5.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix agent 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, centos-5.4.*)
+    Zabbix agent 6.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
 
 Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
 
diff --git a/agent/ubuntu/README.md b/agent/ubuntu/README.md
index 143597d19..bc52e230c 100644
--- a/agent/ubuntu/README.md
+++ b/agent/ubuntu/README.md
@@ -30,9 +30,11 @@ These are the only official Zabbix agent Docker images. They are based on Alpine
     Zabbix agent 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported)
     Zabbix agent 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest)
     Zabbix agent 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*)
-    Zabbix agent 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix agent 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest)
     Zabbix agent 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, centos-5.2.*)
-    Zabbix agent 5.4 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
+    Zabbix agent 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, centos-5.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix agent 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, centos-5.4.*)
+    Zabbix agent 6.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
 
 Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
 
diff --git a/java-gateway/alpine/README.md b/java-gateway/alpine/README.md
index 86edddf95..ad35e18b8 100644
--- a/java-gateway/alpine/README.md
+++ b/java-gateway/alpine/README.md
@@ -30,9 +30,11 @@ These are the only official Zabbix Java Gateway Docker images. They are based on
     Zabbix Java Gateway 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported)
     Zabbix Java Gateway 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest)
     Zabbix Java Gateway 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*)
-    Zabbix Java Gateway 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix Java Gateway 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest)
     Zabbix Java Gateway 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, centos-5.2.*)
-    Zabbix Java Gateway 5.4 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
+    Zabbix Java Gateway 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, centos-5.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix Java Gateway 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, centos-5.4.*)
+    Zabbix Java Gateway 6.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
 
 Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
 
diff --git a/java-gateway/centos/README.md b/java-gateway/centos/README.md
index 86edddf95..ad35e18b8 100644
--- a/java-gateway/centos/README.md
+++ b/java-gateway/centos/README.md
@@ -30,9 +30,11 @@ These are the only official Zabbix Java Gateway Docker images. They are based on
     Zabbix Java Gateway 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported)
     Zabbix Java Gateway 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest)
     Zabbix Java Gateway 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*)
-    Zabbix Java Gateway 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix Java Gateway 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest)
     Zabbix Java Gateway 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, centos-5.2.*)
-    Zabbix Java Gateway 5.4 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
+    Zabbix Java Gateway 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, centos-5.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix Java Gateway 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, centos-5.4.*)
+    Zabbix Java Gateway 6.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
 
 Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
 
diff --git a/java-gateway/ubuntu/README.md b/java-gateway/ubuntu/README.md
index 86edddf95..ad35e18b8 100644
--- a/java-gateway/ubuntu/README.md
+++ b/java-gateway/ubuntu/README.md
@@ -30,9 +30,11 @@ These are the only official Zabbix Java Gateway Docker images. They are based on
     Zabbix Java Gateway 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported)
     Zabbix Java Gateway 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest)
     Zabbix Java Gateway 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*)
-    Zabbix Java Gateway 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix Java Gateway 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest)
     Zabbix Java Gateway 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, centos-5.2.*)
-    Zabbix Java Gateway 5.4 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
+    Zabbix Java Gateway 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, centos-5.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix Java Gateway 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, centos-5.4.*)
+    Zabbix Java Gateway 6.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
 
 Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
 
diff --git a/proxy-mysql/alpine/README.md b/proxy-mysql/alpine/README.md
index 9172c3eab..baa70c4d8 100644
--- a/proxy-mysql/alpine/README.md
+++ b/proxy-mysql/alpine/README.md
@@ -30,9 +30,11 @@ These are the only official Zabbix proxy Docker images. They are based on Alpine
     Zabbix proxy 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported)
     Zabbix proxy 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest)
     Zabbix proxy 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*)
-    Zabbix proxy 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix proxy 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest)
     Zabbix proxy 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, centos-5.2.*)
-    Zabbix proxy 5.2 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
+    Zabbix proxy 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, centos-5.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix proxy 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, centos-5.4.*)
+    Zabbix proxy 6.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
 
 Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
 
diff --git a/proxy-mysql/centos/README.md b/proxy-mysql/centos/README.md
index 9172c3eab..baa70c4d8 100644
--- a/proxy-mysql/centos/README.md
+++ b/proxy-mysql/centos/README.md
@@ -30,9 +30,11 @@ These are the only official Zabbix proxy Docker images. They are based on Alpine
     Zabbix proxy 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported)
     Zabbix proxy 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest)
     Zabbix proxy 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*)
-    Zabbix proxy 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix proxy 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest)
     Zabbix proxy 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, centos-5.2.*)
-    Zabbix proxy 5.2 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
+    Zabbix proxy 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, centos-5.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix proxy 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, centos-5.4.*)
+    Zabbix proxy 6.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
 
 Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
 
diff --git a/proxy-mysql/ubuntu/README.md b/proxy-mysql/ubuntu/README.md
index 9172c3eab..baa70c4d8 100644
--- a/proxy-mysql/ubuntu/README.md
+++ b/proxy-mysql/ubuntu/README.md
@@ -30,9 +30,11 @@ These are the only official Zabbix proxy Docker images. They are based on Alpine
     Zabbix proxy 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported)
     Zabbix proxy 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest)
     Zabbix proxy 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*)
-    Zabbix proxy 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix proxy 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest)
     Zabbix proxy 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, centos-5.2.*)
-    Zabbix proxy 5.2 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
+    Zabbix proxy 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, centos-5.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix proxy 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, centos-5.4.*)
+    Zabbix proxy 6.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
 
 Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
 
diff --git a/proxy-sqlite3/alpine/README.md b/proxy-sqlite3/alpine/README.md
index 371fbf406..253e3dd2d 100644
--- a/proxy-sqlite3/alpine/README.md
+++ b/proxy-sqlite3/alpine/README.md
@@ -30,9 +30,11 @@ These are the only official Zabbix proxy Docker images. They are based on Alpine
     Zabbix proxy 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported)
     Zabbix proxy 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest)
     Zabbix proxy 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*)
-    Zabbix proxy 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix proxy 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest)
     Zabbix proxy 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, centos-5.2.*)
-    Zabbix proxy 5.2 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
+    Zabbix proxy 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, centos-5.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix proxy 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, centos-5.4.*)
+    Zabbix proxy 6.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
 
 Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
 
diff --git a/proxy-sqlite3/centos/README.md b/proxy-sqlite3/centos/README.md
index 371fbf406..253e3dd2d 100644
--- a/proxy-sqlite3/centos/README.md
+++ b/proxy-sqlite3/centos/README.md
@@ -30,9 +30,11 @@ These are the only official Zabbix proxy Docker images. They are based on Alpine
     Zabbix proxy 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported)
     Zabbix proxy 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest)
     Zabbix proxy 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*)
-    Zabbix proxy 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix proxy 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest)
     Zabbix proxy 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, centos-5.2.*)
-    Zabbix proxy 5.2 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
+    Zabbix proxy 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, centos-5.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix proxy 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, centos-5.4.*)
+    Zabbix proxy 6.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
 
 Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
 
diff --git a/proxy-sqlite3/ubuntu/README.md b/proxy-sqlite3/ubuntu/README.md
index 371fbf406..253e3dd2d 100644
--- a/proxy-sqlite3/ubuntu/README.md
+++ b/proxy-sqlite3/ubuntu/README.md
@@ -30,9 +30,11 @@ These are the only official Zabbix proxy Docker images. They are based on Alpine
     Zabbix proxy 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported)
     Zabbix proxy 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest)
     Zabbix proxy 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*)
-    Zabbix proxy 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix proxy 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest)
     Zabbix proxy 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, centos-5.2.*)
-    Zabbix proxy 5.2 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
+    Zabbix proxy 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, centos-5.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix proxy 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, centos-5.4.*)
+    Zabbix proxy 6.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
 
 Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
 
diff --git a/server-mysql/alpine/README.md b/server-mysql/alpine/README.md
index 3ef4ec041..7670578d3 100644
--- a/server-mysql/alpine/README.md
+++ b/server-mysql/alpine/README.md
@@ -32,9 +32,11 @@ These are the only official Zabbix server Docker images. They are based on Alpin
     Zabbix server 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported)
     Zabbix server 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest)
     Zabbix server 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*)
-    Zabbix server 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix server 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest)
     Zabbix server 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, centos-5.2.*)
-    Zabbix server 5.4 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
+    Zabbix server 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, centos-5.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix server 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, centos-5.4.*)
+    Zabbix server 6.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
 
 Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
 
diff --git a/server-mysql/centos/README.md b/server-mysql/centos/README.md
index 3ef4ec041..7670578d3 100644
--- a/server-mysql/centos/README.md
+++ b/server-mysql/centos/README.md
@@ -32,9 +32,11 @@ These are the only official Zabbix server Docker images. They are based on Alpin
     Zabbix server 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported)
     Zabbix server 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest)
     Zabbix server 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*)
-    Zabbix server 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix server 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest)
     Zabbix server 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, centos-5.2.*)
-    Zabbix server 5.4 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
+    Zabbix server 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, centos-5.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix server 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, centos-5.4.*)
+    Zabbix server 6.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
 
 Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
 
diff --git a/server-mysql/ubuntu/README.md b/server-mysql/ubuntu/README.md
index 3ef4ec041..7670578d3 100644
--- a/server-mysql/ubuntu/README.md
+++ b/server-mysql/ubuntu/README.md
@@ -32,9 +32,11 @@ These are the only official Zabbix server Docker images. They are based on Alpin
     Zabbix server 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported)
     Zabbix server 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest)
     Zabbix server 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*)
-    Zabbix server 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix server 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest)
     Zabbix server 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, centos-5.2.*)
-    Zabbix server 5.4 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
+    Zabbix server 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, centos-5.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix server 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, centos-5.4.*)
+    Zabbix server 6.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
 
 Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
 
diff --git a/server-pgsql/alpine/README.md b/server-pgsql/alpine/README.md
index 456090b94..228062dab 100644
--- a/server-pgsql/alpine/README.md
+++ b/server-pgsql/alpine/README.md
@@ -32,9 +32,11 @@ These are the only official Zabbix server Docker images. They are based on Alpin
     Zabbix server 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported)
     Zabbix server 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest)
     Zabbix server 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*)
-    Zabbix server 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix server 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest)
     Zabbix server 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, centos-5.2.*)
-    Zabbix server 5.4 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
+    Zabbix server 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, centos-5.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix server 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, centos-5.4.*)
+    Zabbix server 6.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
 
 Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
 
diff --git a/server-pgsql/centos/README.md b/server-pgsql/centos/README.md
index 456090b94..228062dab 100644
--- a/server-pgsql/centos/README.md
+++ b/server-pgsql/centos/README.md
@@ -32,9 +32,11 @@ These are the only official Zabbix server Docker images. They are based on Alpin
     Zabbix server 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported)
     Zabbix server 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest)
     Zabbix server 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*)
-    Zabbix server 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix server 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest)
     Zabbix server 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, centos-5.2.*)
-    Zabbix server 5.4 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
+    Zabbix server 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, centos-5.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix server 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, centos-5.4.*)
+    Zabbix server 6.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
 
 Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
 
diff --git a/server-pgsql/ubuntu/README.md b/server-pgsql/ubuntu/README.md
index 456090b94..228062dab 100644
--- a/server-pgsql/ubuntu/README.md
+++ b/server-pgsql/ubuntu/README.md
@@ -32,9 +32,11 @@ These are the only official Zabbix server Docker images. They are based on Alpin
     Zabbix server 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported)
     Zabbix server 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest)
     Zabbix server 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*)
-    Zabbix server 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix server 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest)
     Zabbix server 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, centos-5.2.*)
-    Zabbix server 5.4 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
+    Zabbix server 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, centos-5.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix server 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, centos-5.4.*)
+    Zabbix server 6.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
 
 Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
 
diff --git a/snmptraps/alpine/README.md b/snmptraps/alpine/README.md
index 471da9d1d..40a6eba22 100644
--- a/snmptraps/alpine/README.md
+++ b/snmptraps/alpine/README.md
@@ -30,9 +30,11 @@ These are the only official Zabbix snmptraps Docker images. They are based on Al
     Zabbix snmptraps 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported)
     Zabbix snmptraps 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest)
     Zabbix snmptraps 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*)
-    Zabbix snmptraps 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix snmptraps 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest)
     Zabbix snmptraps 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, centos-5.2.*)
-    Zabbix snmptraps 5.4 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
+    Zabbix snmptraps 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, centos-5.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix snmptraps 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, centos-5.4.*)
+    Zabbix snmptraps 6.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
 
 Images are updated when new releases are published.
 
diff --git a/snmptraps/centos/README.md b/snmptraps/centos/README.md
index 471da9d1d..40a6eba22 100644
--- a/snmptraps/centos/README.md
+++ b/snmptraps/centos/README.md
@@ -30,9 +30,11 @@ These are the only official Zabbix snmptraps Docker images. They are based on Al
     Zabbix snmptraps 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported)
     Zabbix snmptraps 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest)
     Zabbix snmptraps 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*)
-    Zabbix snmptraps 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix snmptraps 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest)
     Zabbix snmptraps 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, centos-5.2.*)
-    Zabbix snmptraps 5.4 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
+    Zabbix snmptraps 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, centos-5.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix snmptraps 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, centos-5.4.*)
+    Zabbix snmptraps 6.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
 
 Images are updated when new releases are published.
 
diff --git a/snmptraps/ubuntu/README.md b/snmptraps/ubuntu/README.md
index 471da9d1d..40a6eba22 100644
--- a/snmptraps/ubuntu/README.md
+++ b/snmptraps/ubuntu/README.md
@@ -30,9 +30,11 @@ These are the only official Zabbix snmptraps Docker images. They are based on Al
     Zabbix snmptraps 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported)
     Zabbix snmptraps 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest)
     Zabbix snmptraps 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*)
-    Zabbix snmptraps 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix snmptraps 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest)
     Zabbix snmptraps 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, centos-5.2.*)
-    Zabbix snmptraps 5.4 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
+    Zabbix snmptraps 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, centos-5.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix snmptraps 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, centos-5.4.*)
+    Zabbix snmptraps 6.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
 
 Images are updated when new releases are published.
 
diff --git a/web-apache-mysql/alpine/README.md b/web-apache-mysql/alpine/README.md
index e9d5c110f..c6085adf8 100644
--- a/web-apache-mysql/alpine/README.md
+++ b/web-apache-mysql/alpine/README.md
@@ -30,9 +30,11 @@ These are the only official Zabbix web interface Docker images. They are based o
     Zabbix web interface 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported)
     Zabbix web interface 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest)
     Zabbix web interface 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*)
-    Zabbix web interface 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix web interface 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest)
     Zabbix web interface 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, centos-5.2.*)
-    Zabbix web interface 5.4 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
+    Zabbix web interface 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, centos-5.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix web interface 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, centos-5.4.*)
+    Zabbix web interface 6.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
 
 Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
 
diff --git a/web-apache-mysql/centos/README.md b/web-apache-mysql/centos/README.md
index e9d5c110f..c6085adf8 100644
--- a/web-apache-mysql/centos/README.md
+++ b/web-apache-mysql/centos/README.md
@@ -30,9 +30,11 @@ These are the only official Zabbix web interface Docker images. They are based o
     Zabbix web interface 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported)
     Zabbix web interface 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest)
     Zabbix web interface 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*)
-    Zabbix web interface 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix web interface 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest)
     Zabbix web interface 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, centos-5.2.*)
-    Zabbix web interface 5.4 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
+    Zabbix web interface 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, centos-5.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix web interface 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, centos-5.4.*)
+    Zabbix web interface 6.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
 
 Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
 
diff --git a/web-apache-mysql/ubuntu/README.md b/web-apache-mysql/ubuntu/README.md
index e9d5c110f..c6085adf8 100644
--- a/web-apache-mysql/ubuntu/README.md
+++ b/web-apache-mysql/ubuntu/README.md
@@ -30,9 +30,11 @@ These are the only official Zabbix web interface Docker images. They are based o
     Zabbix web interface 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported)
     Zabbix web interface 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest)
     Zabbix web interface 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*)
-    Zabbix web interface 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix web interface 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest)
     Zabbix web interface 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, centos-5.2.*)
-    Zabbix web interface 5.4 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
+    Zabbix web interface 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, centos-5.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix web interface 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, centos-5.4.*)
+    Zabbix web interface 6.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
 
 Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
 
diff --git a/web-apache-pgsql/alpine/README.md b/web-apache-pgsql/alpine/README.md
index 2dc5f1a8a..2f0da553b 100644
--- a/web-apache-pgsql/alpine/README.md
+++ b/web-apache-pgsql/alpine/README.md
@@ -30,9 +30,11 @@ These are the only official Zabbix web interface Docker images. They are based o
     Zabbix web interface 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported)
     Zabbix web interface 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest)
     Zabbix web interface 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*)
-    Zabbix web interface 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix web interface 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest)
     Zabbix web interface 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, centos-5.2.*)
-    Zabbix web interface 5.4 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
+    Zabbix web interface 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, centos-5.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix web interface 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, centos-5.4.*)
+    Zabbix web interface 6.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
 
 Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
 
diff --git a/web-apache-pgsql/centos/README.md b/web-apache-pgsql/centos/README.md
index 2dc5f1a8a..2f0da553b 100644
--- a/web-apache-pgsql/centos/README.md
+++ b/web-apache-pgsql/centos/README.md
@@ -30,9 +30,11 @@ These are the only official Zabbix web interface Docker images. They are based o
     Zabbix web interface 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported)
     Zabbix web interface 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest)
     Zabbix web interface 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*)
-    Zabbix web interface 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix web interface 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest)
     Zabbix web interface 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, centos-5.2.*)
-    Zabbix web interface 5.4 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
+    Zabbix web interface 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, centos-5.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix web interface 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, centos-5.4.*)
+    Zabbix web interface 6.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
 
 Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
 
diff --git a/web-apache-pgsql/ubuntu/README.md b/web-apache-pgsql/ubuntu/README.md
index 2dc5f1a8a..2f0da553b 100644
--- a/web-apache-pgsql/ubuntu/README.md
+++ b/web-apache-pgsql/ubuntu/README.md
@@ -30,9 +30,11 @@ These are the only official Zabbix web interface Docker images. They are based o
     Zabbix web interface 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported)
     Zabbix web interface 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest)
     Zabbix web interface 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*)
-    Zabbix web interface 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix web interface 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest)
     Zabbix web interface 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, centos-5.2.*)
-    Zabbix web interface 5.4 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
+    Zabbix web interface 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, centos-5.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix web interface 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, centos-5.4.*)
+    Zabbix web interface 6.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
 
 Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
 
diff --git a/web-nginx-mysql/alpine/README.md b/web-nginx-mysql/alpine/README.md
index 89d375a05..2067e268c 100644
--- a/web-nginx-mysql/alpine/README.md
+++ b/web-nginx-mysql/alpine/README.md
@@ -30,9 +30,11 @@ These are the only official Zabbix web interface Docker images. They are based o
     Zabbix web interface 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported)
     Zabbix web interface 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest)
     Zabbix web interface 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*)
-    Zabbix web interface 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix web interface 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest)
     Zabbix web interface 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, centos-5.2.*)
-    Zabbix web interface 5.4 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
+    Zabbix web interface 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, centos-5.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix web interface 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, centos-5.4.*)
+    Zabbix web interface 6.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
 
 Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
 
diff --git a/web-nginx-mysql/centos/README.md b/web-nginx-mysql/centos/README.md
index a54ed4480..fe40bba26 100644
--- a/web-nginx-mysql/centos/README.md
+++ b/web-nginx-mysql/centos/README.md
@@ -30,9 +30,11 @@ These are the only official Zabbix web interface Docker images. They are based o
     Zabbix web interface 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported)
     Zabbix web interface 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest)
     Zabbix web interface 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*)
-    Zabbix web interface 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix web interface 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest)
     Zabbix web interface 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, centos-5.2.*)
-    Zabbix web interface 5.4 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
+    Zabbix web interface 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, centos-5.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix web interface 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, centos-5.4.*)
+    Zabbix web interface 6.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
 
 Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
 
diff --git a/web-nginx-mysql/ubuntu/README.md b/web-nginx-mysql/ubuntu/README.md
index 89d375a05..2067e268c 100644
--- a/web-nginx-mysql/ubuntu/README.md
+++ b/web-nginx-mysql/ubuntu/README.md
@@ -30,9 +30,11 @@ These are the only official Zabbix web interface Docker images. They are based o
     Zabbix web interface 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported)
     Zabbix web interface 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest)
     Zabbix web interface 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*)
-    Zabbix web interface 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix web interface 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest)
     Zabbix web interface 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, centos-5.2.*)
-    Zabbix web interface 5.4 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
+    Zabbix web interface 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, centos-5.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix web interface 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, centos-5.4.*)
+    Zabbix web interface 6.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
 
 Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
 
diff --git a/web-nginx-pgsql/alpine/README.md b/web-nginx-pgsql/alpine/README.md
index 603a90639..cfd3ce83d 100644
--- a/web-nginx-pgsql/alpine/README.md
+++ b/web-nginx-pgsql/alpine/README.md
@@ -30,9 +30,11 @@ These are the only official Zabbix web interface Docker images. They are based o
     Zabbix web interface 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported)
     Zabbix web interface 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest)
     Zabbix web interface 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*)
-    Zabbix web interface 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix web interface 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest)
     Zabbix web interface 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, centos-5.2.*)
-    Zabbix web interface 5.4 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
+    Zabbix web interface 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, centos-5.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix web interface 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, centos-5.4.*)
+    Zabbix web interface 6.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
 
 Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
 
diff --git a/web-nginx-pgsql/centos/README.md b/web-nginx-pgsql/centos/README.md
index 603a90639..cfd3ce83d 100644
--- a/web-nginx-pgsql/centos/README.md
+++ b/web-nginx-pgsql/centos/README.md
@@ -30,9 +30,11 @@ These are the only official Zabbix web interface Docker images. They are based o
     Zabbix web interface 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported)
     Zabbix web interface 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest)
     Zabbix web interface 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*)
-    Zabbix web interface 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix web interface 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest)
     Zabbix web interface 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, centos-5.2.*)
-    Zabbix web interface 5.4 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
+    Zabbix web interface 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, centos-5.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix web interface 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, centos-5.4.*)
+    Zabbix web interface 6.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
 
 Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
 
diff --git a/web-nginx-pgsql/ubuntu/README.md b/web-nginx-pgsql/ubuntu/README.md
index 603a90639..cfd3ce83d 100644
--- a/web-nginx-pgsql/ubuntu/README.md
+++ b/web-nginx-pgsql/ubuntu/README.md
@@ -30,9 +30,11 @@ These are the only official Zabbix web interface Docker images. They are based o
     Zabbix web interface 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported)
     Zabbix web interface 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest)
     Zabbix web interface 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*)
-    Zabbix web interface 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix web interface 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest)
     Zabbix web interface 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, centos-5.2.*)
-    Zabbix web interface 5.4 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
+    Zabbix web interface 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, centos-5.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix web interface 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, centos-5.4.*)
+    Zabbix web interface 6.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
 
 Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.