diff --git a/agent/alpine/Dockerfile b/agent/alpine/Dockerfile
index 72ef3eb21..545e574dc 100644
--- a/agent/alpine/Dockerfile
+++ b/agent/alpine/Dockerfile
@@ -36,11 +36,12 @@ RUN addgroup zabbix && \
             bash \
             iputils \
             libldap \
+            pcre \
             supervisor && \
     rm -rf /var/cache/apk/*
 
-ARG MAJOR_VERSION=master
-ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG MAJOR_VERSION=3.4
+ARG ZBX_VERSION=${MAJOR_VERSION}.6
 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
 
@@ -55,9 +56,8 @@ RUN apk update && \
             autoconf \
             automake \
             openssl-dev \
-            openldap-dev \
-            subversion \
-            coreutils && \
+            pcre-dev \
+            subversion && \
     cd /tmp/ && \
     svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} 1>/dev/null && \
     cd /tmp/zabbix-${ZBX_VERSION} && \
diff --git a/agent/ubuntu/Dockerfile b/agent/ubuntu/Dockerfile
index dcee51cdb..9396fed70 100644
--- a/agent/ubuntu/Dockerfile
+++ b/agent/ubuntu/Dockerfile
@@ -36,13 +36,14 @@ RUN locale-gen $LC_ALL && \
     chown --quiet -R zabbix:root /var/lib/zabbix && \
     apt-get ${APT_FLAGS_COMMON} update && \
     apt-get ${APT_FLAGS_PERSISTANT} install \
+            libpcre3 \
             supervisor 1>/dev/null && \
     apt-get ${APT_FLAGS_COMMON} autoremove && \
     apt-get ${APT_FLAGS_COMMON} clean && \
     rm -rf /var/lib/apt/lists/*
 
-ARG MAJOR_VERSION=master
-ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG MAJOR_VERSION=3.4
+ARG ZBX_VERSION=${MAJOR_VERSION}.6
 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
 
@@ -57,6 +58,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
             automake \
             libc6-dev \
             libldap2-dev \
+            libpcre3-dev \
             libssl-dev \
             make \
             pkg-config \
@@ -91,6 +93,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
             autoconf \
             automake \
             libc6-dev \
+            libpcre3-dev \
             libssl-dev \
             make \
             pkg-config \
diff --git a/docker-compose_v2_alpine_mysql_latest.yaml b/docker-compose_v2_alpine_mysql_latest.yaml
index 05a65dcb0..35614e856 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-latest
+  image: zabbix/zabbix-server-mysql:alpine-3.4-latest
   ports:
    - "10051:10051"
   volumes:
@@ -43,7 +43,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-proxy-sqlite3:
-  image: zabbix/zabbix-proxy-sqlite3:alpine-latest
+  image: zabbix/zabbix-proxy-sqlite3:alpine-3.4-latest
   ports:
    - "10061:10051"
   volumes:
@@ -83,7 +83,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-proxy-mysql:
-  image: zabbix/zabbix-proxy-mysql:alpine-latest
+  image: zabbix/zabbix-proxy-mysql:alpine-3.4-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-latest
+  image: zabbix/zabbix-web-apache-mysql:alpine-3.4-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-latest
+  image: zabbix/zabbix-web-nginx-mysql:alpine-3.4-latest
   ports:
    - "8081:80"
    - "8443:443"
@@ -186,7 +186,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-agent:
-  image: zabbix/zabbix-agent:alpine-latest
+  image: zabbix/zabbix-agent:alpine-3.4-latest
   ports:
    - "10050:10050"
   volumes:
@@ -216,7 +216,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-java-gateway:
-  image: zabbix/zabbix-java-gateway:alpine-latest
+  image: zabbix/zabbix-java-gateway:alpine-3.4-latest
   ports:
    - "10052:10052"
   env_file:
@@ -234,7 +234,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-snmptraps:
-  image: zabbix/zabbix-snmptraps:ubuntu-latest
+  image: zabbix/zabbix-snmptraps:ubuntu-3.4-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 39ede361f..93de34b97 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-latest
+  image: zabbix/zabbix-server-pgsql:alpine-3.4-latest
   ports:
    - "10051:10051"
   volumes:
@@ -43,7 +43,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-proxy-sqlite3:
-  image: zabbix/zabbix-proxy-sqlite3:alpine-latest
+  image: zabbix/zabbix-proxy-sqlite3:alpine-3.4-latest
   ports:
    - "10061:10051"
   volumes:
@@ -83,7 +83,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-proxy-mysql:
-  image: zabbix/zabbix-proxy-mysql:alpine-latest
+  image: zabbix/zabbix-proxy-mysql:alpine-3.4-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-latest
+  image: zabbix/zabbix-web-nginx-pgsql:alpine-3.4-latest
   ports:
    - "8081:80"
    - "8443:443"
@@ -186,7 +186,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-agent:
-  image: zabbix/zabbix-agent:alpine-latest
+  image: zabbix/zabbix-agent:alpine-3.4-latest
   ports:
    - "10050:10050"
   volumes:
@@ -216,7 +216,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-java-gateway:
-  image: zabbix/zabbix-java-gateway:alpine-latest
+  image: zabbix/zabbix-java-gateway:alpine-3.4-latest
   ports:
    - "10052:10052"
   env_file:
@@ -234,7 +234,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-snmptraps:
-  image: zabbix/zabbix-snmptraps:ubuntu-latest
+  image: zabbix/zabbix-snmptraps:ubuntu-3.4-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 1ad1ddc1f..b62f80e08 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-3.4-latest
+  image: zabbix/zabbix-server-mysql:centos-latest
   ports:
    - "10051:10051"
   volumes:
@@ -43,7 +43,7 @@ services:
    com.zabbix.os: "centos"
 
  zabbix-proxy-sqlite3:
-  image: zabbix/zabbix-proxy-sqlite3:centos-3.4-latest
+  image: zabbix/zabbix-proxy-sqlite3:centos-latest
   ports:
    - "10061:10051"
   volumes:
@@ -83,7 +83,7 @@ services:
    com.zabbix.os: "centos"
 
  zabbix-proxy-mysql:
-  image: zabbix/zabbix-proxy-mysql:centos-3.4-latest
+  image: zabbix/zabbix-proxy-mysql:centos-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-3.4-latest
+  image: zabbix/zabbix-web-apache-mysql:centos-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-3.4-latest
+  image: zabbix/zabbix-web-nginx-mysql:centos-latest
   ports:
    - "8081:80"
    - "8443:443"
@@ -186,7 +186,7 @@ services:
    com.zabbix.os: "centos"
 
  zabbix-agent:
-  image: zabbix/zabbix-agent:centos-3.4-latest
+  image: zabbix/zabbix-agent:centos-latest
   ports:
    - "10050:10050"
   volumes:
@@ -216,7 +216,7 @@ services:
    com.zabbix.os: "centos"
 
  zabbix-java-gateway:
-  image: zabbix/zabbix-java-gateway:centos-3.4-latest
+  image: zabbix/zabbix-java-gateway:centos-latest
   ports:
    - "10052:10052"
   env_file:
@@ -234,7 +234,7 @@ services:
    com.zabbix.os: "centos"
 
  zabbix-snmptraps:
-  image: zabbix/zabbix-snmptraps:ubuntu-3.4-latest
+  image: zabbix/zabbix-snmptraps:ubuntu-latest
   ports:
    - "162:162/udp"
   volumes:
diff --git a/docker-compose_v2_centos_mysql_latest.yaml.orig b/docker-compose_v2_centos_mysql_latest.yaml.orig
new file mode 100644
index 000000000..1ad1ddc1f
--- /dev/null
+++ b/docker-compose_v2_centos_mysql_latest.yaml.orig
@@ -0,0 +1,285 @@
+version: '2'
+services:
+ zabbix-server:
+  image: zabbix/zabbix-server-mysql:centos-3.4-latest
+  ports:
+   - "10051:10051"
+  volumes:
+   - /etc/localtime:/etc/localtime:ro
+   - /etc/timezone:/etc/timezone:ro 
+   - ./zbx_env/usr/lib/zabbix/alertscripts:/usr/lib/zabbix/alertscripts:ro
+   - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
+   - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
+   - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
+   - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro
+   - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro
+  volumes_from:
+   - zabbix-snmptraps:ro
+  links:
+   - mysql-server:mysql-server
+   - zabbix-java-gateway:zabbix-java-gateway
+  ulimits:
+   nproc: 65535
+   nofile:
+    soft: 20000
+    hard: 40000
+   mem_limit: 512m
+  env_file:
+   - .env_db_mysql
+   - .env_srv
+  user: root
+  networks:
+   zbx_net:
+    aliases:
+     - zabbix-server
+     - zabbix-server-mysql
+     - zabbix-server-centos-mysql
+     - zabbix-server-mysql-centos
+  labels:
+   com.zabbix.description: "Zabbix server with MySQL database support"
+   com.zabbix.company: "Zabbix SIA"
+   com.zabbix.component: "zabbix-server"
+   com.zabbix.dbtype: "mysql"
+   com.zabbix.os: "centos"
+
+ zabbix-proxy-sqlite3:
+  image: zabbix/zabbix-proxy-sqlite3:centos-3.4-latest
+  ports:
+   - "10061:10051"
+  volumes:
+   - /etc/localtime:/etc/localtime:ro
+   - /etc/timezone:/etc/timezone:ro 
+   - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
+   - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
+   - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
+   - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro
+   - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro
+  volumes_from:
+   - zabbix-snmptraps:ro
+  links:
+   - zabbix-server:zabbix-server
+   - zabbix-java-gateway:zabbix-java-gateway
+  ulimits:
+   nproc: 65535
+   nofile:
+    soft: 20000
+    hard: 40000
+   mem_limit: 512m
+  env_file:
+   - .env_prx
+   - .env_prx_sqlite3
+  user: root
+  networks:
+   zbx_net:
+    aliases:
+     - zabbix-proxy-sqlite3
+     - zabbix-proxy-centos-sqlite3
+     - zabbix-proxy-sqlite3-centos
+  labels:
+   com.zabbix.description: "Zabbix proxy with SQLite3 database support"
+   com.zabbix.company: "Zabbix SIA"
+   com.zabbix.component: "zabbix-proxy"
+   com.zabbix.dbtype: "sqlite3"
+   com.zabbix.os: "centos"
+
+ zabbix-proxy-mysql:
+  image: zabbix/zabbix-proxy-mysql:centos-3.4-latest
+  ports:
+   - "10071:10051"
+  volumes:
+   - /etc/localtime:/etc/localtime:ro
+   - /etc/timezone:/etc/timezone:ro 
+   - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
+   - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
+   - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
+   - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro
+   - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro
+  volumes_from:
+   - zabbix-snmptraps:ro
+  links:
+   - zabbix-server:zabbix-server
+   - zabbix-java-gateway:zabbix-java-gateway
+  ulimits:
+   nproc: 65535
+   nofile:
+    soft: 20000
+    hard: 40000
+   mem_limit: 512m
+  env_file:
+   - .env_db_mysql_proxy
+   - .env_prx
+   - .env_prx_mysql
+  user: root
+  networks:
+   zbx_net:
+    aliases:
+     - zabbix-proxy-mysql
+     - zabbix-proxy-centos-mysql
+     - zabbix-proxy-mysql-centos
+  labels:
+   com.zabbix.description: "Zabbix proxy with MySQL database support"
+   com.zabbix.company: "Zabbix SIA"
+   com.zabbix.component: "zabbix-proxy"
+   com.zabbix.dbtype: "mysql"
+   com.zabbix.os: "centos"
+
+ zabbix-web-apache-mysql:
+  image: zabbix/zabbix-web-apache-mysql:centos-3.4-latest
+  ports:
+   - "80:80"
+   - "443:443"
+  links:
+   - mysql-server:mysql-server
+   - zabbix-server:zabbix-server
+  mem_limit: 512m
+  volumes:
+   - /etc/localtime:/etc/localtime:ro
+   - /etc/timezone:/etc/timezone:ro
+   - ./zbx_env/etc/ssl/apache2:/etc/ssl/apache2:ro
+  env_file:
+   - .env_db_mysql
+   - .env_web
+  user: root
+  networks:
+   zbx_net:
+    aliases:
+     - zabbix-web-apache-mysql
+     - zabbix-web-apache-centos-mysql
+     - zabbix-web-apache-mysql-centos
+  labels:
+   com.zabbix.description: "Zabbix frontend on Apache web-server with MySQL database support"
+   com.zabbix.company: "Zabbix SIA"
+   com.zabbix.component: "zabbix-frontend"
+   com.zabbix.webserver: "apache2"
+   com.zabbix.dbtype: "mysql"
+   com.zabbix.os: "centos"
+
+ zabbix-web-nginx-mysql:
+  image: zabbix/zabbix-web-nginx-mysql:centos-3.4-latest
+  ports:
+   - "8081:80"
+   - "8443:443"
+  links:
+   - mysql-server:mysql-server
+   - zabbix-server:zabbix-server
+  mem_limit: 512m
+  volumes:
+   - /etc/localtime:/etc/localtime:ro
+   - /etc/timezone:/etc/timezone:ro
+   - ./zbx_env/etc/ssl/nginx:/etc/ssl/nginx:ro
+  env_file:
+   - .env_db_mysql
+   - .env_web
+  user: root
+  networks:
+   zbx_net:
+    aliases:
+     - zabbix-web-nginx-mysql
+     - zabbix-web-nginx-centos-mysql
+     - zabbix-web-nginx-mysql-centos
+  labels:
+   com.zabbix.description: "Zabbix frontend on Nginx web-server with MySQL database support"
+   com.zabbix.company: "Zabbix SIA"
+   com.zabbix.component: "zabbix-frontend"
+   com.zabbix.webserver: "nginx"
+   com.zabbix.dbtype: "mysql"
+   com.zabbix.os: "centos"
+
+ zabbix-agent:
+  image: zabbix/zabbix-agent:centos-3.4-latest
+  ports:
+   - "10050:10050"
+  volumes:
+   - /etc/localtime:/etc/localtime:ro
+   - /etc/timezone:/etc/timezone:ro
+   - ./zbx_env/etc/zabbix/zabbix_agentd.d:/etc/zabbix/zabbix_agentd.d:ro
+   - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
+   - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
+   - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro
+  links:
+   - zabbix-server:zabbix-server
+  env_file:
+   - .env_agent
+  user: root
+  privileged: true
+  pid: "host"
+  networks:
+   zbx_net:
+    aliases:
+     - zabbix-agent
+     - zabbix-agent-passive
+     - zabbix-agent-centos
+  labels:
+   com.zabbix.description: "Zabbix agent"
+   com.zabbix.company: "Zabbix SIA"
+   com.zabbix.component: "zabbix-agentd"
+   com.zabbix.os: "centos"
+
+ zabbix-java-gateway:
+  image: zabbix/zabbix-java-gateway:centos-3.4-latest
+  ports:
+   - "10052:10052"
+  env_file:
+   - .env_java
+  user: root
+  networks:
+   zbx_net:
+    aliases:
+     - zabbix-java-gateway
+     - zabbix-java-gateway-centos
+  labels:
+   com.zabbix.description: "Zabbix Java Gateway"
+   com.zabbix.company: "Zabbix SIA"
+   com.zabbix.component: "java-gateway"
+   com.zabbix.os: "centos"
+
+ zabbix-snmptraps:
+  image: zabbix/zabbix-snmptraps:ubuntu-3.4-latest
+  ports:
+   - "162:162/udp"
+  volumes:
+   - ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:rw
+  user: root
+  networks:
+   zbx_net:
+    aliases:
+     - zabbix-snmptraps
+  labels:
+   com.zabbix.description: "Zabbix snmptraps"
+   com.zabbix.company: "Zabbix SIA"
+   com.zabbix.component: "snmptraps"
+   com.zabbix.os: "ubuntu"
+
+ mysql-server:
+  image: mysql:5.7
+  command: [mysqld, --character-set-server=utf8, --collation-server=utf8_bin]
+  volumes_from:
+    - db_data_mysql
+  volume_driver: local
+  env_file:
+   - .env_db_mysql
+  user: root
+  networks:
+   zbx_net:
+    aliases:
+     - mysql-server
+     - zabbix-database
+     - mysql-database
+
+ db_data_mysql:
+    image: busybox
+    volumes:
+    - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw
+
+networks:
+  zbx_net:
+    driver: bridge
+    driver_opts:
+      com.docker.network.enable_ipv6: "false"
+    ipam:
+      driver: default
+      config:
+      - subnet: 172.16.238.0/24
+        gateway: 172.16.238.1
+#      - subnet: 2001:3984:3989::/64
+#        gateway: 2001:3984:3989::1
diff --git a/docker-compose_v2_centos_pgsql_latest.yaml b/docker-compose_v2_centos_pgsql_latest.yaml
index 2faac2e06..5a4894a98 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-3.4-latest
+  image: zabbix/zabbix-server-pgsql:centos-latest
   ports:
    - "10051:10051"
   volumes:
@@ -43,7 +43,7 @@ services:
    com.zabbix.os: "centos"
 
  zabbix-proxy-sqlite3:
-  image: zabbix/zabbix-proxy-sqlite3:centos-3.4-latest
+  image: zabbix/zabbix-proxy-sqlite3:centos-latest
   ports:
    - "10061:10051"
   volumes:
@@ -83,7 +83,7 @@ services:
    com.zabbix.os: "centos"
 
  zabbix-proxy-mysql:
-  image: zabbix/zabbix-proxy-mysql:centos-3.4-latest
+  image: zabbix/zabbix-proxy-mysql:centos-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-3.4-latest
+  image: zabbix/zabbix-web-apache-pgsql:centos-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-3.4-latest
+  image: zabbix/zabbix-web-nginx-pgsql:centos-latest
   ports:
    - "8081:80"
    - "8443:443"
@@ -186,7 +186,7 @@ services:
    com.zabbix.os: "centos"
 
  zabbix-agent:
-  image: zabbix/zabbix-agent:centos-3.4-latest
+  image: zabbix/zabbix-agent:centos-latest
   ports:
    - "10050:10050"
   volumes:
@@ -216,7 +216,7 @@ services:
    com.zabbix.os: "centos"
 
  zabbix-java-gateway:
-  image: zabbix/zabbix-java-gateway:centos-3.4-latest
+  image: zabbix/zabbix-java-gateway:centos-latest
   ports:
    - "10052:10052"
   env_file:
@@ -234,7 +234,7 @@ services:
    com.zabbix.os: "centos"
 
  zabbix-snmptraps:
-  image: zabbix/zabbix-snmptraps:ubuntu-3.4-latest
+  image: zabbix/zabbix-snmptraps:ubuntu-latest
   ports:
    - "162:162/udp"
   volumes:
diff --git a/docker-compose_v2_centos_pgsql_latest.yaml.orig b/docker-compose_v2_centos_pgsql_latest.yaml.orig
new file mode 100644
index 000000000..2faac2e06
--- /dev/null
+++ b/docker-compose_v2_centos_pgsql_latest.yaml.orig
@@ -0,0 +1,304 @@
+version: '2'
+services:
+ zabbix-server:
+  image: zabbix/zabbix-server-pgsql:centos-3.4-latest
+  ports:
+   - "10051:10051"
+  volumes:
+   - /etc/localtime:/etc/localtime:ro
+   - /etc/timezone:/etc/timezone:ro 
+   - ./zbx_env/usr/lib/zabbix/alertscripts:/usr/lib/zabbix/alertscripts:ro
+   - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
+   - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
+   - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
+   - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro
+   - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro
+  volumes_from:
+   - zabbix-snmptraps:ro
+  links:
+   - postgres-server:postgres-server
+   - zabbix-java-gateway:zabbix-java-gateway
+  ulimits:
+   nproc: 65535
+   nofile:
+    soft: 20000
+    hard: 40000
+   mem_limit: 512m
+  env_file:
+   - .env_db_pgsql
+   - .env_srv
+  user: root
+  networks:
+   zbx_net:
+    aliases:
+     - zabbix-server
+     - zabbix-server-pgsql
+     - zabbix-server-centos-pgsql
+     - zabbix-server-pgsql-centos
+  labels:
+   com.zabbix.description: "Zabbix server with PostgreSQL database support"
+   com.zabbix.company: "Zabbix SIA"
+   com.zabbix.component: "zabbix-server"
+   com.zabbix.dbtype: "pgsql"
+   com.zabbix.os: "centos"
+
+ zabbix-proxy-sqlite3:
+  image: zabbix/zabbix-proxy-sqlite3:centos-3.4-latest
+  ports:
+   - "10061:10051"
+  volumes:
+   - /etc/localtime:/etc/localtime:ro
+   - /etc/timezone:/etc/timezone:ro 
+   - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
+   - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
+   - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
+   - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro
+   - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro
+  volumes_from:
+   - zabbix-snmptraps:ro
+  links:
+   - zabbix-server:zabbix-server
+   - zabbix-java-gateway:zabbix-java-gateway
+  ulimits:
+   nproc: 65535
+   nofile:
+    soft: 20000
+    hard: 40000
+   mem_limit: 512m
+  env_file:
+   - .env_prx
+   - .env_prx_sqlite3
+  user: root
+  networks:
+   zbx_net:
+    aliases:
+     - zabbix-proxy-sqlite3
+     - zabbix-proxy-centos-sqlite3
+     - zabbix-proxy-sqlite3-centos
+  labels:
+   com.zabbix.description: "Zabbix proxy with SQLite3 database support"
+   com.zabbix.company: "Zabbix SIA"
+   com.zabbix.component: "zabbix-proxy"
+   com.zabbix.dbtype: "sqlite3"
+   com.zabbix.os: "centos"
+
+ zabbix-proxy-mysql:
+  image: zabbix/zabbix-proxy-mysql:centos-3.4-latest
+  ports:
+   - "10071:10051"
+  volumes:
+   - /etc/localtime:/etc/localtime:ro
+   - /etc/timezone:/etc/timezone:ro 
+   - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
+   - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
+   - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
+   - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro
+   - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro
+  volumes_from:
+   - zabbix-snmptraps:ro
+  links:
+   - zabbix-server:zabbix-server
+   - zabbix-java-gateway:zabbix-java-gateway
+  ulimits:
+   nproc: 65535
+   nofile:
+    soft: 20000
+    hard: 40000
+   mem_limit: 512m
+  env_file:
+   - .env_db_mysql_proxy
+   - .env_prx
+   - .env_prx_mysql
+  user: root
+  networks:
+   zbx_net:
+    aliases:
+     - zabbix-proxy-mysql
+     - zabbix-proxy-centos-mysql
+     - zabbix-proxy-mysql-centos
+  labels:
+   com.zabbix.description: "Zabbix proxy with MySQL database support"
+   com.zabbix.company: "Zabbix SIA"
+   com.zabbix.component: "zabbix-proxy"
+   com.zabbix.dbtype: "mysql"
+   com.zabbix.os: "centos"
+
+ zabbix-web-apache-pgsql:
+  image: zabbix/zabbix-web-apache-pgsql:centos-3.4-latest
+  ports:
+   - "80:80"
+   - "443:443"
+  links:
+   - postgres-server:postgres-server
+   - zabbix-server:zabbix-server
+  mem_limit: 512m
+  volumes:
+   - /etc/localtime:/etc/localtime:ro
+   - /etc/timezone:/etc/timezone:ro
+   - ./zbx_env/etc/ssl/apache2:/etc/ssl/apache2:ro
+  env_file:
+   - .env_db_pgsql
+   - .env_web
+  user: root
+  networks:
+   zbx_net:
+    aliases:
+     - zabbix-web-apache-pgsql
+     - zabbix-web-apache-centos-pgsql
+     - zabbix-web-apache-pgsql-centos
+  labels:
+   com.zabbix.description: "Zabbix frontend on Apache web-server with PostgreSQL database support"
+   com.zabbix.company: "Zabbix SIA"
+   com.zabbix.component: "zabbix-frontend"
+   com.zabbix.webserver: "apache2"
+   com.zabbix.dbtype: "pgsql"
+   com.zabbix.os: "centos"
+
+ zabbix-web-nginx-pgsql:
+  image: zabbix/zabbix-web-nginx-pgsql:centos-3.4-latest
+  ports:
+   - "8081:80"
+   - "8443:443"
+  links:
+   - postgres-server:postgres-server
+   - zabbix-server:zabbix-server
+  mem_limit: 512m
+  volumes:
+   - /etc/localtime:/etc/localtime:ro
+   - /etc/timezone:/etc/timezone:ro
+   - ./zbx_env/etc/ssl/nginx:/etc/ssl/nginx:ro
+  env_file:
+   - .env_db_pgsql
+   - .env_web
+  user: root
+  networks:
+   zbx_net:
+    aliases:
+     - zabbix-web-nginx-pgsql
+     - zabbix-web-nginx-centos-pgsql
+     - zabbix-web-nginx-pgsql-centos
+  labels:
+   com.zabbix.description: "Zabbix frontend on Nginx web-server with PostgreSQL database support"
+   com.zabbix.company: "Zabbix SIA"
+   com.zabbix.component: "zabbix-frontend"
+   com.zabbix.webserver: "nginx"
+   com.zabbix.dbtype: "pgsql"
+   com.zabbix.os: "centos"
+
+ zabbix-agent:
+  image: zabbix/zabbix-agent:centos-3.4-latest
+  ports:
+   - "10050:10050"
+  volumes:
+   - /etc/localtime:/etc/localtime:ro
+   - /etc/timezone:/etc/timezone:ro
+   - ./zbx_env/etc/zabbix/zabbix_agentd.d:/etc/zabbix/zabbix_agentd.d:ro
+   - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
+   - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
+   - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro
+  links:
+   - zabbix-server:zabbix-server
+  env_file:
+   - .env_agent
+  user: root
+  privileged: true
+  pid: "host"
+  networks:
+   zbx_net:
+    aliases:
+     - zabbix-agent
+     - zabbix-agent-passive
+     - zabbix-agent-centos
+  labels:
+   com.zabbix.description: "Zabbix agent"
+   com.zabbix.company: "Zabbix SIA"
+   com.zabbix.component: "zabbix-agentd"
+   com.zabbix.os: "centos"
+
+ zabbix-java-gateway:
+  image: zabbix/zabbix-java-gateway:centos-3.4-latest
+  ports:
+   - "10052:10052"
+  env_file:
+   - .env_java
+  user: root
+  networks:
+   zbx_net:
+    aliases:
+     - zabbix-java-gateway
+     - zabbix-java-gateway-centos
+  labels:
+   com.zabbix.description: "Zabbix Java Gateway"
+   com.zabbix.company: "Zabbix SIA"
+   com.zabbix.component: "java-gateway"
+   com.zabbix.os: "centos"
+
+ zabbix-snmptraps:
+  image: zabbix/zabbix-snmptraps:ubuntu-3.4-latest
+  ports:
+   - "162:162/udp"
+  volumes:
+   - ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:rw
+  user: root
+  networks:
+   zbx_net:
+    aliases:
+     - zabbix-snmptraps
+  labels:
+   com.zabbix.description: "Zabbix snmptraps"
+   com.zabbix.company: "Zabbix SIA"
+   com.zabbix.component: "snmptraps"
+   com.zabbix.os: "ubuntu"
+
+ mysql-server:
+  image: mysql:5.7
+  command: [mysqld, --character-set-server=utf8, --collation-server=utf8_bin]
+  volumes_from:
+    - db_data_mysql
+  volume_driver: local
+  env_file:
+   - .env_db_mysql
+  user: root
+  networks:
+   zbx_net:
+    aliases:
+     - mysql-server
+     - mysql-database
+
+ postgres-server:
+  image: postgres:latest
+  volumes_from:
+   - db_data_pgsql
+  volume_driver: local
+  env_file:
+   - .env_db_pgsql
+  user: root
+  networks:
+   zbx_net:
+    aliases:
+     - postgres-server
+     - pgsql-server
+     - pgsql-database
+
+ db_data_mysql:
+    image: busybox
+    volumes:
+    - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw
+
+ db_data_pgsql:
+    image: busybox
+    volumes:
+    - ./zbx_env/var/lib/postgresql/data:/var/lib/postgresql/data:rw
+
+networks:
+  zbx_net:
+    driver: bridge
+    driver_opts:
+      com.docker.network.enable_ipv6: "false"
+    ipam:
+      driver: default
+      config:
+      - subnet: 172.16.238.0/24
+        gateway: 172.16.238.1
+#      - subnet: 2001:3984:3989::/64
+#        gateway: 2001:3984:3989::1
diff --git a/docker-compose_v2_ubuntu_mysql_latest.yaml b/docker-compose_v2_ubuntu_mysql_latest.yaml
index 70e2b34bc..0d276ea45 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-latest
+  image: zabbix/zabbix-server-mysql:ubuntu-3.4-latest
   ports:
    - "10051:10051"
   volumes:
@@ -44,7 +44,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-proxy-sqlite3:
-  image: zabbix/zabbix-proxy-sqlite3:ubuntu-latest
+  image: zabbix/zabbix-proxy-sqlite3:ubuntu-3.4-latest
   ports:
    - "10061:10051"
   volumes:
@@ -84,7 +84,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-proxy-mysql:
-  image: zabbix/zabbix-proxy-mysql:ubuntu-latest
+  image: zabbix/zabbix-proxy-mysql:ubuntu-3.4-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-latest
+  image: zabbix/zabbix-web-apache-mysql:ubuntu-3.4-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-latest
+  image: zabbix/zabbix-web-nginx-mysql:ubuntu-3.4-latest
   ports:
    - "8081:80"
    - "8443:443"
@@ -187,7 +187,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-agent:
-  image: zabbix/zabbix-agent:ubuntu-latest
+  image: zabbix/zabbix-agent:ubuntu-3.4-latest
   ports:
    - "10050:10050"
   volumes:
@@ -217,7 +217,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-java-gateway:
-  image: zabbix/zabbix-java-gateway:ubuntu-latest
+  image: zabbix/zabbix-java-gateway:ubuntu-3.4-latest
   ports:
    - "10052:10052"
   env_file:
@@ -235,7 +235,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-snmptraps:
-  image: zabbix/zabbix-snmptraps:ubuntu-latest
+  image: zabbix/zabbix-snmptraps:ubuntu-3.4-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 713a2e4f1..a4dba60b2 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-latest
+  image: zabbix/zabbix-server-pgsql:ubuntu-3.4-latest
   ports:
    - "10051:10051"
   volumes:
@@ -43,7 +43,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-proxy-sqlite3:
-  image: zabbix/zabbix-proxy-sqlite3:ubuntu-latest
+  image: zabbix/zabbix-proxy-sqlite3:ubuntu-3.4-latest
   ports:
    - "10061:10051"
   volumes:
@@ -83,7 +83,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-proxy-mysql:
-  image: zabbix/zabbix-proxy-mysql:ubuntu-latest
+  image: zabbix/zabbix-proxy-mysql:ubuntu-3.4-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-latest
+  image: zabbix/zabbix-web-apache-pgsql:ubuntu-3.4-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-latest
+  image: zabbix/zabbix-web-nginx-pgsql:ubuntu-3.4-latest
   ports:
    - "8081:80"
    - "8443:443"
@@ -186,7 +186,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-agent:
-  image: zabbix/zabbix-agent:ubuntu-latest
+  image: zabbix/zabbix-agent:ubuntu-3.4-latest
   ports:
    - "10050:10050"
   volumes:
@@ -216,7 +216,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-java-gateway:
-  image: zabbix/zabbix-java-gateway:ubuntu-latest
+  image: zabbix/zabbix-java-gateway:ubuntu-3.4-latest
   ports:
    - "10052:10052"
   env_file:
@@ -234,7 +234,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-snmptraps:
-  image: zabbix/zabbix-snmptraps:ubuntu-latest
+  image: zabbix/zabbix-snmptraps:ubuntu-3.4-latest
   ports:
    - "162:162/udp"
   volumes:
diff --git a/java-gateway/alpine/Dockerfile b/java-gateway/alpine/Dockerfile
index 4a5f6328b..71e2be20d 100644
--- a/java-gateway/alpine/Dockerfile
+++ b/java-gateway/alpine/Dockerfile
@@ -34,8 +34,8 @@ RUN addgroup zabbix && \
             supervisor && \
     rm -rf /var/cache/apk/*
 
-ARG MAJOR_VERSION=master
-ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG MAJOR_VERSION=3.4
+ARG ZBX_VERSION=${MAJOR_VERSION}.6
 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
 
diff --git a/java-gateway/ubuntu/Dockerfile b/java-gateway/ubuntu/Dockerfile
index 673417e90..65d884fc8 100644
--- a/java-gateway/ubuntu/Dockerfile
+++ b/java-gateway/ubuntu/Dockerfile
@@ -39,8 +39,8 @@ RUN locale-gen $LC_ALL && \
     apt-get ${APT_FLAGS_COMMON} clean && \
     rm -rf /var/lib/apt/lists/*
 
-ARG MAJOR_VERSION=master
-ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG MAJOR_VERSION=3.4
+ARG ZBX_VERSION=${MAJOR_VERSION}.6
 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
 
diff --git a/kubernetes.yaml b/kubernetes.yaml
index 40e162483..d4db40aab 100644
--- a/kubernetes.yaml
+++ b/kubernetes.yaml
@@ -148,7 +148,7 @@ spec:
     spec:
       containers:
         - name: zabbix-web
-          image: zabbix/zabbix-web-nginx-mysql:alpine-latest
+          image: zabbix/zabbix-web-nginx-mysql:alpine-3.4-latest
           imagePullPolicy: Always
           ports:
           - containerPort: 80
@@ -282,7 +282,7 @@ spec:
     spec:
       containers:
         - name: zabbix-server
-          image: zabbix/zabbix-server-mysql:alpine-latest
+          image: zabbix/zabbix-server-mysql:alpine-3.4-latest
           imagePullPolicy: Always
           ports:
           - containerPort: 10051
@@ -331,7 +331,7 @@ spec:
             mountPath: /var/lib/zabbix/snmptraps/
             readOnly: true
         - name: zabbix-snmptraps
-          image: zabbix/zabbix-snmptraps:latest
+          image: zabbix/zabbix-snmptraps:ubuntu-3.4-latest
           imagePullPolicy: Always
           ports:
           - containerPort: 162
@@ -364,7 +364,7 @@ spec:
     spec:
       containers:
         - name: zabbix-proxy-sqlite3
-          image: zabbix/zabbix-proxy-sqlite3:alpine-latest
+          image: zabbix/zabbix-proxy-sqlite3:alpine-3.4-latest
           imagePullPolicy: Always
           ports:
           - containerPort: 10051
@@ -396,7 +396,7 @@ spec:
     spec:
       containers:
         - name: zabbix-proxy-mysql
-          image: zabbix/zabbix-proxy-mysql:alpine-latest
+          image: zabbix/zabbix-proxy-mysql:alpine-3.4-latest
           imagePullPolicy: Always
           ports:
           - containerPort: 10051
@@ -439,7 +439,7 @@ spec:
     spec:
       containers:
         - name: zabbix-java-gateway
-          image: zabbix/zabbix-java-gateway:alpine-latest
+          image: zabbix/zabbix-java-gateway:alpine-3.4-latest
           imagePullPolicy: Always
           ports:
           - containerPort: 10052
@@ -470,7 +470,7 @@ spec:
     spec:
       containers:
         - name: zabbix-agent
-          image: zabbix/zabbix-agent:alpine-latest
+          image: zabbix/zabbix-agent:alpine-3.4-latest
           imagePullPolicy: Always
           resources:
            limits:
diff --git a/proxy-mysql/alpine/Dockerfile b/proxy-mysql/alpine/Dockerfile
index 1942a7fd4..07b19f5fb 100644
--- a/proxy-mysql/alpine/Dockerfile
+++ b/proxy-mysql/alpine/Dockerfile
@@ -45,6 +45,7 @@ RUN addgroup zabbix && \
             bash \
             iputils \
             libcurl \
+            libevent \
             libldap \
             libssh2 \
             libxml2 \
@@ -52,13 +53,14 @@ RUN addgroup zabbix && \
             mariadb-client-libs \
             net-snmp-agent-libs \
             openipmi-libs \
+            pcre \
             supervisor \
             unixodbc \
             fping && \
     rm -rf /var/cache/apk/*
 
-ARG MAJOR_VERSION=master
-ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG MAJOR_VERSION=3.4
+ARG ZBX_VERSION=${MAJOR_VERSION}.6
 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
 
@@ -72,12 +74,14 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
             automake \
             coreutils \
             curl-dev \
+            libevent-dev \
             libssh2-dev \
             libxml2-dev \
             mysql-dev \
             net-snmp-dev \
             openipmi-dev \
             openldap-dev \
+            pcre-dev \
             subversion \
             unixodbc-dev \
             alpine-sdk && \
diff --git a/proxy-mysql/ubuntu/Dockerfile b/proxy-mysql/ubuntu/Dockerfile
index 52c155846..17feae171 100644
--- a/proxy-mysql/ubuntu/Dockerfile
+++ b/proxy-mysql/ubuntu/Dockerfile
@@ -50,8 +50,10 @@ RUN locale-gen $LC_ALL && \
     apt-get ${APT_FLAGS_PERSISTANT} install \
             fping \
             libcurl3 \
+            libevent-2.0
             libmysqlclient18 \
             libopenipmi0 \
+            libpcre3 \
             libsnmp30 \
             libssh2-1 \
             libssl1.0.0 \
@@ -64,8 +66,8 @@ RUN locale-gen $LC_ALL && \
     apt-get ${APT_FLAGS_COMMON} clean && \
     rm -rf /var/lib/apt/lists/*
 
-ARG MAJOR_VERSION=master
-ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG MAJOR_VERSION=3.4
+ARG ZBX_VERSION=${MAJOR_VERSION}.6
 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
 
@@ -81,9 +83,11 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
             gcc \
             libc6-dev \
             libcurl4-openssl-dev \
+            libevent-dev \
             libldap2-dev \
             libmysqlclient-dev \
             libopenipmi-dev \
+            libpcre3-dev \
             libsnmp-dev \
             libssh2-1-dev \
             libxml2-dev \
@@ -134,9 +138,11 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
             gcc \
             libc6-dev \
             libcurl4-openssl-dev \
+            libevent-dev \
             libldap2-dev \
             libmysqlclient-dev \
             libopenipmi-dev \
+            libpcre3-dev \
             libsnmp-dev \
             libssh2-1-dev \
             libxml2-dev \
diff --git a/proxy-sqlite3/alpine/Dockerfile b/proxy-sqlite3/alpine/Dockerfile
index 4a15f1126..84c1ee4c6 100644
--- a/proxy-sqlite3/alpine/Dockerfile
+++ b/proxy-sqlite3/alpine/Dockerfile
@@ -45,18 +45,20 @@ RUN addgroup zabbix && \
             fping \
             iputils \
             libcurl \
+            libevent \
             libldap \
             libssh2 \
             libxml2 \
             net-snmp-agent-libs \
             openipmi-libs \
+            pcre \
             sqlite-libs \
             supervisor \
             unixodbc && \
     rm -rf /var/cache/apk/*
 
-ARG MAJOR_VERSION=master
-ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG MAJOR_VERSION=3.4
+ARG ZBX_VERSION=${MAJOR_VERSION}.6
 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
 
@@ -71,11 +73,13 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
             automake \
             coreutils \
             curl-dev \
+            libevent-dev \
             libssh2-dev \
             libxml2-dev \
             net-snmp-dev \
             openipmi-dev \
             openldap-dev \
+            pcre-dev \
             sqlite-dev \
             subversion \
             unixodbc-dev && \
diff --git a/proxy-sqlite3/ubuntu/Dockerfile b/proxy-sqlite3/ubuntu/Dockerfile
index 58f8311a7..5c25a7bb2 100644
--- a/proxy-sqlite3/ubuntu/Dockerfile
+++ b/proxy-sqlite3/ubuntu/Dockerfile
@@ -49,7 +49,9 @@ RUN locale-gen $LC_ALL && \
     apt-get ${APT_FLAGS_PERSISTANT} install \
             fping \
             libcurl3 \
+            libevent-2.0 \
             libopenipmi0 \
+            libpcre3 \
             libsnmp30 \
             libsqlite3-0 \
             libssh2-1 \
@@ -62,8 +64,8 @@ RUN locale-gen $LC_ALL && \
     apt-get ${APT_FLAGS_COMMON} clean && \
     rm -rf /var/lib/apt/lists/*
 
-ARG MAJOR_VERSION=master
-ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG MAJOR_VERSION=3.4
+ARG ZBX_VERSION=${MAJOR_VERSION}.6
 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
 
@@ -79,8 +81,10 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
             gcc \
             libc6-dev \
             libcurl4-openssl-dev \
+            libevent-dev \
             libldap2-dev \
             libopenipmi-dev \
+            libpcre3-dev \
             libsnmp-dev \
             libsqlite3-dev \
             libssh2-1-dev \
@@ -129,8 +133,10 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
             gcc \
             libc6-dev \
             libcurl4-openssl-dev \
+            libevent-dev \
             libldap2-dev \
             libopenipmi-dev \
+            libpcre3-dev \
             libsnmp-dev \
             libsqlite3-dev \
             libssh2-1-dev \
diff --git a/server-mysql/alpine/Dockerfile b/server-mysql/alpine/Dockerfile
index df0ae88c1..02792d6e9 100644
--- a/server-mysql/alpine/Dockerfile
+++ b/server-mysql/alpine/Dockerfile
@@ -48,6 +48,7 @@ RUN addgroup zabbix && \
             fping \
             iputils \
             libcurl \
+            libevent \
             libldap \
             libssh2 \
             libxml2 \
@@ -55,12 +56,13 @@ RUN addgroup zabbix && \
             mariadb-client-libs \
             net-snmp-agent-libs \
             openipmi-libs \
+            pcre \
             supervisor \
             unixodbc && \
     rm -rf /var/cache/apk/*
 
-ARG MAJOR_VERSION=master
-ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG MAJOR_VERSION=3.4
+ARG ZBX_VERSION=${MAJOR_VERSION}.6
 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
 
@@ -75,12 +77,14 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
             automake \
             coreutils \
             curl-dev \
+            libevent-dev \
             libssh2-dev \
             libxml2-dev \
             mysql-dev \
             net-snmp-dev \
             openipmi-dev \
             openldap-dev \
+            pcre-dev \
             subversion \
             unixodbc-dev && \
     cd /tmp/ && \
diff --git a/server-mysql/ubuntu/Dockerfile b/server-mysql/ubuntu/Dockerfile
index 72d483ec5..e13d4746a 100644
--- a/server-mysql/ubuntu/Dockerfile
+++ b/server-mysql/ubuntu/Dockerfile
@@ -52,9 +52,11 @@ RUN locale-gen $LC_ALL && \
     apt-get ${APT_FLAGS_PERSISTANT} install \
             fping \
             libcurl3 
+            libevent-2.0 \
             libiksemel3 \
             libmysqlclient18 \
             libopenipmi0 \
+            libpcre3 \
             libsnmp30 \
             libssh2-1 \
             libssl1.0.0 \
@@ -67,8 +69,8 @@ RUN locale-gen $LC_ALL && \
     apt-get ${APT_FLAGS_COMMON} clean && \
     rm -rf /var/lib/apt/lists/*
 
-ARG MAJOR_VERSION=master
-ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG MAJOR_VERSION=3.4
+ARG ZBX_VERSION=${MAJOR_VERSION}.6
 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
 
@@ -84,10 +86,12 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
             gcc \
             libc6-dev \
             libcurl4-openssl-dev \
+            libevent-dev \
             libiksemel-dev \
             libldap2-dev \
             libmysqlclient-dev \
             libopenipmi-dev \
+            libpcre3-dev \
             libsnmp-dev \
             libssh2-1-dev \
             libxml2-dev \
@@ -141,10 +145,12 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
             gcc \
             libc6-dev \
             libcurl4-openssl-dev \
+            libevent-dev \
             libiksemel-dev \
             libldap2-dev \
             libmysqlclient-dev \
             libopenipmi-dev \
+            libpcre3-dev \
             libsnmp-dev \
             libssh2-1-dev \
             libxml2-dev \
diff --git a/server-pgsql/alpine/Dockerfile b/server-pgsql/alpine/Dockerfile
index 60310b3b5..8f099d346 100644
--- a/server-pgsql/alpine/Dockerfile
+++ b/server-pgsql/alpine/Dockerfile
@@ -48,19 +48,21 @@ RUN addgroup zabbix && \
             fping \
             iputils \
             libcurl \
+            libevent \
             libldap \
             libssh2 \
             libxml2 \
             net-snmp-agent-libs \
             openipmi-libs \
+            pcre \
             postgresql-client \
             postgresql-libs \
             supervisor \
             unixodbc && \
     rm -rf /var/cache/apk/*
 
-ARG MAJOR_VERSION=master
-ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG MAJOR_VERSION=3.4
+ARG ZBX_VERSION=${MAJOR_VERSION}.6
 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
 
@@ -75,11 +77,13 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
             automake \
             coreutils \
             curl-dev \
+            libevent-dev \
             libssh2-dev \
             libxml2-dev \
             net-snmp-dev \
             openipmi-dev \
             openldap-dev \
+            pcre-dev \
             postgresql-dev \
             subversion \
             unixodbc-dev && \
diff --git a/server-pgsql/ubuntu/Dockerfile b/server-pgsql/ubuntu/Dockerfile
index cb53966ae..25807a008 100644
--- a/server-pgsql/ubuntu/Dockerfile
+++ b/server-pgsql/ubuntu/Dockerfile
@@ -52,8 +52,10 @@ RUN locale-gen $LC_ALL && \
     apt-get ${APT_FLAGS_PERSISTANT} install \
             fping \
             libcurl3 \
+            libevent-2.0 \
             libiksemel3 \
             libopenipmi0 \
+            libpcre3 \
             libpq5 \
             libsnmp30 \
             libssh2-1 \
@@ -67,8 +69,8 @@ RUN locale-gen $LC_ALL && \
     apt-get ${APT_FLAGS_COMMON} clean && \
     rm -rf /var/lib/apt/lists/*
 
-ARG MAJOR_VERSION=master
-ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG MAJOR_VERSION=3.4
+ARG ZBX_VERSION=${MAJOR_VERSION}.6
 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
 
@@ -84,9 +86,11 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
             gcc \
             libc6-dev \
             libcurl4-openssl-dev \
+            libevent-dev \
             libiksemel-dev \
             libldap2-dev \
             libopenipmi-dev \
+            libpcre3-dev \
             libpq-dev \
             libsnmp-dev \
             libssh2-1-dev \
@@ -141,9 +145,11 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
             gcc \
             libc6-dev \
             libcurl4-openssl-dev \
+            libevent-dev \
             libiksemel-dev \
             libldap2-dev \
             libopenipmi-dev \
+            libpcre3-dev \
             libpq-dev \
             libsnmp-dev \
             libssh2-1-dev \
diff --git a/web-apache-mysql/alpine/Dockerfile b/web-apache-mysql/alpine/Dockerfile
index b9cda45bb..1e771517c 100644
--- a/web-apache-mysql/alpine/Dockerfile
+++ b/web-apache-mysql/alpine/Dockerfile
@@ -51,8 +51,8 @@ RUN addgroup zabbix && \
             ttf-dejavu && \
     rm -rf /var/cache/apk/*
 
-ARG MAJOR_VERSION=master
-ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG MAJOR_VERSION=3.4
+ARG ZBX_VERSION=${MAJOR_VERSION}.6
 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
 
diff --git a/web-apache-mysql/ubuntu/Dockerfile b/web-apache-mysql/ubuntu/Dockerfile
index 624d255de..d86480ff4 100644
--- a/web-apache-mysql/ubuntu/Dockerfile
+++ b/web-apache-mysql/ubuntu/Dockerfile
@@ -48,8 +48,8 @@ RUN locale-gen $LC_ALL && \
     apt-get ${APT_FLAGS_COMMON} clean && \
     rm -rf /var/lib/apt/lists/*
 
-ARG MAJOR_VERSION=master
-ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG MAJOR_VERSION=3.4
+ARG ZBX_VERSION=${MAJOR_VERSION}.6
 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
 
diff --git a/web-apache-pgsql/alpine/Dockerfile b/web-apache-pgsql/alpine/Dockerfile
index 7f1cc5a5c..19cd05ee2 100644
--- a/web-apache-pgsql/alpine/Dockerfile
+++ b/web-apache-pgsql/alpine/Dockerfile
@@ -50,8 +50,8 @@ RUN addgroup zabbix && \
             ttf-dejavu && \
     rm -rf /var/cache/apk/*
 
-ARG MAJOR_VERSION=master
-ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG MAJOR_VERSION=3.4
+ARG ZBX_VERSION=${MAJOR_VERSION}.6
 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
 
diff --git a/web-apache-pgsql/ubuntu/Dockerfile b/web-apache-pgsql/ubuntu/Dockerfile
index 2cadc2a5f..ea294e8bb 100644
--- a/web-apache-pgsql/ubuntu/Dockerfile
+++ b/web-apache-pgsql/ubuntu/Dockerfile
@@ -48,8 +48,8 @@ RUN locale-gen $LC_ALL && \
     apt-get ${APT_FLAGS_COMMON} clean && \
     rm -rf /var/lib/apt/lists/*
 
-ARG MAJOR_VERSION=master
-ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG MAJOR_VERSION=3.4
+ARG ZBX_VERSION=${MAJOR_VERSION}.6
 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
 
diff --git a/web-nginx-mysql/alpine/Dockerfile b/web-nginx-mysql/alpine/Dockerfile
index 4cde87fa0..61176cc18 100644
--- a/web-nginx-mysql/alpine/Dockerfile
+++ b/web-nginx-mysql/alpine/Dockerfile
@@ -50,8 +50,8 @@ RUN addgroup zabbix && \
             ttf-dejavu && \
     rm -rf /var/cache/apk/*
 
-ARG MAJOR_VERSION=master
-ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG MAJOR_VERSION=3.4
+ARG ZBX_VERSION=${MAJOR_VERSION}.6
 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
 
diff --git a/web-nginx-mysql/ubuntu/Dockerfile b/web-nginx-mysql/ubuntu/Dockerfile
index 1c2ff133b..a259e6b62 100644
--- a/web-nginx-mysql/ubuntu/Dockerfile
+++ b/web-nginx-mysql/ubuntu/Dockerfile
@@ -58,8 +58,8 @@ RUN locale-gen $LC_ALL && \
     rm -rf /var/cache/nginx/* && \
     rm -rf /var/lib/apt/lists/*
 
-ARG MAJOR_VERSION=master
-ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG MAJOR_VERSION=3.4
+ARG ZBX_VERSION=${MAJOR_VERSION}.6
 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
 
diff --git a/web-nginx-pgsql/alpine/Dockerfile b/web-nginx-pgsql/alpine/Dockerfile
index b23f4e4c0..9c1d331df 100644
--- a/web-nginx-pgsql/alpine/Dockerfile
+++ b/web-nginx-pgsql/alpine/Dockerfile
@@ -49,8 +49,8 @@ RUN addgroup zabbix && \
             ttf-dejavu && \
     rm -rf /var/cache/apk/*
 
-ARG MAJOR_VERSION=master
-ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG MAJOR_VERSION=3.4
+ARG ZBX_VERSION=${MAJOR_VERSION}.6
 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
 
diff --git a/web-nginx-pgsql/ubuntu/Dockerfile b/web-nginx-pgsql/ubuntu/Dockerfile
index f6c15d2b3..53db607b9 100644
--- a/web-nginx-pgsql/ubuntu/Dockerfile
+++ b/web-nginx-pgsql/ubuntu/Dockerfile
@@ -59,8 +59,8 @@ RUN locale-gen $LC_ALL && \
     rm -rf /var/cache/nginx/* && \
     rm -rf /var/lib/apt/lists/*
 
-ARG MAJOR_VERSION=master
-ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG MAJOR_VERSION=3.4
+ARG ZBX_VERSION=${MAJOR_VERSION}.6
 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}