diff --git a/agent/centos/README.md b/agent/centos/README.md
index 15a48b244..767e6c816 100644
--- a/agent/centos/README.md
+++ b/agent/centos/README.md
@@ -20,9 +20,11 @@ These are the only official Zabbix agent Docker images. They are based on Alpine
     Zabbix agent 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)
     Zabbix agent 3.2 (tags: alpine-3.2-latest, ubuntu-3.2-latest, centos-3.2-latest)
     Zabbix agent 3.2.* (tags: alpine-3.2.*, ubuntu-3.2.*, centos-3.2.*)
-    Zabbix agent 3.4 (tags: alpine-3.4-latest, ubuntu-3.4-latest, centos-3.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix agent 3.4 (tags: alpine-3.4-latest, ubuntu-3.4-latest, centos-3.4-latest)
     Zabbix agent 3.4.* (tags: alpine-3.4.*, ubuntu-3.4.*, centos-3.4.*)
-    Zabbix agent 4.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
+    Zabbix agent 4.0 (tags: alpine-4.0-latest, ubuntu-4.0-latest, centos-4.0-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix agent 4.0.* (tags: alpine-4.0.*, ubuntu-4.0.*, centos-4.0.*)
+    Zabbix agent 4.2 (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 15a48b244..767e6c816 100644
--- a/agent/ubuntu/README.md
+++ b/agent/ubuntu/README.md
@@ -20,9 +20,11 @@ These are the only official Zabbix agent Docker images. They are based on Alpine
     Zabbix agent 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)
     Zabbix agent 3.2 (tags: alpine-3.2-latest, ubuntu-3.2-latest, centos-3.2-latest)
     Zabbix agent 3.2.* (tags: alpine-3.2.*, ubuntu-3.2.*, centos-3.2.*)
-    Zabbix agent 3.4 (tags: alpine-3.4-latest, ubuntu-3.4-latest, centos-3.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix agent 3.4 (tags: alpine-3.4-latest, ubuntu-3.4-latest, centos-3.4-latest)
     Zabbix agent 3.4.* (tags: alpine-3.4.*, ubuntu-3.4.*, centos-3.4.*)
-    Zabbix agent 4.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
+    Zabbix agent 4.0 (tags: alpine-4.0-latest, ubuntu-4.0-latest, centos-4.0-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix agent 4.0.* (tags: alpine-4.0.*, ubuntu-4.0.*, centos-4.0.*)
+    Zabbix agent 4.2 (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/build.sh b/build.sh
new file mode 100755
index 000000000..431ce7bd7
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,61 @@
+#!/bin/bash
+
+set +e
+
+if [ ! -f "Dockerfile" ]; then
+    echo "Dockerfile is missing!"
+    exit 1
+fi
+
+os=${PWD##*/}
+
+version=$1
+version=${version:-"latest"}
+
+type=$2
+type=${type:-"build"}
+
+cd ../
+app_component=${PWD##*/}
+cd $os/
+
+if [ "$app_component" == "zabbix-appliance" ]; then
+    app_component="appliance"
+fi
+
+if [[ ! $version =~ ^[0-9]*\.[0-9]*\.[0-9]*$ ]] && [ "$version" != "latest" ]; then
+    echo "Incorrect syntax of the version"
+    exit 1
+fi
+
+if [ "$version" != "latest" ]; then
+    VCS_REF=`svn info svn://svn.zabbix.com/tags/$version |grep "Last Changed Rev"|awk '{print $4;}'`
+else
+    MAJOR_VERSION=`cat Dockerfile | grep "ARG MAJOR_VERSION" | head -n1 | cut -f2 -d"="`
+    MINOR_VERSION=`cat Dockerfile | grep "ARG ZBX_VERSION" | head -n1 | cut -f2 -d"."`
+
+    VCS_REF=$MAJOR_VERSION.$MINOR_VERSION
+fi
+
+docker build -t zabbix-$app_component:$os-$version --build-arg VCS_REF="$VCS_REF" --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -f Dockerfile .
+
+if [ "$type" != "build" ]; then
+    links=""
+    env_vars=""
+
+    if [[ $app_component =~ .*mysql.* ]]; then
+        links="$links --link mysql-server:mysql"
+        env_vars="$env_vars -e MYSQL_DATABASE=\"zabbix\" -e MYSQL_USER=\"zabbix\" -e MYSQL_PASSWORD=\"zabbix\" -e MYSQL_RANDOM_ROOT_PASSWORD=true"
+
+        docker rm -f mysql-server
+        docker run --name mysql-server -t $env_vars -d mysql:5.7
+    fi
+
+    if [ "$links" != "" ]; then
+        sleep 5
+    fi
+
+    docker rm -f zabbix-$app_component
+
+    docker run --name zabbix-$app_component -t -d $links $env_vars zabbix-$app_component:$os-$version
+fi
\ No newline at end of file
diff --git a/docker-compose_v2_alpine_mysql_latest.yaml b/docker-compose_v2_alpine_mysql_latest.yaml
index 117708c8a..5f194279d 100644
--- a/docker-compose_v2_alpine_mysql_latest.yaml
+++ b/docker-compose_v2_alpine_mysql_latest.yaml
@@ -1,7 +1,7 @@
 version: '2'
 services:
  zabbix-server:
-  image: zabbix/zabbix-server-mysql:alpine-trunk
+  image: zabbix/zabbix-server-mysql:alpine-4.0-latest
   ports:
    - "10051:10051"
   volumes:
@@ -43,7 +43,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-proxy-sqlite3:
-  image: zabbix/zabbix-proxy-sqlite3:alpine-trunk
+  image: zabbix/zabbix-proxy-sqlite3:alpine-4.0-latest
   ports:
    - "10061:10051"
   volumes:
@@ -83,7 +83,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-proxy-mysql:
-  image: zabbix/zabbix-proxy-mysql:alpine-trunk
+  image: zabbix/zabbix-proxy-mysql:alpine-4.0-latest
   ports:
    - "10071:10051"
   volumes:
@@ -124,7 +124,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-web-apache-mysql:
-  image: zabbix/zabbix-web-apache-mysql:alpine-trunk
+  image: zabbix/zabbix-web-apache-mysql:alpine-4.0-latest
   ports:
    - "80:80"
    - "443:443"
@@ -155,7 +155,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-web-nginx-mysql:
-  image: zabbix/zabbix-web-nginx-mysql:alpine-trunk
+  image: zabbix/zabbix-web-nginx-mysql:alpine-4.0-latest
   ports:
    - "8081:80"
    - "8443:443"
@@ -186,7 +186,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-agent:
-  image: zabbix/zabbix-agent:alpine-trunk
+  image: zabbix/zabbix-agent:alpine-4.0-latest
   ports:
    - "10050:10050"
   volumes:
@@ -216,7 +216,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-java-gateway:
-  image: zabbix/zabbix-java-gateway:alpine-trunk
+  image: zabbix/zabbix-java-gateway:alpine-4.0-latest
   ports:
    - "10052:10052"
   env_file:
@@ -234,7 +234,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-snmptraps:
-  image: zabbix/zabbix-snmptraps:alpine-trunk
+  image: zabbix/zabbix-snmptraps:alpine-4.0-latest
   ports:
    - "162:162/udp"
   volumes:
diff --git a/docker-compose_v2_alpine_pgsql_latest.yaml b/docker-compose_v2_alpine_pgsql_latest.yaml
index f2714191a..42768f1e7 100644
--- a/docker-compose_v2_alpine_pgsql_latest.yaml
+++ b/docker-compose_v2_alpine_pgsql_latest.yaml
@@ -1,7 +1,7 @@
 version: '2'
 services:
  zabbix-server:
-  image: zabbix/zabbix-server-pgsql:alpine-trunk
+  image: zabbix/zabbix-server-pgsql:alpine-4.0-latest
   ports:
    - "10051:10051"
   volumes:
@@ -43,7 +43,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-proxy-sqlite3:
-  image: zabbix/zabbix-proxy-sqlite3:alpine-trunk
+  image: zabbix/zabbix-proxy-sqlite3:alpine-4.0-latest
   ports:
    - "10061:10051"
   volumes:
@@ -83,7 +83,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-proxy-mysql:
-  image: zabbix/zabbix-proxy-mysql:alpine-trunk
+  image: zabbix/zabbix-proxy-mysql:alpine-4.0-latest
   ports:
    - "10071:10051"
   volumes:
@@ -155,7 +155,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-web-nginx-pgsql:
-  image: zabbix/zabbix-web-nginx-pgsql:alpine-trunk
+  image: zabbix/zabbix-web-nginx-pgsql:alpine-4.0-latest
   ports:
    - "8081:80"
    - "8443:443"
@@ -186,7 +186,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-agent:
-  image: zabbix/zabbix-agent:alpine-trunk
+  image: zabbix/zabbix-agent:alpine-4.0-latest
   ports:
    - "10050:10050"
   volumes:
@@ -216,7 +216,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-java-gateway:
-  image: zabbix/zabbix-java-gateway:alpine-trunk
+  image: zabbix/zabbix-java-gateway:alpine-4.0-latest
   ports:
    - "10052:10052"
   env_file:
@@ -234,7 +234,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-snmptraps:
-  image: zabbix/zabbix-snmptraps:alpine-trunk
+  image: zabbix/zabbix-snmptraps:alpine-4.0-latest
   ports:
    - "162:162/udp"
   volumes:
diff --git a/docker-compose_v2_centos_mysql_latest.yaml b/docker-compose_v2_centos_mysql_latest.yaml
index 0b1f8173a..b22bdc6e7 100644
--- a/docker-compose_v2_centos_mysql_latest.yaml
+++ b/docker-compose_v2_centos_mysql_latest.yaml
@@ -1,7 +1,7 @@
 version: '2'
 services:
  zabbix-server:
-  image: zabbix/zabbix-server-mysql:centos-trunk
+  image: zabbix/zabbix-server-mysql:centos-4.0-latest
   ports:
    - "10051:10051"
   volumes:
@@ -43,7 +43,7 @@ services:
    com.zabbix.os: "centos"
 
  zabbix-proxy-sqlite3:
-  image: zabbix/zabbix-proxy-sqlite3:centos-trunk
+  image: zabbix/zabbix-proxy-sqlite3:centos-4.0-latest
   ports:
    - "10061:10051"
   volumes:
@@ -83,7 +83,7 @@ services:
    com.zabbix.os: "centos"
 
  zabbix-proxy-mysql:
-  image: zabbix/zabbix-proxy-mysql:centos-trunk
+  image: zabbix/zabbix-proxy-mysql:centos-4.0-latest
   ports:
    - "10071:10051"
   volumes:
@@ -124,7 +124,7 @@ services:
    com.zabbix.os: "centos"
 
  zabbix-web-apache-mysql:
-  image: zabbix/zabbix-web-apache-mysql:centos-trunk
+  image: zabbix/zabbix-web-apache-mysql:centos-4.0-latest
   ports:
    - "80:80"
    - "443:443"
@@ -155,7 +155,7 @@ services:
    com.zabbix.os: "centos"
 
  zabbix-web-nginx-mysql:
-  image: zabbix/zabbix-web-nginx-mysql:centos-trunk
+  image: zabbix/zabbix-web-nginx-mysql:centos-4.0-latest
   ports:
    - "8081:80"
    - "8443:443"
@@ -186,7 +186,7 @@ services:
    com.zabbix.os: "centos"
 
  zabbix-agent:
-  image: zabbix/zabbix-agent:centos-trunk
+  image: zabbix/zabbix-agent:centos-4.0-latest
   ports:
    - "10050:10050"
   volumes:
@@ -216,7 +216,7 @@ services:
    com.zabbix.os: "centos"
 
  zabbix-java-gateway:
-  image: zabbix/zabbix-java-gateway:centos-trunk
+  image: zabbix/zabbix-java-gateway:centos-4.0-latest
   ports:
    - "10052:10052"
   env_file:
@@ -234,7 +234,7 @@ services:
    com.zabbix.os: "centos"
 
  zabbix-snmptraps:
-  image: zabbix/zabbix-snmptraps:centos-trunk
+  image: zabbix/zabbix-snmptraps:centos-4.0-latest
   ports:
    - "162:162/udp"
   volumes:
diff --git a/docker-compose_v2_centos_pgsql_latest.yaml b/docker-compose_v2_centos_pgsql_latest.yaml
index 031b9f4d9..5a028fec5 100644
--- a/docker-compose_v2_centos_pgsql_latest.yaml
+++ b/docker-compose_v2_centos_pgsql_latest.yaml
@@ -1,7 +1,7 @@
 version: '2'
 services:
  zabbix-server:
-  image: zabbix/zabbix-server-pgsql:centos-trunk
+  image: zabbix/zabbix-server-pgsql:centos-4.0-latest
   ports:
    - "10051:10051"
   volumes:
@@ -43,7 +43,7 @@ services:
    com.zabbix.os: "centos"
 
  zabbix-proxy-sqlite3:
-  image: zabbix/zabbix-proxy-sqlite3:centos-trunk
+  image: zabbix/zabbix-proxy-sqlite3:centos-4.0-latest
   ports:
    - "10061:10051"
   volumes:
@@ -83,7 +83,7 @@ services:
    com.zabbix.os: "centos"
 
  zabbix-proxy-mysql:
-  image: zabbix/zabbix-proxy-mysql:centos-trunk
+  image: zabbix/zabbix-proxy-mysql:centos-4.0-latest
   ports:
    - "10071:10051"
   volumes:
@@ -124,7 +124,7 @@ services:
    com.zabbix.os: "centos"
 
  zabbix-web-apache-pgsql:
-  image: zabbix/zabbix-web-apache-pgsql:centos-trunk
+  image: zabbix/zabbix-web-apache-pgsql:centos-4.0-latest
   ports:
    - "80:80"
    - "443:443"
@@ -155,7 +155,7 @@ services:
    com.zabbix.os: "centos"
 
  zabbix-web-nginx-pgsql:
-  image: zabbix/zabbix-web-nginx-pgsql:centos-trunk
+  image: zabbix/zabbix-web-nginx-pgsql:centos-4.0-latest
   ports:
    - "8081:80"
    - "8443:443"
@@ -186,7 +186,7 @@ services:
    com.zabbix.os: "centos"
 
  zabbix-agent:
-  image: zabbix/zabbix-agent:centos-trunk
+  image: zabbix/zabbix-agent:centos-4.0-latest
   ports:
    - "10050:10050"
   volumes:
@@ -216,7 +216,7 @@ services:
    com.zabbix.os: "centos"
 
  zabbix-java-gateway:
-  image: zabbix/zabbix-java-gateway:centos-trunk
+  image: zabbix/zabbix-java-gateway:centos-4.0-latest
   ports:
    - "10052:10052"
   env_file:
@@ -234,7 +234,7 @@ services:
    com.zabbix.os: "centos"
 
  zabbix-snmptraps:
-  image: zabbix/zabbix-snmptraps:centos-trunk
+  image: zabbix/zabbix-snmptraps:centos-4.0-latest
   ports:
    - "162:162/udp"
   volumes:
diff --git a/docker-compose_v2_ubuntu_mysql_latest.yaml b/docker-compose_v2_ubuntu_mysql_latest.yaml
index 535ceaa95..5c0c7261b 100644
--- a/docker-compose_v2_ubuntu_mysql_latest.yaml
+++ b/docker-compose_v2_ubuntu_mysql_latest.yaml
@@ -1,7 +1,7 @@
 version: '2'
 services:
  zabbix-server:
-  image: zabbix/zabbix-server-mysql:ubuntu-trunk
+  image: zabbix/zabbix-server-mysql:ubuntu-4.0-latest
   ports:
    - "10051:10051"
   volumes:
@@ -44,7 +44,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-proxy-sqlite3:
-  image: zabbix/zabbix-proxy-sqlite3:ubuntu-trunk
+  image: zabbix/zabbix-proxy-sqlite3:ubuntu-4.0-latest
   ports:
    - "10061:10051"
   volumes:
@@ -84,7 +84,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-proxy-mysql:
-  image: zabbix/zabbix-proxy-mysql:ubuntu-trunk
+  image: zabbix/zabbix-proxy-mysql:ubuntu-4.0-latest
   ports:
    - "10071:10051"
   volumes:
@@ -125,7 +125,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-web-apache-mysql:
-  image: zabbix/zabbix-web-apache-mysql:ubuntu-trunk
+  image: zabbix/zabbix-web-apache-mysql:ubuntu-4.0-latest
   ports:
    - "80:80"
    - "443:443"
@@ -156,7 +156,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-web-nginx-mysql:
-  image: zabbix/zabbix-web-nginx-mysql:ubuntu-trunk
+  image: zabbix/zabbix-web-nginx-mysql:ubuntu-4.0-latest
   ports:
    - "8081:80"
    - "8443:443"
@@ -187,7 +187,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-agent:
-  image: zabbix/zabbix-agent:ubuntu-trunk
+  image: zabbix/zabbix-agent:ubuntu-4.0-latest
   ports:
    - "10050:10050"
   volumes:
@@ -217,7 +217,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-java-gateway:
-  image: zabbix/zabbix-java-gateway:ubuntu-trunk
+  image: zabbix/zabbix-java-gateway:ubuntu-4.0-latest
   ports:
    - "10052:10052"
   env_file:
@@ -235,7 +235,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-snmptraps:
-  image: zabbix/zabbix-snmptraps:ubuntu-trunk
+  image: zabbix/zabbix-snmptraps:ubuntu-4.0-latest
   ports:
    - "162:162/udp"
   volumes:
diff --git a/docker-compose_v2_ubuntu_pgsql_latest.yaml b/docker-compose_v2_ubuntu_pgsql_latest.yaml
index df40f14c2..a7bca9a1d 100644
--- a/docker-compose_v2_ubuntu_pgsql_latest.yaml
+++ b/docker-compose_v2_ubuntu_pgsql_latest.yaml
@@ -1,7 +1,7 @@
 version: '2'
 services:
  zabbix-server:
-  image: zabbix/zabbix-server-pgsql:ubuntu-trunk
+  image: zabbix/zabbix-server-pgsql:ubuntu-4.0-latest
   ports:
    - "10051:10051"
   volumes:
@@ -43,7 +43,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-proxy-sqlite3:
-  image: zabbix/zabbix-proxy-sqlite3:ubuntu-trunk
+  image: zabbix/zabbix-proxy-sqlite3:ubuntu-4.0-latest
   ports:
    - "10061:10051"
   volumes:
@@ -83,7 +83,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-proxy-mysql:
-  image: zabbix/zabbix-proxy-mysql:ubuntu-trunk
+  image: zabbix/zabbix-proxy-mysql:ubuntu-4.0-latest
   ports:
    - "10071:10051"
   volumes:
@@ -124,7 +124,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-web-apache-pgsql:
-  image: zabbix/zabbix-web-apache-pgsql:ubuntu-trunk
+  image: zabbix/zabbix-web-apache-pgsql:ubuntu-4.0-latest
   ports:
    - "80:80"
    - "443:443"
@@ -155,7 +155,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-web-nginx-pgsql:
-  image: zabbix/zabbix-web-nginx-pgsql:ubuntu-trunk
+  image: zabbix/zabbix-web-nginx-pgsql:ubuntu-4.0-latest
   ports:
    - "8081:80"
    - "8443:443"
@@ -186,7 +186,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-agent:
-  image: zabbix/zabbix-agent:ubuntu-trunk
+  image: zabbix/zabbix-agent:ubuntu-4.0-latest
   ports:
    - "10050:10050"
   volumes:
@@ -216,7 +216,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-java-gateway:
-  image: zabbix/zabbix-java-gateway:ubuntu-trunk
+  image: zabbix/zabbix-java-gateway:ubuntu-4.0-latest
   ports:
    - "10052:10052"
   env_file:
@@ -234,7 +234,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-snmptraps:
-  image: zabbix/zabbix-snmptraps:ubuntu-trunk
+  image: zabbix/zabbix-snmptraps:ubuntu-4.0-latest
   ports:
    - "162:162/udp"
   volumes:
diff --git a/docker-compose_v3_alpine_mysql_latest.yaml b/docker-compose_v3_alpine_mysql_latest.yaml
index 1e6e7d72d..6aa7947f8 100644
--- a/docker-compose_v3_alpine_mysql_latest.yaml
+++ b/docker-compose_v3_alpine_mysql_latest.yaml
@@ -1,7 +1,7 @@
 version: '3.5'
 services:
  zabbix-server:
-  image: zabbix/zabbix-server-mysql:alpine-trunk
+  image: zabbix/zabbix-server-mysql:alpine-4.0-latest
   ports:
    - "10051:10051"
   volumes:
@@ -62,7 +62,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-proxy-sqlite3:
-  image: zabbix/zabbix-proxy-sqlite3:alpine-trunk
+  image: zabbix/zabbix-proxy-sqlite3:alpine-4.0-latest
   ports:
    - "10061:10051"
   volumes:
@@ -113,7 +113,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-proxy-mysql:
-  image: zabbix/zabbix-proxy-mysql:alpine-trunk
+  image: zabbix/zabbix-proxy-mysql:alpine-4.0-latest
   ports:
    - "10071:10051"
   volumes:
@@ -166,7 +166,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-web-apache-mysql:
-  image: zabbix/zabbix-web-apache-mysql:alpine-trunk
+  image: zabbix/zabbix-web-apache-mysql:alpine-4.0-latest
   ports:
    - "80:80"
    - "443:443"
@@ -217,7 +217,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-web-nginx-mysql:
-  image: zabbix/zabbix-web-nginx-mysql:alpine-trunk
+  image: zabbix/zabbix-web-nginx-mysql:alpine-4.0-latest
   ports:
    - "8081:80"
    - "8443:443"
@@ -268,7 +268,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-agent:
-  image: zabbix/zabbix-agent:alpine-trunk
+  image: zabbix/zabbix-agent:alpine-4.0-latest
   ports:
    - "10050:10050"
   volumes:
@@ -308,7 +308,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-java-gateway:
-  image: zabbix/zabbix-java-gateway:alpine-trunk
+  image: zabbix/zabbix-java-gateway:alpine-4.0-latest
   ports:
    - "10052:10052"
   deploy:
@@ -335,7 +335,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-snmptraps:
-  image: zabbix/zabbix-snmptraps:alpine-trunk
+  image: zabbix/zabbix-snmptraps:alpine-4.0-latest
   ports:
    - "162:162/udp"
   volumes:
diff --git a/docker-compose_v3_alpine_pgsql_latest.yaml b/docker-compose_v3_alpine_pgsql_latest.yaml
index bbaef3695..5bf81f76e 100644
--- a/docker-compose_v3_alpine_pgsql_latest.yaml
+++ b/docker-compose_v3_alpine_pgsql_latest.yaml
@@ -1,7 +1,7 @@
 version: '3.5'
 services:
  zabbix-server:
-  image: zabbix/zabbix-server-pgsql:alpine-trunk
+  image: zabbix/zabbix-server-pgsql:alpine-4.0-latest
   ports:
    - "10051:10051"
   volumes:
@@ -62,7 +62,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-proxy-sqlite3:
-  image: zabbix/zabbix-proxy-sqlite3:alpine-trunk
+  image: zabbix/zabbix-proxy-sqlite3:alpine-4.0-latest
   ports:
    - "10061:10051"
   volumes:
@@ -113,7 +113,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-proxy-mysql:
-  image: zabbix/zabbix-proxy-mysql:alpine-trunk
+  image: zabbix/zabbix-proxy-mysql:alpine-4.0-latest
   ports:
    - "10071:10051"
   volumes:
@@ -166,7 +166,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-web-apache-pgsql:
-  image: zabbix/zabbix-web-apache-pgsql:alpine-trunk
+  image: zabbix/zabbix-web-apache-pgsql:alpine-4.0-latest
   ports:
    - "80:80"
    - "443:443"
@@ -217,7 +217,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-web-nginx-pgsql:
-  image: zabbix/zabbix-web-nginx-pgsql:alpine-trunk
+  image: zabbix/zabbix-web-nginx-pgsql:alpine-4.0-latest
   ports:
    - "8081:80"
    - "8443:443"
@@ -268,7 +268,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-agent:
-  image: zabbix/zabbix-agent:alpine-trunk
+  image: zabbix/zabbix-agent:alpine-4.0-latest
   ports:
    - "10050:10050"
   volumes:
@@ -308,7 +308,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-java-gateway:
-  image: zabbix/zabbix-java-gateway:alpine-trunk
+  image: zabbix/zabbix-java-gateway:alpine-4.0-latest
   ports:
    - "10052:10052"
   deploy:
@@ -335,7 +335,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-snmptraps:
-  image: zabbix/zabbix-snmptraps:alpine-trunk
+  image: zabbix/zabbix-snmptraps:alpine-4.0-latest
   ports:
    - "162:162/udp"
   volumes:
diff --git a/docker-compose_v3_centos_mysql_latest.yaml b/docker-compose_v3_centos_mysql_latest.yaml
index 525fb6cf9..fad3bc9c0 100644
--- a/docker-compose_v3_centos_mysql_latest.yaml
+++ b/docker-compose_v3_centos_mysql_latest.yaml
@@ -1,7 +1,7 @@
 version: '3.5'
 services:
  zabbix-server:
-  image: zabbix/zabbix-server-mysql:centos-trunk
+  image: zabbix/zabbix-server-mysql:centos-4.0-latest
   ports:
    - "10051:10051"
   volumes:
@@ -62,7 +62,7 @@ services:
    com.zabbix.os: "centos"
 
  zabbix-proxy-sqlite3:
-  image: zabbix/zabbix-proxy-sqlite3:centos-trunk
+  image: zabbix/zabbix-proxy-sqlite3:centos-4.0-latest
   ports:
    - "10061:10051"
   volumes:
@@ -113,7 +113,7 @@ services:
    com.zabbix.os: "centos"
 
  zabbix-proxy-mysql:
-  image: zabbix/zabbix-proxy-mysql:centos-trunk
+  image: zabbix/zabbix-proxy-mysql:centos-4.0-latest
   ports:
    - "10071:10051"
   volumes:
@@ -166,7 +166,7 @@ services:
    com.zabbix.os: "centos"
 
  zabbix-web-apache-mysql:
-  image: zabbix/zabbix-web-apache-mysql:centos-trunk
+  image: zabbix/zabbix-web-apache-mysql:centos-4.0-latest
   ports:
    - "80:80"
    - "443:443"
@@ -217,7 +217,7 @@ services:
    com.zabbix.os: "centos"
 
  zabbix-web-nginx-mysql:
-  image: zabbix/zabbix-web-nginx-mysql:centos-trunk
+  image: zabbix/zabbix-web-nginx-mysql:centos-4.0-latest
   ports:
    - "8081:80"
    - "8443:443"
@@ -268,7 +268,7 @@ services:
    com.zabbix.os: "centos"
 
  zabbix-agent:
-  image: zabbix/zabbix-agent:centos-trunk
+  image: zabbix/zabbix-agent:centos-4.0-latest
   ports:
    - "10050:10050"
   volumes:
@@ -308,7 +308,7 @@ services:
    com.zabbix.os: "centos"
 
  zabbix-java-gateway:
-  image: zabbix/zabbix-java-gateway:centos-trunk
+  image: zabbix/zabbix-java-gateway:centos-4.0-latest
   ports:
    - "10052:10052"
   deploy:
@@ -335,7 +335,7 @@ services:
    com.zabbix.os: "centos"
 
  zabbix-snmptraps:
-  image: zabbix/zabbix-snmptraps:centos-trunk
+  image: zabbix/zabbix-snmptraps:centos-4.0-latest
   ports:
    - "162:162/udp"
   volumes:
diff --git a/docker-compose_v3_centos_pgsql_latest.yaml b/docker-compose_v3_centos_pgsql_latest.yaml
index db16c56d7..b44a865df 100644
--- a/docker-compose_v3_centos_pgsql_latest.yaml
+++ b/docker-compose_v3_centos_pgsql_latest.yaml
@@ -1,7 +1,7 @@
 version: '3.5'
 services:
  zabbix-server:
-  image: zabbix/zabbix-server-pgsql:centos-trunk
+  image: zabbix/zabbix-server-pgsql:centos-4.0-latest
   ports:
    - "10051:10051"
   volumes:
@@ -62,7 +62,7 @@ services:
    com.zabbix.os: "centos"
 
  zabbix-proxy-sqlite3:
-  image: zabbix/zabbix-proxy-sqlite3:centos-trunk
+  image: zabbix/zabbix-proxy-sqlite3:centos-4.0-latest
   ports:
    - "10061:10051"
   volumes:
@@ -113,7 +113,7 @@ services:
    com.zabbix.os: "centos"
 
  zabbix-proxy-mysql:
-  image: zabbix/zabbix-proxy-mysql:centos-trunk
+  image: zabbix/zabbix-proxy-mysql:centos-4.0-latest
   ports:
    - "10071:10051"
   volumes:
@@ -166,7 +166,7 @@ services:
    com.zabbix.os: "centos"
 
  zabbix-web-apache-pgsql:
-  image: zabbix/zabbix-web-apache-pgsql:centos-trunk
+  image: zabbix/zabbix-web-apache-pgsql:centos-4.0-latest
   ports:
    - "80:80"
    - "443:443"
@@ -217,7 +217,7 @@ services:
    com.zabbix.os: "centos"
 
  zabbix-web-nginx-pgsql:
-  image: zabbix/zabbix-web-nginx-pgsql:centos-trunk
+  image: zabbix/zabbix-web-nginx-pgsql:centos-4.0-latest
   ports:
    - "8081:80"
    - "8443:443"
@@ -268,7 +268,7 @@ services:
    com.zabbix.os: "centos"
 
  zabbix-agent:
-  image: zabbix/zabbix-agent:centos-trunk
+  image: zabbix/zabbix-agent:centos-4.0-latest
   ports:
    - "10050:10050"
   volumes:
@@ -308,7 +308,7 @@ services:
    com.zabbix.os: "centos"
 
  zabbix-java-gateway:
-  image: zabbix/zabbix-java-gateway:centos-trunk
+  image: zabbix/zabbix-java-gateway:centos-4.0-latest
   ports:
    - "10052:10052"
   deploy:
@@ -335,7 +335,7 @@ services:
    com.zabbix.os: "centos"
 
  zabbix-snmptraps:
-  image: zabbix/zabbix-snmptraps:centos-trunk
+  image: zabbix/zabbix-snmptraps:centos-4.0-latest
   ports:
    - "162:162/udp"
   volumes:
diff --git a/docker-compose_v3_ubuntu_mysql_latest.yaml b/docker-compose_v3_ubuntu_mysql_latest.yaml
index f67e030f8..e05b7e85b 100644
--- a/docker-compose_v3_ubuntu_mysql_latest.yaml
+++ b/docker-compose_v3_ubuntu_mysql_latest.yaml
@@ -1,7 +1,7 @@
 version: '3.5'
 services:
  zabbix-server:
-  image: zabbix/zabbix-server-mysql:ubuntu-trunk
+  image: zabbix/zabbix-server-mysql:ubuntu-4.0-latest
   ports:
    - "10051:10051"
   volumes:
@@ -62,7 +62,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-proxy-sqlite3:
-  image: zabbix/zabbix-proxy-sqlite3:ubuntu-trunk
+  image: zabbix/zabbix-proxy-sqlite3:ubuntu-4.0-latest
   ports:
    - "10061:10051"
   volumes:
@@ -113,7 +113,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-proxy-mysql:
-  image: zabbix/zabbix-proxy-mysql:ubuntu-trunk
+  image: zabbix/zabbix-proxy-mysql:ubuntu-4.0-latest
   ports:
    - "10071:10051"
   volumes:
@@ -166,7 +166,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-web-apache-mysql:
-  image: zabbix/zabbix-web-apache-mysql:ubuntu-trunk
+  image: zabbix/zabbix-web-apache-mysql:ubuntu-4.0-latest
   ports:
    - "80:80"
    - "443:443"
@@ -217,7 +217,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-web-nginx-mysql:
-  image: zabbix/zabbix-web-nginx-mysql:ubuntu-trunk
+  image: zabbix/zabbix-web-nginx-mysql:ubuntu-4.0-latest
   ports:
    - "8081:80"
    - "8443:443"
@@ -268,7 +268,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-agent:
-  image: zabbix/zabbix-agent:ubuntu-trunk
+  image: zabbix/zabbix-agent:ubuntu-4.0-latest
   ports:
    - "10050:10050"
   volumes:
@@ -308,7 +308,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-java-gateway:
-  image: zabbix/zabbix-java-gateway:ubuntu-trunk
+  image: zabbix/zabbix-java-gateway:ubuntu-4.0-latest
   ports:
    - "10052:10052"
   deploy:
@@ -335,7 +335,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-snmptraps:
-  image: zabbix/zabbix-snmptraps:ubuntu-trunk
+  image: zabbix/zabbix-snmptraps:ubuntu-4.0-latest
   ports:
    - "162:162/udp"
   volumes:
diff --git a/docker-compose_v3_ubuntu_pgsql_latest.yaml b/docker-compose_v3_ubuntu_pgsql_latest.yaml
index 75f5c9106..8c6feb890 100644
--- a/docker-compose_v3_ubuntu_pgsql_latest.yaml
+++ b/docker-compose_v3_ubuntu_pgsql_latest.yaml
@@ -1,7 +1,7 @@
 version: '3.5'
 services:
  zabbix-server:
-  image: zabbix/zabbix-server-pgsql:ubuntu-trunk
+  image: zabbix/zabbix-server-pgsql:ubuntu-4.0-latest
   ports:
    - "10051:10051"
   volumes:
@@ -62,7 +62,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-proxy-sqlite3:
-  image: zabbix/zabbix-proxy-sqlite3:ubuntu-trunk
+  image: zabbix/zabbix-proxy-sqlite3:ubuntu-4.0-latest
   ports:
    - "10061:10051"
   volumes:
@@ -113,7 +113,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-proxy-mysql:
-  image: zabbix/zabbix-proxy-mysql:ubuntu-trunk
+  image: zabbix/zabbix-proxy-mysql:ubuntu-4.0-latest
   ports:
    - "10071:10051"
   volumes:
@@ -166,7 +166,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-web-apache-pgsql:
-  image: zabbix/zabbix-web-apache-pgsql:ubuntu-trunk
+  image: zabbix/zabbix-web-apache-pgsql:ubuntu-4.0-latest
   ports:
    - "80:80"
    - "443:443"
@@ -217,7 +217,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-web-nginx-pgsql:
-  image: zabbix/zabbix-web-nginx-pgsql:ubuntu-trunk
+  image: zabbix/zabbix-web-nginx-pgsql:ubuntu-4.0-latest
   ports:
    - "8081:80"
    - "8443:443"
@@ -268,7 +268,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-agent:
-  image: zabbix/zabbix-agent:ubuntu-trunk
+  image: zabbix/zabbix-agent:ubuntu-4.0-latest
   ports:
    - "10050:10050"
   volumes:
@@ -308,7 +308,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-java-gateway:
-  image: zabbix/zabbix-java-gateway:ubuntu-trunk
+  image: zabbix/zabbix-java-gateway:ubuntu-4.0-latest
   ports:
    - "10052:10052"
   deploy:
@@ -335,7 +335,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-snmptraps:
-  image: zabbix/zabbix-snmptraps:ubuntu-trunk
+  image: zabbix/zabbix-snmptraps:ubuntu-4.0-latest
   ports:
    - "162:162/udp"
   volumes:
diff --git a/java-gateway/alpine/README.md b/java-gateway/alpine/README.md
index f507be718..adb869c93 100644
--- a/java-gateway/alpine/README.md
+++ b/java-gateway/alpine/README.md
@@ -20,9 +20,11 @@ These are the only official Zabbix Java Gateway Docker images. They are based on
     Zabbix Java Gateway 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)
     Zabbix Java Gateway 3.2 (tags: alpine-3.2-latest, ubuntu-3.2-latest, centos-3.2-latest)
     Zabbix Java Gateway 3.2.* (tags: alpine-3.2.*, ubuntu-3.2.*, centos-3.2.*)
-    Zabbix Java Gateway 3.4 (tags: alpine-3.4-latest, ubuntu-3.4-latest, centos-3.4-centos, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix Java Gateway 3.4 (tags: alpine-3.4-latest, ubuntu-3.4-latest, centos-3.4-centos)
     Zabbix Java Gateway 3.4.* (tags: alpine-3.4.*, ubuntu-3.4.*, centos-3.4.*)
-    Zabbix Java Gateway 4.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
+    Zabbix Java Gateway 4.0 (tags: alpine-4.0-latest, ubuntu-4.0-latest, centos-4.0-centos, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix Java Gateway 4.0.* (tags: alpine-4.0.*, ubuntu-4.0.*, centos-4.0.*)
+    Zabbix Java Gateway 4.2 (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 2d0b754dc..2221c6e48 100644
--- a/proxy-mysql/centos/README.md
+++ b/proxy-mysql/centos/README.md
@@ -20,9 +20,11 @@ These are the only official Zabbix proxy Docker images. They are based on Alpine
     Zabbix proxy 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)
     Zabbix proxy 3.2 (tags: alpine-3.2-latest, ubuntu-3.2-latest, centos-3.2-latest)
     Zabbix proxy 3.2.* (tags: alpine-3.2.*, ubuntu-3.2.*, centos-3.2.*)
-    Zabbix proxy 3.4 (tags: alpine-3.4-latest, ubuntu-3.4-latest, centos-3.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix proxy 3.4 (tags: alpine-3.4-latest, ubuntu-3.4-latest, centos-3.4-latest)
     Zabbix proxy 3.4.* (tags: alpine-3.4.*, ubuntu-3.4.*, centos-3.4.*)
-    Zabbix proxy 4.0 (tags: alpine-trunk, ubuntu-trunk)
+    Zabbix proxy 4.0 (tags: alpine-4.0-latest, ubuntu-4.0-latest, centos-4.0-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix proxy 4.0.* (tags: alpine-4.0.*, ubuntu-4.0.*, centos-4.0.*)
+    Zabbix proxy 4.2 (tags: alpine-trunk, ubuntu-trunk)
 
 Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
 
@@ -135,8 +137,6 @@ The variable enable communication with Zabbix Java Gateway to collect Java relat
 Additionally the image allows to specify many other environment variables listed below:
 
 ```
-ZBX_ENABLEREMOTECOMMANDS=0 # Available since 3.4.0
-ZBX_LOGREMOTECOMMANDS=0 # Available since 3.4.0
 ZBX_HOSTNAMEITEM=system.hostname
 ZBX_SOURCEIP=
 ZBX_PROXYLOCALBUFFER=0
diff --git a/proxy-mysql/ubuntu/README.md b/proxy-mysql/ubuntu/README.md
index 2d0b754dc..2221c6e48 100644
--- a/proxy-mysql/ubuntu/README.md
+++ b/proxy-mysql/ubuntu/README.md
@@ -20,9 +20,11 @@ These are the only official Zabbix proxy Docker images. They are based on Alpine
     Zabbix proxy 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)
     Zabbix proxy 3.2 (tags: alpine-3.2-latest, ubuntu-3.2-latest, centos-3.2-latest)
     Zabbix proxy 3.2.* (tags: alpine-3.2.*, ubuntu-3.2.*, centos-3.2.*)
-    Zabbix proxy 3.4 (tags: alpine-3.4-latest, ubuntu-3.4-latest, centos-3.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix proxy 3.4 (tags: alpine-3.4-latest, ubuntu-3.4-latest, centos-3.4-latest)
     Zabbix proxy 3.4.* (tags: alpine-3.4.*, ubuntu-3.4.*, centos-3.4.*)
-    Zabbix proxy 4.0 (tags: alpine-trunk, ubuntu-trunk)
+    Zabbix proxy 4.0 (tags: alpine-4.0-latest, ubuntu-4.0-latest, centos-4.0-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix proxy 4.0.* (tags: alpine-4.0.*, ubuntu-4.0.*, centos-4.0.*)
+    Zabbix proxy 4.2 (tags: alpine-trunk, ubuntu-trunk)
 
 Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
 
@@ -135,8 +137,6 @@ The variable enable communication with Zabbix Java Gateway to collect Java relat
 Additionally the image allows to specify many other environment variables listed below:
 
 ```
-ZBX_ENABLEREMOTECOMMANDS=0 # Available since 3.4.0
-ZBX_LOGREMOTECOMMANDS=0 # Available since 3.4.0
 ZBX_HOSTNAMEITEM=system.hostname
 ZBX_SOURCEIP=
 ZBX_PROXYLOCALBUFFER=0
diff --git a/proxy-sqlite3/alpine/README.md b/proxy-sqlite3/alpine/README.md
index 0962e4ffc..69d881a68 100644
--- a/proxy-sqlite3/alpine/README.md
+++ b/proxy-sqlite3/alpine/README.md
@@ -20,9 +20,11 @@ These are the only official Zabbix proxy Docker images. They are based on Alpine
     Zabbix proxy 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)
     Zabbix proxy 3.2 (tags: alpine-3.2-latest, ubuntu-3.2-latest, centos-3.2-latest)
     Zabbix proxy 3.2.* (tags: alpine-3.2.*, ubuntu-3.2.*, centos-3.2.*)
-    Zabbix proxy 3.4 (tags: alpine-3.4-latest, ubuntu-3.4-latest, centos-3.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix proxy 3.4 (tags: alpine-3.4-latest, ubuntu-3.4-latest, centos-3.4-latest)
     Zabbix proxy 3.4.* (tags: alpine-3.4.*, ubuntu-3.4.*, centos-3.4.*)
-    Zabbix proxy 4.0 (tags: alpine-trunk, ubuntu-trunk)
+    Zabbix proxy 4.0 (tags: alpine-4.0-latest, ubuntu-4.0-latest, centos-4.0-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix proxy 4.0.* (tags: alpine-4.0.*, ubuntu-4.0.*, centos-4.0.*)
+    Zabbix proxy 4.2 (tags: alpine-trunk, ubuntu-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 0f0038e27..efa21e910 100644
--- a/server-mysql/centos/README.md
+++ b/server-mysql/centos/README.md
@@ -22,9 +22,11 @@ These are the only official Zabbix server Docker images. They are based on Alpin
     Zabbix server 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)
     Zabbix server 3.2 (tags: alpine-3.2-latest, ubuntu-3.2-latest, centos-3.2-latest)
     Zabbix server 3.2.* (tags: alpine-3.2.*, ubuntu-3.2.*, centos-3.2.*)
-    Zabbix server 3.4 (tags: alpine-3.4-latest, ubuntu-3.4-latest, centos-3.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix server 3.4 (tags: alpine-3.4-latest, ubuntu-3.4-latest, centos-3.4-latest)
     Zabbix server 3.4.* (tags: alpine-3.4.*, ubuntu-3.4.*, centos-3.4.*)
-    Zabbix server 4.0 (tags: alpine-trunk, ubuntu-trunk)
+    Zabbix server 4.0 (tags: alpine-4.0-latest, ubuntu-4.0-latest, centos-4.0-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix server 4.0.* (tags: alpine-4.0.*, ubuntu-4.0.*, centos-4.0.*)
+    Zabbix server 4.2 (tags: alpine-trunk, ubuntu-trunk)
 
 Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
 
@@ -106,11 +108,8 @@ Additionally the image allows to specify many other environment variables listed
 
 ```
 ZBX_LISTENIP=
-ZBX_HISTORYSTORAGEURL= # Available since 3.4.0
-ZBX_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.0
 ZBX_STARTPOLLERS=5
 ZBX_IPMIPOLLERS=0
-ZBX_STARTPREPROCESSORS=3 # Available since 3.4.0
 ZBX_STARTPOLLERSUNREACHABLE=1
 ZBX_STARTTRAPPERS=5
 ZBX_STARTPINGERS=1
@@ -118,7 +117,6 @@ ZBX_STARTDISCOVERERS=1
 ZBX_STARTHTTPPOLLERS=1
 ZBX_STARTTIMERS=1
 ZBX_STARTESCALATORS=1
-ZBX_STARTALERTERS=3 # Available since 3.4.0
 ZBX_JAVAGATEWAY=zabbix-java-gateway
 ZBX_JAVAGATEWAYPORT=10052
 ZBX_STARTJAVAPOLLERS=5
diff --git a/server-mysql/ubuntu/README.md b/server-mysql/ubuntu/README.md
index 0f0038e27..efa21e910 100644
--- a/server-mysql/ubuntu/README.md
+++ b/server-mysql/ubuntu/README.md
@@ -22,9 +22,11 @@ These are the only official Zabbix server Docker images. They are based on Alpin
     Zabbix server 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)
     Zabbix server 3.2 (tags: alpine-3.2-latest, ubuntu-3.2-latest, centos-3.2-latest)
     Zabbix server 3.2.* (tags: alpine-3.2.*, ubuntu-3.2.*, centos-3.2.*)
-    Zabbix server 3.4 (tags: alpine-3.4-latest, ubuntu-3.4-latest, centos-3.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix server 3.4 (tags: alpine-3.4-latest, ubuntu-3.4-latest, centos-3.4-latest)
     Zabbix server 3.4.* (tags: alpine-3.4.*, ubuntu-3.4.*, centos-3.4.*)
-    Zabbix server 4.0 (tags: alpine-trunk, ubuntu-trunk)
+    Zabbix server 4.0 (tags: alpine-4.0-latest, ubuntu-4.0-latest, centos-4.0-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix server 4.0.* (tags: alpine-4.0.*, ubuntu-4.0.*, centos-4.0.*)
+    Zabbix server 4.2 (tags: alpine-trunk, ubuntu-trunk)
 
 Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
 
@@ -106,11 +108,8 @@ Additionally the image allows to specify many other environment variables listed
 
 ```
 ZBX_LISTENIP=
-ZBX_HISTORYSTORAGEURL= # Available since 3.4.0
-ZBX_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.0
 ZBX_STARTPOLLERS=5
 ZBX_IPMIPOLLERS=0
-ZBX_STARTPREPROCESSORS=3 # Available since 3.4.0
 ZBX_STARTPOLLERSUNREACHABLE=1
 ZBX_STARTTRAPPERS=5
 ZBX_STARTPINGERS=1
@@ -118,7 +117,6 @@ ZBX_STARTDISCOVERERS=1
 ZBX_STARTHTTPPOLLERS=1
 ZBX_STARTTIMERS=1
 ZBX_STARTESCALATORS=1
-ZBX_STARTALERTERS=3 # Available since 3.4.0
 ZBX_JAVAGATEWAY=zabbix-java-gateway
 ZBX_JAVAGATEWAYPORT=10052
 ZBX_STARTJAVAPOLLERS=5
diff --git a/server-pgsql/alpine/README.md b/server-pgsql/alpine/README.md
index f9fbe8077..990ba82ec 100644
--- a/server-pgsql/alpine/README.md
+++ b/server-pgsql/alpine/README.md
@@ -22,9 +22,11 @@ These are the only official Zabbix server Docker images. They are based on Alpin
     Zabbix server 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)
     Zabbix server 3.2 (tags: alpine-3.2-latest, ubuntu-3.2-latest, centos-3.2-latest)
     Zabbix server 3.2.* (tags: alpine-3.2.*, ubuntu-3.2.*, centos-3.2.*)
-    Zabbix server 3.4 (tags: alpine-3.4-latest, ubuntu-3.4-latest, centos-3.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix server 3.4 (tags: alpine-3.4-latest, ubuntu-3.4-latest, centos-3.4-latest)
     Zabbix server 3.4.* (tags: alpine-3.4.*, ubuntu-3.4.*, centos-3.4.*)
-    Zabbix server 4.0 (tags: alpine-trunk, ubuntu-trunk)
+    Zabbix server 4.0 (tags: alpine-4.0-latest, ubuntu-4.0-latest, centos-4.0-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix server 4.0.* (tags: alpine-4.0.*, ubuntu-4.0.*, centos-4.0.*)
+    Zabbix server 4.2 (tags: alpine-trunk, ubuntu-trunk)
 
 Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
 
diff --git a/snmptraps/centos/README.md b/snmptraps/centos/README.md
index 59654efc4..851fb8fb3 100644
--- a/snmptraps/centos/README.md
+++ b/snmptraps/centos/README.md
@@ -20,9 +20,11 @@ These are the only official Zabbix snmptraps Docker images. They are based on Al
     Zabbix snmptraps 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)
     Zabbix snmptraps 3.2 (tags: alpine-3.2-latest, ubuntu-3.2-latest, centos-3.2-latest)
     Zabbix snmptraps 3.2.* (tags: alpine-3.2.*, ubuntu-3.2.*, centos-3.2.*)
-    Zabbix snmptraps 3.4 (tags: alpine-3.4-latest, ubuntu-3.4-latest, centos-3.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix snmptraps 3.4 (tags: alpine-3.4-latest, ubuntu-3.4-latest, centos-3.4-latest)
     Zabbix snmptraps 3.4.* (tags: alpine-3.4.*, ubuntu-3.4.*, centos-3.4.*)
-    Zabbix snmptraps 4.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
+    Zabbix snmptraps 4.0 (tags: alpine-4.0-latest, ubuntu-4.0-latest, centos-4.0-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix snmptraps 4.0.* (tags: alpine-4.0.*, ubuntu-4.0.*, centos-4.0.*)
+    Zabbix snmptraps 4.2 (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 59654efc4..851fb8fb3 100644
--- a/snmptraps/ubuntu/README.md
+++ b/snmptraps/ubuntu/README.md
@@ -20,9 +20,11 @@ These are the only official Zabbix snmptraps Docker images. They are based on Al
     Zabbix snmptraps 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)
     Zabbix snmptraps 3.2 (tags: alpine-3.2-latest, ubuntu-3.2-latest, centos-3.2-latest)
     Zabbix snmptraps 3.2.* (tags: alpine-3.2.*, ubuntu-3.2.*, centos-3.2.*)
-    Zabbix snmptraps 3.4 (tags: alpine-3.4-latest, ubuntu-3.4-latest, centos-3.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix snmptraps 3.4 (tags: alpine-3.4-latest, ubuntu-3.4-latest, centos-3.4-latest)
     Zabbix snmptraps 3.4.* (tags: alpine-3.4.*, ubuntu-3.4.*, centos-3.4.*)
-    Zabbix snmptraps 4.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
+    Zabbix snmptraps 4.0 (tags: alpine-4.0-latest, ubuntu-4.0-latest, centos-4.0-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix snmptraps 4.0.* (tags: alpine-4.0.*, ubuntu-4.0.*, centos-4.0.*)
+    Zabbix snmptraps 4.2 (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 23bee9b96..66e13eb5f 100644
--- a/web-apache-mysql/alpine/README.md
+++ b/web-apache-mysql/alpine/README.md
@@ -20,9 +20,11 @@ These are the only official Zabbix web interface Docker images. They are based o
     Zabbix web interface 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)
     Zabbix web interface 3.2 (tags: alpine-3.2-latest, ubuntu-3.2-latest, centos-3.2-latest)
     Zabbix web interface 3.2.* (tags: alpine-3.2.*, ubuntu-3.2.*, centos-3.2.*)
-    Zabbix web interface 3.4 (tags: alpine-3.4-latest, ubuntu-3.4-latest, centos-3.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix web interface 3.4 (tags: alpine-3.4-latest, ubuntu-3.4-latest, centos-3.4-latest)
     Zabbix web interface 3.4.* (tags: alpine-3.4.*, ubuntu-3.4.*, centos-3.4.*)
-    Zabbix web interface 4.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
+    Zabbix web interface 4.0 (tags: alpine-4.0-latest, ubuntu-4.0-latest, centos-4.0-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix web interface 4.0.* (tags: alpine-4.0.*, ubuntu-4.0.*, centos-4.0.*)
+    Zabbix web interface 4.2 (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 e9578b5e2..ead23ae18 100644
--- a/web-apache-pgsql/centos/README.md
+++ b/web-apache-pgsql/centos/README.md
@@ -20,9 +20,11 @@ These are the only official Zabbix web interface Docker images. They are based o
     Zabbix web interface 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)
     Zabbix web interface 3.2 (tags: alpine-3.2-latest, ubuntu-3.2-latest, centos-3.2-latest)
     Zabbix web interface 3.2.* (tags: alpine-3.2.*, ubuntu-3.2.*, centos-3.2.*)
-    Zabbix web interface 3.4 (tags: alpine-3.4-latest, ubuntu-3.4-latest, centos-3.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix web interface 3.4 (tags: alpine-3.4-latest, ubuntu-3.4-latest, centos-3.4-latest)
     Zabbix web interface 3.4.* (tags: alpine-3.4.*, ubuntu-3.4.*, centos-3.4.*)
-    Zabbix web interface 4.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
+    Zabbix web interface 4.0 (tags: alpine-4.0-latest, ubuntu-4.0-latest, centos-4.0-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix web interface 4.0.* (tags: alpine-4.0.*, ubuntu-4.0.*, centos-4.0.*)
+    Zabbix web interface 4.2 (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 e9578b5e2..ead23ae18 100644
--- a/web-apache-pgsql/ubuntu/README.md
+++ b/web-apache-pgsql/ubuntu/README.md
@@ -20,9 +20,11 @@ These are the only official Zabbix web interface Docker images. They are based o
     Zabbix web interface 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)
     Zabbix web interface 3.2 (tags: alpine-3.2-latest, ubuntu-3.2-latest, centos-3.2-latest)
     Zabbix web interface 3.2.* (tags: alpine-3.2.*, ubuntu-3.2.*, centos-3.2.*)
-    Zabbix web interface 3.4 (tags: alpine-3.4-latest, ubuntu-3.4-latest, centos-3.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix web interface 3.4 (tags: alpine-3.4-latest, ubuntu-3.4-latest, centos-3.4-latest)
     Zabbix web interface 3.4.* (tags: alpine-3.4.*, ubuntu-3.4.*, centos-3.4.*)
-    Zabbix web interface 4.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
+    Zabbix web interface 4.0 (tags: alpine-4.0-latest, ubuntu-4.0-latest, centos-4.0-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix web interface 4.0.* (tags: alpine-4.0.*, ubuntu-4.0.*, centos-4.0.*)
+    Zabbix web interface 4.2 (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 a035e68c6..0dd90eef3 100644
--- a/web-nginx-mysql/alpine/README.md
+++ b/web-nginx-mysql/alpine/README.md
@@ -20,9 +20,11 @@ These are the only official Zabbix web interface Docker images. They are based o
     Zabbix web interface 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)
     Zabbix web interface 3.2 (tags: alpine-3.2-latest, ubuntu-3.2-latest, centos-3.2-latest)
     Zabbix web interface 3.2.* (tags: alpine-3.2.*, ubuntu-3.2.*, centos-3.2.*)
-    Zabbix web interface 3.4 (tags: alpine-3.4-latest, ubuntu-3.4-latest, centos-3.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix web interface 3.4 (tags: alpine-3.4-latest, ubuntu-3.4-latest, centos-3.4-latest)
     Zabbix web interface 3.4.* (tags: alpine-3.4.*, ubuntu-3.4.*, centos-3.4.*)
-    Zabbix web interface 4.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
+    Zabbix web interface 4.0 (tags: alpine-4.0-latest, ubuntu-4.0-latest, centos-4.0-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix web interface 4.0.* (tags: alpine-4.0.*, ubuntu-4.0.*, centos-4.0.*)
+    Zabbix web interface 4.2 (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 82974d997..6444532dd 100644
--- a/web-nginx-pgsql/centos/README.md
+++ b/web-nginx-pgsql/centos/README.md
@@ -20,9 +20,11 @@ These are the only official Zabbix web interface Docker images. They are based o
     Zabbix web interface 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)
     Zabbix web interface 3.2 (tags: alpine-3.2-latest, ubuntu-3.2-latest, centos-3.2-latest)
     Zabbix web interface 3.2.* (tags: alpine-3.2.*, ubuntu-3.2.*, centos-3.2.*)
-    Zabbix web interface 3.4 (tags: alpine-3.4-latest, ubuntu-3.4-latest, centos-3.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix web interface 3.4 (tags: alpine-3.4-latest, ubuntu-3.4-latest, centos-3.4-latest)
     Zabbix web interface 3.4.* (tags: alpine-3.4.*, ubuntu-3.4.*, centos-3.4.*)
-    Zabbix web interface 4.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
+    Zabbix web interface 4.0 (tags: alpine-4.0-latest, ubuntu-4.0-latest, centos-4.0-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix web interface 4.0.* (tags: alpine-4.0.*, ubuntu-4.0.*, centos-4.0.*)
+    Zabbix web interface 4.2 (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 82974d997..6444532dd 100644
--- a/web-nginx-pgsql/ubuntu/README.md
+++ b/web-nginx-pgsql/ubuntu/README.md
@@ -20,9 +20,11 @@ These are the only official Zabbix web interface Docker images. They are based o
     Zabbix web interface 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)
     Zabbix web interface 3.2 (tags: alpine-3.2-latest, ubuntu-3.2-latest, centos-3.2-latest)
     Zabbix web interface 3.2.* (tags: alpine-3.2.*, ubuntu-3.2.*, centos-3.2.*)
-    Zabbix web interface 3.4 (tags: alpine-3.4-latest, ubuntu-3.4-latest, centos-3.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix web interface 3.4 (tags: alpine-3.4-latest, ubuntu-3.4-latest, centos-3.4-latest)
     Zabbix web interface 3.4.* (tags: alpine-3.4.*, ubuntu-3.4.*, centos-3.4.*)
-    Zabbix web interface 4.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk)
+    Zabbix web interface 4.0 (tags: alpine-4.0-latest, ubuntu-4.0-latest, centos-4.0-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix web interface 4.0.* (tags: alpine-4.0.*, ubuntu-4.0.*, centos-4.0.*)
+    Zabbix web interface 4.2 (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/zabbix-appliance/alpine/README.md b/zabbix-appliance/alpine/README.md
index d58373441..5e14d8521 100644
--- a/zabbix-appliance/alpine/README.md
+++ b/zabbix-appliance/alpine/README.md
@@ -20,9 +20,11 @@ These are the only official Zabbix appliance Docker images. They are based on Al
     Zabbix appliance 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)
     Zabbix appliance 3.2 (tags: alpine-3.2-latest, ubuntu-3.2-latest, centos-3.2-latest)
     Zabbix appliance 3.2.* (tags: alpine-3.2.*, ubuntu-3.2.*, centos-3.2.*)
-    Zabbix appliance 3.4 (tags: alpine-3.4-latest, ubuntu-3.4-latest, centos-3.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix appliance 3.4 (tags: alpine-3.4-latest, ubuntu-3.4-latest, centos-3.4-latest)
     Zabbix appliance 3.4.* (tags: alpine-3.4.*, ubuntu-3.4.*, centos-3.4.*)
-    Zabbix appliance 4.0 (tags: alpine-trunk, ubuntu-trunk)
+    Zabbix appliance 4.0 (tags: alpine-4.0-latest, ubuntu-4.0-latest, centos-4.0-latest, alpine-latest, ubuntu-latest, centos-latest, latest)
+    Zabbix appliance 4.0.* (tags: alpine-4.0.*, ubuntu-4.0.*, centos-4.0.*)
+    Zabbix appliance 4.2 (tags: alpine-trunk, ubuntu-trunk)
 
 Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.