diff --git a/agent/alpine/Dockerfile b/agent/alpine/Dockerfile
index 0ad579237..8d52941b1 100644
--- a/agent/alpine/Dockerfile
+++ b/agent/alpine/Dockerfile
@@ -32,7 +32,7 @@ RUN set -eux && \
             libldap && \
     rm -rf /var/cache/apk/*
 
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 
diff --git a/agent/centos/Dockerfile b/agent/centos/Dockerfile
index 799135979..02d150668 100644
--- a/agent/centos/Dockerfile
+++ b/agent/centos/Dockerfile
@@ -3,7 +3,7 @@ FROM centos:centos7 as builder
 ARG YUM_FLAGS_COMMON="-y"
 ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
 
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
@@ -50,7 +50,7 @@ ARG VCS_REF
 ARG YUM_FLAGS_COMMON="-y"
 ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
 
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
diff --git a/agent/ubuntu/Dockerfile b/agent/ubuntu/Dockerfile
index 6e7dfdb47..5358e473a 100644
--- a/agent/ubuntu/Dockerfile
+++ b/agent/ubuntu/Dockerfile
@@ -3,7 +3,7 @@ FROM ubuntu:bionic as builder
 ARG APT_FLAGS_COMMON="-y"
 ARG APT_FLAGS_DEV="${APT_FLAGS_COMMON} --no-install-recommends"
 
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 TERM=xterm \
@@ -55,7 +55,7 @@ ARG VCS_REF
 ARG APT_FLAGS_COMMON="-y"
 ARG APT_FLAGS_PERSISTENT="${APT_FLAGS_COMMON} --no-install-recommends"
 
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 TERM=xterm \
diff --git a/agent2/alpine/.dockerignore b/agent2/alpine/.dockerignore
new file mode 100644
index 000000000..88a84e55a
--- /dev/null
+++ b/agent2/alpine/.dockerignore
@@ -0,0 +1 @@
+build.sh
diff --git a/agent2/alpine/Dockerfile b/agent2/alpine/Dockerfile
new file mode 100644
index 000000000..02f704e94
--- /dev/null
+++ b/agent2/alpine/Dockerfile
@@ -0,0 +1,98 @@
+FROM alpine:3.10
+
+LABEL org.opencontainers.image.title="Zabbix agent 2" \
+      org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
+      org.opencontainers.image.vendor="Zabbix LLC" \
+      org.opencontainers.image.url="https://zabbix.com/" \
+      org.opencontainers.image.description="Zabbix agent 2 is deployed on a monitoring target to actively monitor local resources and applications" \
+      org.opencontainers.image.licenses="GPL v2.0"
+
+STOPSIGNAL SIGTERM
+
+RUN set -eux && \
+    addgroup -S -g 1000 zabbix && \
+    adduser -S \
+            -D -G zabbix \
+            -u 999 \
+            -h /var/lib/zabbix/ \
+        zabbix && \
+    mkdir -p /etc/zabbix && \
+    mkdir -p /etc/zabbix/zabbix_agentd.d && \
+    mkdir -p /var/lib/zabbix && \
+    mkdir -p /var/lib/zabbix/enc && \
+    mkdir -p /var/lib/zabbix/modules && \
+    chown --quiet -R zabbix:root /var/lib/zabbix && \
+    apk add --no-cache --clean-protected \
+            tini \
+            bash \
+            pcre \
+            coreutils \
+            iputils && \
+    rm -rf /var/cache/apk/*
+
+ARG MAJOR_VERSION=5.0
+ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
+
+ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
+
+LABEL org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
+      org.opencontainers.image.version="${ZBX_VERSION}" \
+      org.opencontainers.image.source="${ZBX_SOURCES}"
+
+RUN set -eux && \
+    apk add --no-cache --virtual build-dependencies \
+            autoconf \
+            automake \
+            go \
+            g++ \
+            make \
+            git \
+            pcre-dev \
+            zlib-dev \
+            coreutils && \
+    cd /tmp/ && \
+    git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
+    cd /tmp/zabbix-${ZBX_VERSION} && \
+    zabbix_revision=`git rev-parse --short HEAD` && \
+    sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
+    ./bootstrap.sh && \
+    export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
+    export GOPATH=/tmp/zabbix-${ZBX_VERSION}/go && \
+#    sleep 600 && \
+    ./configure \
+            --datadir=/usr/lib \
+            --libdir=/usr/lib/zabbix \
+            --prefix=/usr \
+            --sysconfdir=/etc/zabbix \
+            --prefix=/usr \
+            --enable-ipv6 \
+            --enable-static \
+            --enable-agent2 \
+            --enable-agent \
+            --silent && \
+    make -j"$(nproc)" -s && \
+    cp /tmp/zabbix-${ZBX_VERSION}/go/src/zabbix/cmd/zabbix_agent2/zabbix_agent2 /usr/sbin/zabbix_agent2 && \
+    cp /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get /usr/bin/zabbix_get && \
+    cp /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender && \
+    cp /tmp/zabbix-${ZBX_VERSION}/go/src/zabbix/conf/zabbix_agent2.conf /etc/zabbix/zabbix_agent2.conf && \
+    chown -R zabbix:zabbix /etc/zabbix/ && \
+    cd /tmp/ && \
+    rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \
+    apk del --purge --no-network \
+            build-dependencies && \
+    rm -rf /var/cache/apk/*
+
+EXPOSE 10050/TCP
+
+WORKDIR /var/lib/zabbix
+
+VOLUME ["/var/lib/zabbix/enc"]
+
+COPY ["docker-entrypoint.sh", "/usr/bin/"]
+
+ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/docker-entrypoint.sh"]
+
+USER zabbix
+
+CMD ["/usr/sbin/zabbix_agent2", "--foreground", "-c", "/etc/zabbix/zabbix_agent2.conf"]
diff --git a/agent2/alpine/README.md b/agent2/alpine/README.md
new file mode 100644
index 000000000..9e66e89c5
--- /dev/null
+++ b/agent2/alpine/README.md
@@ -0,0 +1,210 @@
+![logo](https://assets.zabbix.com/img/logo/zabbix_logo_500x131.png)
+
+# What is Zabbix?
+
+Zabbix is an enterprise-class open source distributed monitoring solution.
+
+Zabbix is software that monitors numerous parameters of a network and the health and integrity of servers. Zabbix uses a flexible notification mechanism that allows users to configure e-mail based alerts for virtually any event. This allows a fast reaction to server problems. Zabbix offers excellent reporting and data visualisation features based on the stored data. This makes Zabbix ideal for capacity planning.
+
+For more information and related downloads for Zabbix components, please visit https://hub.docker.com/u/zabbix/ and https://zabbix.com
+
+# What is Zabbix agent 2?
+
+Zabbix agent 2 is deployed on a monitoring target to actively monitor local resources and applications (hard drives, memory, processor statistics etc).
+
+# Zabbix agent 2 images
+
+These are the only official Zabbix agent 2 Docker images. They are based on Alpine Linux v3.10 images. The available versions of Zabbix agent 2 are:
+
+    Zabbix agent 2 4.4 (tags: alpine-4.4-latest, alpine-latest, latest)
+    Zabbix agent 2 4.4.* (tags: alpine-4.4.*)
+    Zabbix agent 2 5.0 (tags: alpine-trunk)
+
+Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
+
+# How to use this image
+
+## Start `zabbix-agent2`
+
+Start a Zabbix agent 2 container as follows:
+
+    docker run --name some-zabbix-agent -e ZBX_HOSTNAME="some-hostname" -e ZBX_SERVER_HOST="some-zabbix-server" -d zabbix/zabbix-agent2:tag
+
+Where `some-zabbix-agent2` is the name you want to assign to your container, `some-hostname` is the hostname, it is Hostname parameter in Zabbix agent 2 configuration file, `some-zabbix-server` is IP or DNS name of Zabbix server or proxy and `tag` is the tag specifying the version you want. See the list above for relevant tags, or look at the [full list of tags](https://hub.docker.com/r/zabbix/zabbix-agent2/tags/).
+
+## Connects from Zabbix server or Zabbix proxy in other containers (Passive checks)
+
+This image exposes the standard Zabbix agent 2 port (``10050``) to perform passive checks, so container linking makes Zabbix agent 2 instance available to Zabbix server and Zabbix proxy containers. Start your application container like this in order to link it to the Zabbix agent 2 container:
+
+```console
+$ docker run --name some-zabbix-server --link some-zabbix-agent:zabbix-agent2 -d zabbix/zabbix-server:latest
+```
+
+## Connect to Zabbix server or Zabbix proxy containers (Active checks)
+
+This image supports perform active checks, so container linking makes Zabbix server and Zabbix proxy containers available to Zabbix agent 2 instance. Start your application container like this in order to link Zabbix agent 2 to Zabbix server or Zabbix proxy containterns:
+
+```console
+$ docker run --name some-zabbix-agent --link some-zabbix-server:zabbix-server -d zabbix/zabbix-agent2:latest
+```
+
+## Container shell access and viewing Zabbix agent 2 logs
+
+The `docker exec` command allows you to run commands inside a Docker container. The following command line will give you a bash shell inside your `zabbix-agent2` container:
+
+```console
+$ docker exec -ti some-zabbix-agent /bin/bash
+```
+
+The Zabbix agent 2 log is available through Docker's container log:
+
+```console
+$ docker logs some-zabbix-agent
+```
+
+## Privileged mode
+
+By default, Docker containers are "unprivileged" and do not have access to the most of host resources. Zabbix agent 2 is designed to monitor system resources, to do that Zabbix agent 2 container must be privileged or you may mount some system-wide volumes. For example:
+
+```console
+$ docker run --name some-zabbix-agent --link some-zabbix-server:zabbix-server --privileged -d zabbix/zabbix-agent2:latest
+```
+```console
+$ docker run --name some-zabbix-agent --link some-zabbix-server:zabbix-server -v /dev/sdc:/dev/sdc -d zabbix/zabbix-agent2:latest
+```
+
+## Environment Variables
+
+When you start the `zabbix-agent2` image, you can adjust the configuration of the Zabbix agent 2 by passing one or more environment variables on the `docker run` command line.
+
+### `ZBX_HOSTNAME`
+
+This variable is unique, case sensitive hostname. By default, value is `hostname` of the container. It is ``Hostname`` parameter in ``zabbix_agent2.conf``.
+
+### `ZBX_SERVER_HOST`
+
+This variable is IP or DNS name of Zabbix server or Zabbix proxy. By default, value is `zabbix-server`. It is ``Server`` parameter in ``zabbix_agent2.conf``. It is allowed to specify Zabbix server or Zabbix proxy port number using ``ZBX_SERVER_PORT`` variable. It make sense in case of non-default port for active checks.
+
+### `ZBX_PASSIVE_ALLOW`
+
+This variable is boolean (``true`` or ``false``) and enables or disables feature of passive checks. By default, value is `true`.
+
+### `ZBX_PASSIVESERVERS`
+
+The variable is comma separated list of allowed Zabbix server or proxy hosts for connections to Zabbix agent 2 container.
+
+### `ZBX_ACTIVE_ALLOW`
+
+This variable is boolean (``true`` or ``false``) and enables or disables feature of active checks. By default, value is `true`.
+
+### `ZBX_ACTIVESERVERS`
+
+The variable is comma separated list of allowed Zabbix server or proxy hosts for connections to Zabbix agent 2 container. You may specify port of Zabbix server or Zabbix proxy in such syntax: ``zabbix-server:10061,zabbix-proxy:10072``.
+
+### `ZBX_LOADMODULE`
+
+The variable is list of comma separated loadable Zabbix modules. It works with  volume ``/var/lib/zabbix/modules``. The syntax of the variable is ``dummy1.so,dummy2.so``.
+
+### `ZBX_DEBUGLEVEL`
+
+The variable is used to specify debug level. By default, value is ``3``. It is ``DebugLevel`` parameter in ``zabbix_agent2.conf``. Allowed values are listed below:
+- ``0`` - basic information about starting and stopping of Zabbix processes;
+- ``1`` - critical information
+- ``2`` - error information
+- ``3`` - warnings
+- ``4`` -  for debugging (produces lots of information)
+- ``5`` - extended debugging (produces even more information)
+
+### `ZBX_TIMEOUT`
+
+The variable is used to specify timeout for processing checks. By default, value is ``3``.
+
+### Other variables
+
+Additionally the image allows to specify many other environment variables listed below:
+
+```
+ZBX_SOURCEIP=
+ZBX_ENABLEREMOTECOMMANDS=0
+ZBX_LOGREMOTECOMMANDS=0
+ZBX_STARTAGENTS=3
+ZBX_HOSTNAMEITEM=system.hostname
+ZBX_METADATA=
+ZBX_METADATAITEM=
+ZBX_REFRESHACTIVECHECKS=120
+ZBX_BUFFERSEND=5
+ZBX_BUFFERSIZE=100
+ZBX_MAXLINESPERSECOND=20
+ZBX_LISTENIP=
+ZBX_UNSAFEUSERPARAMETERS=0
+ZBX_TLSCONNECT=unencrypted
+ZBX_TLSACCEPT=unencrypted
+ZBX_TLSCAFILE=
+ZBX_TLSCRLFILE=
+ZBX_TLSSERVERCERTISSUER=
+ZBX_TLSSERVERCERTSUBJECT=
+ZBX_TLSCERTFILE=
+ZBX_TLSKEYFILE=
+ZBX_TLSPSKIDENTITY=
+ZBX_TLSPSKFILE=
+```
+
+Default values of these variables are specified after equal sign.
+
+The allowed variables are identical of parameters in official ``zabbix_agent2.conf`` configuration file. For example, ``ZBX_REFRESHACTIVECHECKS`` = ``RefreshActiveChecks``.
+
+Please use official documentation for [``zabbix_agent2.conf``](https://www.zabbix.com/documentation/current/manual/appendix/config/zabbix_agent2) to get more information about the variables.
+
+## Allowed volumes for the Zabbix agent 2 container
+
+### ``/etc/zabbix/zabbix_agentd.d``
+
+The volume allows include ``*.conf`` files and extend Zabbix agent 2 using ``UserParameter`` feature.
+
+### ``/var/lib/zabbix/modules``
+
+The volume allows load additional modules and extend Zabbix agent 2 using ``LoadModule`` feature.
+
+### ``/var/lib/zabbix/enc``
+
+The volume is used to store TLS related files. These file names are specified using ``ZBX_TLSCAFILE``, ``ZBX_TLSCRLFILE``, ``ZBX_TLSKEY_FILE`` and ``ZBX_TLSPSKFILE`` variables.
+
+# The image variants
+
+The `zabbix-agent2` images come in many flavors, each designed for a specific use case.
+
+## `zabbix-agent2:alpine-<version>`
+
+This image is based on the popular [Alpine Linux project](http://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general.
+
+This variant is highly recommended when final image size being as small as possible is desired. The main caveat to note is that it does use [musl libc](http://www.musl-libc.org) instead of [glibc and friends](http://www.etalabs.net/compare_libcs.html), so certain software might run into issues depending on the depth of their libc requirements. However, most software doesn't have an issue with this, so this variant is usually a very safe choice. See [this Hacker News comment thread](https://news.ycombinator.com/item?id=10782897) for more discussion of the issues that might arise and some pro/con comparisons of using Alpine-based images.
+
+To minimize image size, it's uncommon for additional related tools (such as `git` or `bash`) to be included in Alpine-based images. Using this image as a base, add the things you need in your own Dockerfile (see the [`alpine` image description](https://hub.docker.com/_/alpine/) for examples of how to install packages if you are unfamiliar).
+
+# Supported Docker versions
+
+This image is officially supported on Docker version 1.12.0.
+
+Support for older versions (down to 1.6) is provided on a best-effort basis.
+
+Please see [the Docker installation documentation](https://docs.docker.com/installation/) for details on how to upgrade your Docker daemon.
+
+# User Feedback
+
+## Documentation
+
+Documentation for this image is stored in the [`agent2/` directory](https://github.com/zabbix/zabbix-docker/tree/4.4/agent2) of the [`zabbix/zabbix-docker` GitHub repo](https://github.com/zabbix/zabbix-docker/). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/zabbix/zabbix-docker/blob/master/README.md) before attempting a pull request.
+
+## Issues
+
+If you have any problems with or questions about this image, please contact us through a [GitHub issue](https://github.com/zabbix/zabbix-docker/issues).
+
+### Known issues
+
+Currently it is not allowed to specify ``ZBX_ALIAS`` environment variable. Please use ``/etc/zabbix/zabbix_agent.d`` volume with additional configuration files with ``Alias`` options.
+
+## Contributing
+
+You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can.
+
+Before you start to code, we recommend discussing your plans through a [GitHub issue](https://github.com/zabbix/zabbix-docker/issues), especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing.
diff --git a/agent2/alpine/build.sh b/agent2/alpine/build.sh
new file mode 120000
index 000000000..fcb4d4ee7
--- /dev/null
+++ b/agent2/alpine/build.sh
@@ -0,0 +1 @@
+../../build.sh
\ No newline at end of file
diff --git a/agent2/alpine/docker-entrypoint.sh b/agent2/alpine/docker-entrypoint.sh
new file mode 100755
index 000000000..43b5e09f5
--- /dev/null
+++ b/agent2/alpine/docker-entrypoint.sh
@@ -0,0 +1,199 @@
+#!/bin/bash
+
+set -o pipefail
+
+set +e
+
+# Script trace mode
+if [ "${DEBUG_MODE}" == "true" ]; then
+    set -o xtrace
+fi
+
+# Default Zabbix installation name
+# Default Zabbix server host
+: ${ZBX_SERVER_HOST:="zabbix-server"}
+# Default Zabbix server port number
+: ${ZBX_SERVER_PORT:="10051"}
+
+# Default directories
+# User 'zabbix' home directory
+ZABBIX_USER_HOME_DIR="/var/lib/zabbix"
+# Configuration files directory
+ZABBIX_ETC_DIR="/etc/zabbix"
+
+escape_spec_char() {
+    local var_value=$1
+
+    var_value="${var_value//\\/\\\\}"
+    var_value="${var_value//[$'\n']/}"
+    var_value="${var_value//\//\\/}"
+    var_value="${var_value//./\\.}"
+    var_value="${var_value//\*/\\*}"
+    var_value="${var_value//^/\\^}"
+    var_value="${var_value//\$/\\\$}"
+    var_value="${var_value//\&/\\\&}"
+    var_value="${var_value//\[/\\[}"
+    var_value="${var_value//\]/\\]}"
+
+    echo "$var_value"
+}
+
+update_config_var() {
+    local config_path=$1
+    local var_name=$2
+    local var_value=$3
+    local is_multiple=$4
+
+    if [ ! -f "$config_path" ]; then
+        echo "**** Configuration file '$config_path' does not exist"
+        return
+    fi
+
+    echo -n "** Updating '$config_path' parameter \"$var_name\": '$var_value'... "
+
+    # Remove configuration parameter definition in case of unset parameter value
+    if [ -z "$var_value" ]; then
+        sed -i -e "/^$var_name=/d" "$config_path"
+        echo "removed"
+        return
+    fi
+
+    # Remove value from configuration parameter in case of double quoted parameter value
+    if [ "$var_value" == '""' ]; then
+        sed -i -e "/^$var_name=/s/=.*/=/" "$config_path"
+        echo "undefined"
+        return
+    fi
+
+    # Use full path to a file for TLS related configuration parameters
+    if [[ $var_name =~ ^TLS.*File$ ]]; then
+        var_value=$ZABBIX_USER_HOME_DIR/enc/$var_value
+    fi
+
+    # Escaping characters in parameter value
+    var_value=$(escape_spec_char "$var_value")
+
+    if [ "$(grep -E "^$var_name=" $config_path)" ] && [ "$is_multiple" != "true" ]; then
+        sed -i -e "/^$var_name=/s/=.*/=$var_value/" "$config_path"
+        echo "updated"
+    elif [ "$(grep -Ec "^# $var_name=" $config_path)" -gt 1 ]; then
+        sed -i -e  "/^[#;] $var_name=$/i\\$var_name=$var_value" "$config_path"
+        echo "added first occurrence"
+    else
+        sed -i -e "/^[#;] $var_name=/s/.*/&\n$var_name=$var_value/" "$config_path"
+        echo "added"
+    fi
+
+}
+
+update_config_multiple_var() {
+    local config_path=$1
+    local var_name=$2
+    local var_value=$3
+
+    var_value="${var_value%\"}"
+    var_value="${var_value#\"}"
+
+    local IFS=,
+    local OPT_LIST=($var_value)
+
+    for value in "${OPT_LIST[@]}"; do
+        update_config_var $config_path $var_name $value true
+    done
+}
+
+prepare_zbx_agent_config() {
+    echo "** Preparing Zabbix agent configuration file"
+    ZBX_AGENT_CONFIG=$ZABBIX_ETC_DIR/zabbix_agent2.conf
+
+    : ${ZBX_PASSIVESERVERS:=""}
+    : ${ZBX_ACTIVESERVERS:=""}
+
+    [ -n "$ZBX_PASSIVESERVERS" ] && ZBX_PASSIVESERVERS=","$ZBX_PASSIVESERVERS
+
+    ZBX_PASSIVESERVERS=$ZBX_SERVER_HOST$ZBX_PASSIVESERVERS
+
+    [ -n "$ZBX_ACTIVESERVERS" ] && ZBX_ACTIVESERVERS=","$ZBX_ACTIVESERVERS
+
+    ZBX_ACTIVESERVERS=$ZBX_SERVER_HOST":"$ZBX_SERVER_PORT$ZBX_ACTIVESERVERS
+
+    update_config_var $ZBX_AGENT_CONFIG "PidFile"
+    update_config_var $ZBX_AGENT_CONFIG "LogType" "console"
+    update_config_var $ZBX_AGENT_CONFIG "LogFile"
+    update_config_var $ZBX_AGENT_CONFIG "LogFileSize"
+    update_config_var $ZBX_AGENT_CONFIG "DebugLevel" "${ZBX_DEBUGLEVEL}"
+    update_config_var $ZBX_AGENT_CONFIG "SourceIP"
+    update_config_var $ZBX_AGENT_CONFIG "EnableRemoteCommands" "${ZBX_ENABLEREMOTECOMMANDS}"
+    update_config_var $ZBX_AGENT_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}"
+
+    : ${ZBX_PASSIVE_ALLOW:="true"}
+    if [ "$ZBX_PASSIVE_ALLOW" == "true" ]; then
+        echo "** Using '$ZBX_PASSIVESERVERS' servers for passive checks"
+        update_config_var $ZBX_AGENT_CONFIG "Server" "${ZBX_PASSIVESERVERS}"
+    else
+        update_config_var $ZBX_AGENT_CONFIG "Server"
+    fi
+
+    update_config_var $ZBX_AGENT_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
+    update_config_var $ZBX_AGENT_CONFIG "ListenIP" "${ZBX_LISTENIP}"
+    update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
+
+    : ${ZBX_ACTIVE_ALLOW:="true"}
+    if [ "$ZBX_ACTIVE_ALLOW" == "true" ]; then
+        echo "** Using '$ZBX_ACTIVESERVERS' servers for active checks"
+        update_config_var $ZBX_AGENT_CONFIG "ServerActive" "${ZBX_ACTIVESERVERS}"
+    else
+        update_config_var $ZBX_AGENT_CONFIG "ServerActive"
+    fi
+
+    update_config_var $ZBX_AGENT_CONFIG "Hostname" "${ZBX_HOSTNAME}"
+    update_config_var $ZBX_AGENT_CONFIG "HostnameItem" "${ZBX_HOSTNAMEITEM}"
+    update_config_var $ZBX_AGENT_CONFIG "HostMetadata" "${ZBX_METADATA}"
+    update_config_var $ZBX_AGENT_CONFIG "HostMetadataItem" "${ZBX_METADATAITEM}"
+    update_config_var $ZBX_AGENT_CONFIG "RefreshActiveChecks" "${ZBX_REFRESHACTIVECHECKS}"
+    update_config_var $ZBX_AGENT_CONFIG "BufferSend" "${ZBX_BUFFERSEND}"
+    update_config_var $ZBX_AGENT_CONFIG "BufferSize" "${ZBX_BUFFERSIZE}"
+    update_config_var $ZBX_AGENT_CONFIG "MaxLinesPerSecond" "${ZBX_MAXLINESPERSECOND}"
+    # Please use include to enable Alias feature
+#    update_config_multiple_var $ZBX_AGENT_CONFIG "Alias" ${ZBX_ALIAS}
+    update_config_var $ZBX_AGENT_CONFIG "Timeout" "${ZBX_TIMEOUT}"
+    update_config_var $ZBX_AGENT_CONFIG "Include" "/etc/zabbix/zabbix_agentd.d/"
+    update_config_var $ZBX_AGENT_CONFIG "UnsafeUserParameters" "${ZBX_UNSAFEUSERPARAMETERS}"
+    update_config_var $ZBX_AGENT_CONFIG "LoadModulePath" "$ZABBIX_USER_HOME_DIR/modules/"
+    update_config_multiple_var $ZBX_AGENT_CONFIG "LoadModule" "${ZBX_LOADMODULE}"
+    update_config_var $ZBX_AGENT_CONFIG "TLSConnect" "${ZBX_TLSCONNECT}"
+    update_config_var $ZBX_AGENT_CONFIG "TLSAccept" "${ZBX_TLSACCEPT}"
+    update_config_var $ZBX_AGENT_CONFIG "TLSCAFile" "${ZBX_TLSCAFILE}"
+    update_config_var $ZBX_AGENT_CONFIG "TLSCRLFile" "${ZBX_TLSCRLFILE}"
+    update_config_var $ZBX_AGENT_CONFIG "TLSServerCertIssuer" "${ZBX_TLSSERVERCERTISSUER}"
+    update_config_var $ZBX_AGENT_CONFIG "TLSServerCertSubject" "${ZBX_TLSSERVERCERTSUBJECT}"
+    update_config_var $ZBX_AGENT_CONFIG "TLSCertFile" "${ZBX_TLSCERTFILE}"
+    update_config_var $ZBX_AGENT_CONFIG "TLSKeyFile" "${ZBX_TLSKEYFILE}"
+    update_config_var $ZBX_AGENT_CONFIG "TLSPSKIdentity" "${ZBX_TLSPSKIDENTITY}"
+    update_config_var $ZBX_AGENT_CONFIG "TLSPSKFile" "${ZBX_TLSPSKFILE}"
+
+    if [ "$(id -u)" != '0' ]; then
+        update_config_var $ZBX_AGENT_CONFIG "User" "$(whoami)"
+    else
+        update_config_var $ZBX_AGENT_CONFIG "AllowRoot" "1"
+    fi
+}
+
+prepare_agent() {
+    echo "** Preparing Zabbix agent"
+    prepare_zbx_agent_config
+}
+
+#################################################
+
+if [ "${1#-}" != "$1" ]; then
+    set -- /usr/sbin/zabbix_agent2 "$@"
+fi
+
+if [ "$1" == '/usr/sbin/zabbix_agent2' ]; then
+    prepare_agent
+fi
+
+exec "$@"
+
+#################################################
diff --git a/agent2/alpine/hooks/build b/agent2/alpine/hooks/build
new file mode 100755
index 000000000..3e0a2f00c
--- /dev/null
+++ b/agent2/alpine/hooks/build
@@ -0,0 +1,13 @@
+#!/bin/bash
+#
+# Additional information: https://docs.docker.com/docker-cloud/builds/advanced/
+#
+
+MAJOR_VERSION=$(cat Dockerfile | grep "ARG MAJOR_VERSION" | cut -f2 -d"=")
+MINOR_VERSION=$(cat Dockerfile | grep "ARG ZBX_VERSION" | cut -f2 -d".")
+
+VCS_REF=$MAJOR_VERSION.$MINOR_VERSION
+BUILD_DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
+
+echo "$BUILD_DATE - Building $VCS_REF version..."
+docker build --build-arg VCS_REF="$VCS_REF" --build-arg BUILD_DATE="$BUILD_DATE" -t $IMAGE_NAME .
diff --git a/java-gateway/alpine/Dockerfile b/java-gateway/alpine/Dockerfile
index fe3ead9c8..b1f6c1672 100644
--- a/java-gateway/alpine/Dockerfile
+++ b/java-gateway/alpine/Dockerfile
@@ -23,7 +23,7 @@ RUN set -eux && \
             openjdk8-jre-base && \
     rm -rf /var/cache/apk/*
 
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 
diff --git a/java-gateway/centos/Dockerfile b/java-gateway/centos/Dockerfile
index cf410a8c1..9290ad383 100644
--- a/java-gateway/centos/Dockerfile
+++ b/java-gateway/centos/Dockerfile
@@ -3,7 +3,7 @@ FROM centos:centos7 as builder
 ARG YUM_FLAGS_COMMON="-y"
 ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
     
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
@@ -44,7 +44,7 @@ ARG VCS_REF
 ARG YUM_FLAGS_COMMON="-y"
 ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
 
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
diff --git a/java-gateway/ubuntu/Dockerfile b/java-gateway/ubuntu/Dockerfile
index 971c3c3b6..b6c1d8b65 100644
--- a/java-gateway/ubuntu/Dockerfile
+++ b/java-gateway/ubuntu/Dockerfile
@@ -42,7 +42,7 @@ RUN set -eux && \
     apt-get ${APT_FLAGS_COMMON} clean && \
     rm -rf /var/lib/apt/lists/*
 
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
diff --git a/proxy-mysql/alpine/Dockerfile b/proxy-mysql/alpine/Dockerfile
index c715ceeef..daf1c1ee2 100644
--- a/proxy-mysql/alpine/Dockerfile
+++ b/proxy-mysql/alpine/Dockerfile
@@ -48,7 +48,7 @@ RUN set -eux && \
             fping && \
     rm -rf /var/cache/apk/*
 
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 
diff --git a/proxy-mysql/centos/Dockerfile b/proxy-mysql/centos/Dockerfile
index f348d0e9a..610137a91 100644
--- a/proxy-mysql/centos/Dockerfile
+++ b/proxy-mysql/centos/Dockerfile
@@ -3,7 +3,7 @@ FROM centos:centos7 as builder
 ARG YUM_FLAGS_COMMON="-y"
 ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
 
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
@@ -65,7 +65,7 @@ ARG VCS_REF
 ARG YUM_FLAGS_COMMON="-y"
 ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
 
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 ENV TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \
diff --git a/proxy-mysql/ubuntu/Dockerfile b/proxy-mysql/ubuntu/Dockerfile
index aa664868d..aad038610 100644
--- a/proxy-mysql/ubuntu/Dockerfile
+++ b/proxy-mysql/ubuntu/Dockerfile
@@ -69,7 +69,7 @@ RUN set -eux && \
     apt-get ${APT_FLAGS_COMMON} clean && \
     rm -rf /var/lib/apt/lists/*
 
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
diff --git a/proxy-sqlite3/alpine/Dockerfile b/proxy-sqlite3/alpine/Dockerfile
index 70b2fe5da..11a3a5a0a 100644
--- a/proxy-sqlite3/alpine/Dockerfile
+++ b/proxy-sqlite3/alpine/Dockerfile
@@ -46,7 +46,7 @@ RUN set -eux && \
             unixodbc && \
     rm -rf /var/cache/apk/*
 
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
diff --git a/proxy-sqlite3/centos/Dockerfile b/proxy-sqlite3/centos/Dockerfile
index bcdee76f3..91bed0ef9 100644
--- a/proxy-sqlite3/centos/Dockerfile
+++ b/proxy-sqlite3/centos/Dockerfile
@@ -3,7 +3,7 @@ FROM centos:centos7 as builder
 ARG YUM_FLAGS_COMMON="-y"
 ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
 
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
@@ -65,7 +65,7 @@ ARG VCS_REF
 ARG YUM_FLAGS_COMMON="-y"
 ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
 
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 ENV TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \
diff --git a/proxy-sqlite3/ubuntu/Dockerfile b/proxy-sqlite3/ubuntu/Dockerfile
index 22ee3cf14..b140b79cf 100644
--- a/proxy-sqlite3/ubuntu/Dockerfile
+++ b/proxy-sqlite3/ubuntu/Dockerfile
@@ -66,7 +66,7 @@ RUN set -eux && \
     apt-get ${APT_FLAGS_COMMON} clean && \
     rm -rf /var/lib/apt/lists/*
 
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
diff --git a/server-mysql/alpine/Dockerfile b/server-mysql/alpine/Dockerfile
index 4cc15a0ed..acf8c08f8 100644
--- a/server-mysql/alpine/Dockerfile
+++ b/server-mysql/alpine/Dockerfile
@@ -50,7 +50,7 @@ RUN set -eux && \
             unixodbc && \
     rm -rf /var/cache/apk/*
 
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 
diff --git a/server-mysql/centos/Dockerfile b/server-mysql/centos/Dockerfile
index 4b72905e5..6c22a29b2 100644
--- a/server-mysql/centos/Dockerfile
+++ b/server-mysql/centos/Dockerfile
@@ -3,7 +3,7 @@ FROM centos:centos7 as builder
 ARG YUM_FLAGS_COMMON="-y"
 ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
 
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
@@ -70,7 +70,7 @@ ARG VCS_REF
 ARG YUM_FLAGS_COMMON="-y"
 ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
 
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
diff --git a/server-mysql/ubuntu/Dockerfile b/server-mysql/ubuntu/Dockerfile
index 9468950dd..e7a222304 100644
--- a/server-mysql/ubuntu/Dockerfile
+++ b/server-mysql/ubuntu/Dockerfile
@@ -73,7 +73,7 @@ RUN set -eux && \
     apt-get ${APT_FLAGS_COMMON} clean && \
     rm -rf /var/lib/apt/lists/*
 
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
diff --git a/server-pgsql/alpine/Dockerfile b/server-pgsql/alpine/Dockerfile
index 856aa1a95..87034bd1a 100644
--- a/server-pgsql/alpine/Dockerfile
+++ b/server-pgsql/alpine/Dockerfile
@@ -50,7 +50,7 @@ RUN set -eux && \
             unixodbc && \
     rm -rf /var/cache/apk/*
 
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 
diff --git a/server-pgsql/centos/Dockerfile b/server-pgsql/centos/Dockerfile
index 7f7aeb2e8..004fb20b1 100644
--- a/server-pgsql/centos/Dockerfile
+++ b/server-pgsql/centos/Dockerfile
@@ -3,7 +3,7 @@ FROM centos:centos7 as builder
 ARG YUM_FLAGS_COMMON="-y"
 ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
 
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
@@ -70,7 +70,7 @@ ARG VCS_REF
 ARG YUM_FLAGS_COMMON="-y"
 ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
 
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
diff --git a/server-pgsql/ubuntu/Dockerfile b/server-pgsql/ubuntu/Dockerfile
index cb620ae33..528dc8b33 100644
--- a/server-pgsql/ubuntu/Dockerfile
+++ b/server-pgsql/ubuntu/Dockerfile
@@ -73,7 +73,7 @@ RUN set -eux && \
     apt-get ${APT_FLAGS_COMMON} clean && \
     rm -rf /var/lib/apt/lists/*
 
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
diff --git a/snmptraps/alpine/Dockerfile b/snmptraps/alpine/Dockerfile
index acf5ea341..ddd991cea 100644
--- a/snmptraps/alpine/Dockerfile
+++ b/snmptraps/alpine/Dockerfile
@@ -3,7 +3,7 @@ FROM alpine:3.10
 ARG APK_FLAGS_PERSISTENT="--clean-protected --no-cache"
 ARG APK_FLAGS_DEV="--no-cache"
 
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 
diff --git a/snmptraps/centos/Dockerfile b/snmptraps/centos/Dockerfile
index cb190d9dc..25e9314b6 100644
--- a/snmptraps/centos/Dockerfile
+++ b/snmptraps/centos/Dockerfile
@@ -3,7 +3,7 @@ FROM centos:centos7 as builder
 ARG YUM_FLAGS_COMMON="-y"
 ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
 
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
@@ -35,7 +35,7 @@ ARG VCS_REF
 ARG YUM_FLAGS_COMMON="-y"
 ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
 
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
diff --git a/snmptraps/ubuntu/Dockerfile b/snmptraps/ubuntu/Dockerfile
index f813230f9..a6f3b3040 100644
--- a/snmptraps/ubuntu/Dockerfile
+++ b/snmptraps/ubuntu/Dockerfile
@@ -19,7 +19,7 @@ LABEL org.label-schema.name="zabbix-snmptraps-ubuntu" \
       org.label-schema.schema-version="1.0" \
       org.label-schema.license="GPL v2.0"
 
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
diff --git a/web-apache-mysql/alpine/Dockerfile b/web-apache-mysql/alpine/Dockerfile
index 9af1efcbe..55a69ba22 100644
--- a/web-apache-mysql/alpine/Dockerfile
+++ b/web-apache-mysql/alpine/Dockerfile
@@ -54,7 +54,7 @@ RUN set -eux && \
     rm -f "/var/run/apache2/apache2.pid" && \
     rm -rf /var/cache/apk/*
 
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 
diff --git a/web-apache-mysql/centos/Dockerfile b/web-apache-mysql/centos/Dockerfile
index 53398e9b0..669ae08f4 100644
--- a/web-apache-mysql/centos/Dockerfile
+++ b/web-apache-mysql/centos/Dockerfile
@@ -3,7 +3,7 @@ FROM centos:centos7 as builder
 ARG YUM_FLAGS_COMMON="-y"
 ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
 
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
@@ -32,7 +32,7 @@ ARG VCS_REF
 ARG YUM_FLAGS_COMMON="-y"
 ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
 
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
diff --git a/web-apache-mysql/ubuntu/Dockerfile b/web-apache-mysql/ubuntu/Dockerfile
index 240b2d2e4..543465fdd 100644
--- a/web-apache-mysql/ubuntu/Dockerfile
+++ b/web-apache-mysql/ubuntu/Dockerfile
@@ -53,7 +53,7 @@ RUN set -eux && \
     apt-get ${APT_FLAGS_COMMON} clean && \
     rm -rf /var/lib/apt/lists/*
 
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
diff --git a/web-apache-pgsql/alpine/Dockerfile b/web-apache-pgsql/alpine/Dockerfile
index dc6e2cb5f..b2dd7cc37 100644
--- a/web-apache-pgsql/alpine/Dockerfile
+++ b/web-apache-pgsql/alpine/Dockerfile
@@ -53,7 +53,7 @@ RUN set -eux && \
     rm -f "/var/run/apache2/apache2.pid" && \
     rm -rf /var/cache/apk/*
 
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 
diff --git a/web-apache-pgsql/centos/Dockerfile b/web-apache-pgsql/centos/Dockerfile
index 79e6af5c0..c5a4b3782 100644
--- a/web-apache-pgsql/centos/Dockerfile
+++ b/web-apache-pgsql/centos/Dockerfile
@@ -3,7 +3,7 @@ FROM centos:centos7 as builder
 ARG YUM_FLAGS_COMMON="-y"
 ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
 
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
@@ -33,7 +33,7 @@ ARG VCS_REF
 ARG YUM_FLAGS_COMMON="-y"
 ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
 
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
diff --git a/web-apache-pgsql/ubuntu/Dockerfile b/web-apache-pgsql/ubuntu/Dockerfile
index e21e0cfd2..244537348 100644
--- a/web-apache-pgsql/ubuntu/Dockerfile
+++ b/web-apache-pgsql/ubuntu/Dockerfile
@@ -54,7 +54,7 @@ RUN set -eux && \
     apt-get ${APT_FLAGS_COMMON} clean && \
     rm -rf /var/lib/apt/lists/*
 
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
diff --git a/web-nginx-mysql/alpine/Dockerfile b/web-nginx-mysql/alpine/Dockerfile
index 84ddb7b24..a86b83c17 100644
--- a/web-nginx-mysql/alpine/Dockerfile
+++ b/web-nginx-mysql/alpine/Dockerfile
@@ -57,7 +57,7 @@ RUN set -eux && \
     rm -f /etc/nginx/conf.d/*.conf && \
     rm -rf /var/cache/apk/*
 
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
diff --git a/web-nginx-mysql/centos/Dockerfile b/web-nginx-mysql/centos/Dockerfile
index 3e553633d..69083a0e6 100644
--- a/web-nginx-mysql/centos/Dockerfile
+++ b/web-nginx-mysql/centos/Dockerfile
@@ -3,7 +3,7 @@ FROM centos:centos7 as builder
 ARG YUM_FLAGS_COMMON="-y"
 ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
 
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
@@ -34,7 +34,7 @@ ARG VCS_REF
 ARG YUM_FLAGS_COMMON="-y"
 ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
 
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
diff --git a/web-nginx-mysql/ubuntu/Dockerfile b/web-nginx-mysql/ubuntu/Dockerfile
index f542e2b6e..ea2741d56 100644
--- a/web-nginx-mysql/ubuntu/Dockerfile
+++ b/web-nginx-mysql/ubuntu/Dockerfile
@@ -75,7 +75,7 @@ RUN set -eux && \
     rm -rf /var/cache/nginx/* && \
     rm -rf /var/lib/apt/lists/*
 
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
diff --git a/web-nginx-pgsql/alpine/Dockerfile b/web-nginx-pgsql/alpine/Dockerfile
index e1bff0888..c57eb877c 100644
--- a/web-nginx-pgsql/alpine/Dockerfile
+++ b/web-nginx-pgsql/alpine/Dockerfile
@@ -56,7 +56,7 @@ RUN set -eux && \
     rm -f /etc/nginx/conf.d/*.conf && \
     rm -rf /var/cache/apk/*
 
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
diff --git a/web-nginx-pgsql/centos/Dockerfile b/web-nginx-pgsql/centos/Dockerfile
index 92c4b8184..aae42798a 100644
--- a/web-nginx-pgsql/centos/Dockerfile
+++ b/web-nginx-pgsql/centos/Dockerfile
@@ -3,7 +3,7 @@ FROM centos:centos7 as builder
 ARG YUM_FLAGS_COMMON="-y"
 ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
 
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
@@ -33,7 +33,7 @@ ARG VCS_REF
 ARG YUM_FLAGS_COMMON="-y"
 ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
 
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
diff --git a/web-nginx-pgsql/ubuntu/Dockerfile b/web-nginx-pgsql/ubuntu/Dockerfile
index 6af2f44c9..7da3443eb 100644
--- a/web-nginx-pgsql/ubuntu/Dockerfile
+++ b/web-nginx-pgsql/ubuntu/Dockerfile
@@ -75,7 +75,7 @@ RUN set -eux && \
     rm -rf /var/cache/nginx/* && \
     rm -rf /var/lib/apt/lists/*
 
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
diff --git a/zabbix-appliance/alpine/Dockerfile b/zabbix-appliance/alpine/Dockerfile
index 55293b915..4e2eaa664 100644
--- a/zabbix-appliance/alpine/Dockerfile
+++ b/zabbix-appliance/alpine/Dockerfile
@@ -82,7 +82,7 @@ RUN set -eux && \
             unixodbc && \
     rm -rf /var/cache/apk/*
 
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
diff --git a/zabbix-appliance/centos/Dockerfile b/zabbix-appliance/centos/Dockerfile
index ef04b3f86..696a30824 100644
--- a/zabbix-appliance/centos/Dockerfile
+++ b/zabbix-appliance/centos/Dockerfile
@@ -3,7 +3,7 @@ FROM centos:centos7 as builder
 ARG YUM_FLAGS_COMMON="-y"
 ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
 
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
@@ -81,7 +81,7 @@ ARG VCS_REF
 ARG YUM_FLAGS_COMMON="-y"
 ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
 
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
diff --git a/zabbix-appliance/rhel/Dockerfile b/zabbix-appliance/rhel/Dockerfile
index 51c89d85d..44203acde 100644
--- a/zabbix-appliance/rhel/Dockerfile
+++ b/zabbix-appliance/rhel/Dockerfile
@@ -11,9 +11,9 @@ ENV TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \
 ARG BUILD_DATE
 ARG VCS_REF
 
-ARG MAJOR_VERSION=4.0
+ARG MAJOR_VERSION=5.0
 ARG RELEASE=0
-ARG ZBX_VERSION=${MAJOR_VERSION}.${RELEASE}
+ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
 
diff --git a/zabbix-appliance/ubuntu/Dockerfile b/zabbix-appliance/ubuntu/Dockerfile
index 86a6cfa80..2d943f6d9 100644
--- a/zabbix-appliance/ubuntu/Dockerfile
+++ b/zabbix-appliance/ubuntu/Dockerfile
@@ -3,7 +3,7 @@ FROM ubuntu:bionic as builder
 ARG APT_FLAGS_COMMON="-y"
 ARG APT_FLAGS_DEV="${APT_FLAGS_COMMON} --no-install-recommends"
 
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
@@ -87,7 +87,7 @@ ARG VCS_REF
 
 ARG APT_FLAGS_COMMON="-y"
 ARG APT_FLAGS_PERSISTENT="${APT_FLAGS_COMMON} --no-install-recommends"
-ARG MAJOR_VERSION=4.4
+ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \