diff --git a/agent/alpine/Dockerfile b/agent/alpine/Dockerfile
index f3dd9e637..cf3608d6f 100644
--- a/agent/alpine/Dockerfile
+++ b/agent/alpine/Dockerfile
@@ -89,7 +89,7 @@ EXPOSE 10050/TCP
 
 WORKDIR /var/lib/zabbix
 
-VOLUME ["/var/lib/zabbix/enc"]
+VOLUME ["/etc/zabbix/zabbix_agentd.d", "/var/lib/zabbix/enc", "/var/lib/zabbix/modules"]
 
 COPY ["docker-entrypoint.sh", "/usr/bin/"]
 
diff --git a/agent/ubuntu/Dockerfile b/agent/ubuntu/Dockerfile
index 94d411b28..ff2db5ae3 100644
--- a/agent/ubuntu/Dockerfile
+++ b/agent/ubuntu/Dockerfile
@@ -118,6 +118,8 @@ WORKDIR /var/lib/zabbix
 
 VOLUME ["/etc/zabbix/zabbix_agentd.d", "/var/lib/zabbix/enc", "/var/lib/zabbix/modules"]
 
+COPY ["docker-entrypoint.sh", "/usr/bin/"]
+
 ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/docker-entrypoint.sh"]
 
 USER 1997
diff --git a/docker-compose_v3_ubuntu_mysql_latest.yaml b/docker-compose_v3_ubuntu_mysql_latest.yaml
index 72425def2..33e4e19fb 100644
--- a/docker-compose_v3_ubuntu_mysql_latest.yaml
+++ b/docker-compose_v3_ubuntu_mysql_latest.yaml
@@ -169,8 +169,8 @@ services:
  zabbix-web-apache-mysql:
   image: zabbix/zabbix-web-apache-mysql:ubuntu-latest
   ports:
-   - "80:80"
-   - "443:443"
+   - "80:8080"
+   - "443:8443"
   links:
    - mysql-server:mysql-server
    - zabbix-server:zabbix-server
@@ -196,7 +196,7 @@ services:
    - mysql-server
    - zabbix-server
   healthcheck:
-   test: ["CMD", "curl", "-f", "http://localhost"]
+   test: ["CMD", "curl", "-f", "http://localhost:8080/"]
    interval: 10s
    timeout: 5s
    retries: 3
@@ -222,8 +222,8 @@ services:
  zabbix-web-nginx-mysql:
   image: zabbix/zabbix-web-nginx-mysql:ubuntu-latest
   ports:
-   - "8081:80"
-   - "8443:443"
+   - "8081:8080"
+   - "8443:8443"
   links:
    - mysql-server:mysql-server
    - zabbix-server:zabbix-server
@@ -249,7 +249,7 @@ services:
    - mysql-server
    - zabbix-server
   healthcheck:
-   test: ["CMD", "curl", "-f", "http://localhost"]
+   test: ["CMD", "curl", "-f", "http://localhost:8080/"]
    interval: 10s
    timeout: 5s
    retries: 3
diff --git a/docker-compose_v3_ubuntu_mysql_local.yaml b/docker-compose_v3_ubuntu_mysql_local.yaml
index 90efb5f09..925f508d9 100644
--- a/docker-compose_v3_ubuntu_mysql_local.yaml
+++ b/docker-compose_v3_ubuntu_mysql_local.yaml
@@ -185,8 +185,8 @@ services:
     - ubuntu:bionic
   image: zabbix-web-apache-mysql:ubuntu-local
   ports:
-   - "80:80"
-   - "443:443"
+   - "80:8080"
+   - "443:8443"
   links:
    - mysql-server:mysql-server
    - zabbix-server:zabbix-server
@@ -212,7 +212,7 @@ services:
    - mysql-server
    - zabbix-server
   healthcheck:
-   test: ["CMD", "curl", "-f", "http://localhost"]
+   test: ["CMD", "curl", "-f", "http://localhost:8080/"]
    interval: 10s
    timeout: 5s
    retries: 3
@@ -242,8 +242,8 @@ services:
     - ubuntu:bionic
   image: zabbix-web-nginx-mysql:ubuntu-local
   ports:
-   - "8081:80"
-   - "8443:443"
+   - "8081:8080"
+   - "8443:8443"
   links:
    - mysql-server:mysql-server
    - zabbix-server:zabbix-server
@@ -269,7 +269,7 @@ services:
    - mysql-server
    - zabbix-server
   healthcheck:
-   test: ["CMD", "curl", "-f", "http://localhost"]
+   test: ["CMD", "curl", "-f", "http://localhost:8080/"]
    interval: 10s
    timeout: 5s
    retries: 3
diff --git a/docker-compose_v3_ubuntu_pgsql_latest.yaml b/docker-compose_v3_ubuntu_pgsql_latest.yaml
index 03078c108..d6aa1237f 100644
--- a/docker-compose_v3_ubuntu_pgsql_latest.yaml
+++ b/docker-compose_v3_ubuntu_pgsql_latest.yaml
@@ -172,8 +172,8 @@ services:
  zabbix-web-apache-pgsql:
   image: zabbix/zabbix-web-apache-pgsql:ubuntu-latest
   ports:
-   - "80:80"
-   - "443:443"
+   - "80:8080"
+   - "443:8443"
   links:
    - postgres-server:postgres-server
    - zabbix-server:zabbix-server
@@ -199,7 +199,7 @@ services:
    - postgres-server
    - zabbix-server
   healthcheck:
-   test: ["CMD", "curl", "-f", "http://localhost"]
+   test: ["CMD", "curl", "-f", "http://localhost:8080/"]
    interval: 10s
    timeout: 5s
    retries: 3
@@ -225,8 +225,8 @@ services:
  zabbix-web-nginx-pgsql:
   image: zabbix/zabbix-web-nginx-pgsql:ubuntu-latest
   ports:
-   - "8081:80"
-   - "8443:443"
+   - "8081:8080"
+   - "8443:8443"
   links:
    - postgres-server:postgres-server
    - zabbix-server:zabbix-server
@@ -252,7 +252,7 @@ services:
    - postgres-server
    - zabbix-server
   healthcheck:
-   test: ["CMD", "curl", "-f", "http://localhost"]
+   test: ["CMD", "curl", "-f", "http://localhost:8080/"]
    interval: 10s
    timeout: 5s
    retries: 3
diff --git a/docker-compose_v3_ubuntu_pgsql_local.yaml b/docker-compose_v3_ubuntu_pgsql_local.yaml
index 6d5804926..8731d68e1 100644
--- a/docker-compose_v3_ubuntu_pgsql_local.yaml
+++ b/docker-compose_v3_ubuntu_pgsql_local.yaml
@@ -177,8 +177,8 @@ services:
   build: ./web-apache-pgsql/ubuntu
   image: zabbix-web-apache-pgsql:ubuntu-local
   ports:
-   - "80:80"
-   - "443:443"
+   - "80:8080"
+   - "443:8443"
   links:
    - postgres-server:postgres-server
    - zabbix-server:zabbix-server
@@ -204,7 +204,7 @@ services:
    - postgres-server
    - zabbix-server
   healthcheck:
-   test: ["CMD", "curl", "-f", "http://localhost"]
+   test: ["CMD", "curl", "-f", "http://localhost:8080/"]
    interval: 10s
    timeout: 5s
    retries: 3
@@ -231,8 +231,8 @@ services:
   build: ./web-nginx-pgsql/ubuntu
   image: zabbix-web-nginx-pgsql:ubuntu-local
   ports:
-   - "8081:80"
-   - "8443:443"
+   - "8081:8080"
+   - "8443:8443"
   links:
    - postgres-server:postgres-server
    - zabbix-server:zabbix-server
@@ -258,7 +258,7 @@ services:
    - postgres-server
    - zabbix-server
   healthcheck:
-   test: ["CMD", "curl", "-f", "http://localhost"]
+   test: ["CMD", "curl", "-f", "http://localhost:8080/"]
    interval: 10s
    timeout: 5s
    retries: 3
diff --git a/snmptraps/ubuntu/.dockerignore b/snmptraps/ubuntu/.dockerignore
index 284c98d46..88a84e55a 100644
--- a/snmptraps/ubuntu/.dockerignore
+++ b/snmptraps/ubuntu/.dockerignore
@@ -1,2 +1 @@
 build.sh
-snmptrapfmt_1.14+nmu1ubuntu2.tar.gz
\ No newline at end of file
diff --git a/snmptraps/ubuntu/conf/etc/supervisor/conf.d/supervisord_snmptraps.conf b/snmptraps/ubuntu/conf/etc/supervisor/conf.d/supervisord_snmptraps.conf
index 86b471372..c40417824 100644
--- a/snmptraps/ubuntu/conf/etc/supervisor/conf.d/supervisord_snmptraps.conf
+++ b/snmptraps/ubuntu/conf/etc/supervisor/conf.d/supervisord_snmptraps.conf
@@ -17,7 +17,7 @@ stdout_logfile = /dev/stdout
 stdout_logfile_maxbytes = 0
 
 [program:snmptrapd]
-command = /usr/sbin/%(program_name)s -m '+ALL' -M /usr/share/snmp/mibs:/var/lib/snmp/mibs/iana:/var/lib/snmp/mibs/ietf:/var/lib/zabbix/mibs -f -n -Lo -p /var/run/snmptrapd.pid -C -c /etc/snmp/%(program_name)s.conf
+command = /usr/sbin/%(program_name)s -m '+ALL' -M /usr/share/snmp/mibs:/var/lib/snmp/mibs/iana:/var/lib/snmp/mibs/ietf:/var/lib/zabbix/mibs -f -n -Lo -p /var/run/snmptrapd.pid -C -c /etc/snmp/%(program_name)s.conf udp:0.0.0.0:1162
 auto_start = true
 autorestart = true
 priority = 100
diff --git a/snmptraps/ubuntu/conf/etc/supervisor/supervisord.conf b/snmptraps/ubuntu/conf/etc/supervisor/supervisord.conf
index 925bb1838..f8d80e461 100644
--- a/snmptraps/ubuntu/conf/etc/supervisor/supervisord.conf
+++ b/snmptraps/ubuntu/conf/etc/supervisor/supervisord.conf
@@ -1,17 +1,17 @@
 ; supervisor config file
 
 [unix_http_server]
-file = /var/run/supervisor.sock   ; (the path to the socket file)
+file = /tmp/supervisor.sock        ; (the path to the socket file)
 chmod = 0700                       ; sockef file mode (default 0700)
 username = zbx
 password = password
 
 [supervisord]
 logfile = /dev/stdout                        ; (main log file;default $CWD/supervisord.log)
-pidfile = /var/run/supervisord.pid           ; (supervisord pidfile;default supervisord.pid)
+pidfile = /tmp/supervisord.pid               ; (supervisord pidfile;default supervisord.pid)
 childlogdir = /tmp                           ; ('AUTO' child log dir, default $TEMP)
 critical = critical
-user = root
+;user = zabbix
 logfile_maxbytes = 0
 logfile_backupcount = 0
 loglevel = info
@@ -23,7 +23,7 @@ loglevel = info
 supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
 
 [supervisorctl]
-serverurl = unix:///var/run/supervisor.sock ; use a unix:// URL  for a unix socket
+serverurl = unix:///tmp/supervisor.sock ; use a unix:// URL  for a unix socket
 
 ; The [include] section can just contain the "files" setting.  This
 ; setting can list multiple files (separated by whitespace or
diff --git a/web-apache-mysql/ubuntu/Dockerfile b/web-apache-mysql/ubuntu/Dockerfile
index b359489bb..ee8e1f43c 100644
--- a/web-apache-mysql/ubuntu/Dockerfile
+++ b/web-apache-mysql/ubuntu/Dockerfile
@@ -35,6 +35,7 @@ RUN set -eux && \
             php7.2-mysql \
             php7.2-xml && \
     rm -f /etc/apache2/sites-available/* && \
+    rm -f /etc/apache2/sites-enabled/* && \
     /usr/sbin/a2enmod ssl && \
     sed -ri \
             -e 's!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g' \
@@ -115,4 +116,5 @@ USER 1997
 
 ENTRYPOINT ["docker-entrypoint.sh"]
 
-CMD ["source", "/etc/apache2/envvars", "&&", "/usr/sbin/apache2ctl", "-D", "FOREGROUND"]
+#CMD ["source", "/etc/apache2/envvars", "&&", "/usr/sbin/apache2ctl", "-D", "FOREGROUND"]
+CMD ["/usr/sbin/apache2ctl", "-D", "FOREGROUND"]
diff --git a/web-apache-mysql/ubuntu/docker-entrypoint.sh b/web-apache-mysql/ubuntu/docker-entrypoint.sh
index 181e85753..4b24e69bc 100755
--- a/web-apache-mysql/ubuntu/docker-entrypoint.sh
+++ b/web-apache-mysql/ubuntu/docker-entrypoint.sh
@@ -183,7 +183,7 @@ check_db_connect() {
 }
 
 prepare_web_server() {
-    APACHE_SITES_DIR="/etc/apache2/sites-available"
+    APACHE_SITES_DIR="/etc/apache2/sites-enabled"
 
     echo "** Adding Zabbix virtual host (HTTP)"
     if [ -f "$ZABBIX_ETC_DIR/apache.conf" ]; then
diff --git a/web-apache-pgsql/ubuntu/Dockerfile b/web-apache-pgsql/ubuntu/Dockerfile
index c9f2ab4a1..b93dfdd80 100644
--- a/web-apache-pgsql/ubuntu/Dockerfile
+++ b/web-apache-pgsql/ubuntu/Dockerfile
@@ -1,46 +1,31 @@
 FROM ubuntu:bionic
-LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
 
-ARG BUILD_DATE
-ARG VCS_REF
-
-ARG APT_FLAGS_COMMON="-y"
-ARG APT_FLAGS_PERSISTENT="${APT_FLAGS_COMMON} --no-install-recommends"
-ARG APT_FLAGS_DEV="${APT_FLAGS_COMMON} --no-install-recommends"
-ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 TERM=xterm \
-    ZBX_TYPE=frontend ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=apache
-
-LABEL org.label-schema.name="zabbix-web-${ZBX_OPT_TYPE}-${ZBX_DB_TYPE}-ubuntu" \
-      org.label-schema.vendor="Zabbix LLC" \
-      org.label-schema.url="https://zabbix.com/" \
-      org.label-schema.description="Zabbix web-interface based on Apache2 web server with PostgreSQL database support" \
-      org.label-schema.vcs-ref="${VCS_REF}" \
-      org.label-schema.build-date="${BUILD_DATE}" \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.license="GPL v2.0"
+LABEL org.opencontainers.image.title="Zabbix web-interface (Apache, PostgreSQL)" \
+      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 web-interface based on Apache2 web server with PostgreSQL database support" \
+      org.opencontainers.image.licenses="GPL v2.0"
 
 STOPSIGNAL SIGTERM
 
 RUN set -eux && \
-    apt-get ${APT_FLAGS_COMMON} update && \
-    DEBIAN_FRONTEND=noninteractive apt-get ${APT_FLAGS_PERSISTENT} install locales && \
-    locale-gen $LC_ALL && \
     echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
-    addgroup --system --quiet zabbix && \
+    addgroup --system --gid 1995 --quiet zabbix && \
     adduser --quiet \
             --system --disabled-login \
-            --ingroup zabbix \
+            --ingroup zabbix --ingroup root \
+            --uid 1997 \
             --home /var/lib/zabbix/ \
-            --no-create-home \
         zabbix && \
     mkdir -p /etc/zabbix && \
     mkdir -p /etc/zabbix/web && \
-    chown --quiet -R zabbix:root /etc/zabbix && \
-    apt-get ${APT_FLAGS_COMMON} update && \
-    DEBIAN_FRONTEND=noninteractive apt-get ${APT_FLAGS_PERSISTENT} install \
+    apt-get -y update && \
+    DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
             apache2 \
             curl \
             libapache2-mod-php \
+            ca-certificates \
             php7.2-bcmath \
             php7.2-gd \
             php7.2-json \
@@ -48,29 +33,44 @@ RUN set -eux && \
             php7.2-mbstring \
             php7.2-xml \
             php7.2-pgsql \
-            postgresql-client \
-            ttf-dejavu-core && \
-    apt-get ${APT_FLAGS_COMMON} autoremove && \
-    apt-get ${APT_FLAGS_COMMON} clean && \
+            postgresql-client && \
+    rm -f /etc/apache2/sites-available/* && \
+    rm -f /etc/apache2/sites-enabled/* && \
+    /usr/sbin/a2enmod ssl && \
+    sed -ri \
+            -e 's!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g' \
+            -e 's!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g' \
+            "/etc/apache2/apache2.conf" && \
+    sed -ri \
+            -e 's!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g' \
+            -e 's!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g' \
+            "/etc/apache2/conf-available/other-vhosts-access-log.conf" && \
+    sed -i 's/Listen 80/Listen 8080/g' /etc/apache2/ports.conf && \
+    sed -i 's/Listen 443/Listen 8443/g' /etc/apache2/ports.conf && \
+    sed -i 's|/var/run/apache2$SUFFIX|/tmp|g' /etc/apache2/envvars && \
+    rm -f /var/run/apache2/apache2.pid && \
+    apt-get -y autoremove && \
+    apt-get -y clean && \
     rm -rf /var/lib/apt/lists/*
 
 ARG MAJOR_VERSION=master
 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}
 
-LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
-      org.label-schema.version="${ZBX_VERSION}" \
-      org.label-schema.vcs-url="${ZBX_SOURCES}" \
-      org.label-schema.docker.cmd="docker run --name zabbix-web-${ZBX_OPT_TYPE}-pgsql --link postgres-server:postgres --link zabbix-server:zabbix-server -p 80:80 -d zabbix-web-${ZBX_OPT_TYPE}-pgsql:ubuntu-${ZBX_VERSION}"
+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}"
+
+COPY ["conf/etc/", "/etc/"]
 
 RUN set -eux && \
-    apt-get ${APT_FLAGS_COMMON} update && \
-    DEBIAN_FRONTEND=noninteractive apt-get ${APT_FLAGS_DEV} install \
+    apt-get -y update && \
+    DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
             gettext \
-            patch \
-            ca-certificates \
-            git && \
+            git \
+            locales && \
     cd /usr/share/ && \
     git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
     mkdir /usr/share/zabbix/ && \
@@ -80,6 +80,8 @@ RUN set -eux && \
     rm -f conf/zabbix.conf.php && \
     rm -rf tests && \
     ./locale/make_mo.sh && \
+    ln -s "/etc/zabbix/web/zabbix.conf.php" "/usr/share/zabbix/conf/zabbix.conf.php" && \
+    ./locale/make_mo.sh && \
     mkdir -p /var/lib/locales/supported.d/ && \
     rm -f /var/lib/locales/supported.d/local && \
     cat /usr/share/zabbix/include/locales.inc.php | grep display | grep true | awk '{$1=$1};1' | \
@@ -88,24 +90,31 @@ RUN set -eux && \
     dpkg-reconfigure locales && \
     find /usr/share/zabbix/locale -name '*.po' | xargs rm -f && \
     find /usr/share/zabbix/locale -name '*.sh' | xargs rm -f && \
-    DEBIAN_FRONTEND=noninteractive apt-get ${APT_FLAGS_COMMON} purge \
+    chown --quiet -R zabbix:root /etc/zabbix/ /usr/share/zabbix/conf/ && \
+    chgrp -R 0 /etc/zabbix/ /usr/share/zabbix/conf/ && \
+    chmod -R g=u /etc/zabbix/ /usr/share/zabbix/conf/ && \
+    chown --quiet -R zabbix:root /etc/apache2/ /etc/php/7.2/ && \
+    chgrp -R 0 /etc/apache2/ /etc/php/7.2/ && \
+    chmod -R g=u /etc/apache2/ /etc/php/7.2/ && \
+    DEBIAN_FRONTEND=noninteractive apt-get -y purge \
             gettext \
-            patch \
-            git && \
-    apt-get ${APT_FLAGS_COMMON} autoremove && \
-    apt-get ${APT_FLAGS_COMMON} clean && \
+            git \
+            locales && \
+    apt-get -y autoremove && \
+    apt-get -y clean && \
     rm -rf /var/lib/apt/lists/*
 
-EXPOSE 80/TCP 443/TCP
+EXPOSE 8080/TCP 8443/TCP
 
 WORKDIR /usr/share/zabbix
 
 VOLUME ["/etc/ssl/apache2"]
 
-COPY ["conf/etc/zabbix/apache.conf", "/etc/zabbix/"]
-COPY ["conf/etc/zabbix/apache_ssl.conf", "/etc/zabbix/"]
-COPY ["conf/etc/zabbix/web/zabbix.conf.php", "/etc/zabbix/web/"]
-COPY ["conf/etc/php/7.2/apache2/conf.d/99-zabbix.ini", "/etc/php/7.2/apache2/conf.d/"]
 COPY ["docker-entrypoint.sh", "/usr/bin/"]
 
+USER 1997
+
 ENTRYPOINT ["docker-entrypoint.sh"]
+
+#CMD ["source", "/etc/apache2/envvars", "&&", "/usr/sbin/apache2ctl", "-D", "FOREGROUND"]
+CMD ["/usr/sbin/apache2ctl", "-D", "FOREGROUND"]
diff --git a/web-apache-pgsql/ubuntu/docker-entrypoint.sh b/web-apache-pgsql/ubuntu/docker-entrypoint.sh
index a31f26a2a..8207e1c2f 100755
--- a/web-apache-pgsql/ubuntu/docker-entrypoint.sh
+++ b/web-apache-pgsql/ubuntu/docker-entrypoint.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -eo pipefail
+set -o pipefail
 
 set +e
 
@@ -9,34 +9,22 @@ if [ "${DEBUG_MODE}" == "true" ]; then
     set -o xtrace
 fi
 
-# Type of Zabbix component
-# Possible values: [server, proxy, agent, frontend, java-gateway, appliance]
-zbx_type=${ZBX_TYPE}
-# Type of Zabbix database
-# Possible values: [mysql, postgresql]
-zbx_db_type=${ZBX_DB_TYPE}
-# Type of web-server. Valid only with zbx_type = frontend
-# Possible values: [apache, nginx]
-zbx_opt_type=${ZBX_OPT_TYPE}
-
 # Default Zabbix installation name
 # Used only by Zabbix web-interface
-ZBX_SERVER_NAME=${ZBX_SERVER_NAME:-"Zabbix docker"}
+: ${ZBX_SERVER_NAME:="Zabbix docker"}
 # Default Zabbix server host
-ZBX_SERVER_HOST=${ZBX_SERVER_HOST:-"zabbix-server"}
+: ${ZBX_SERVER_HOST:="zabbix-server"}
 # Default Zabbix server port number
-ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"}
+: ${ZBX_SERVER_PORT:="10051"}
 
 # Default timezone for web interface
-PHP_TZ=${PHP_TZ:-"Europe/Riga"}
+: ${PHP_TZ:="Europe/Riga"}
 
 # Default directories
-# User 'zabbix' home directory
-ZABBIX_USER_HOME_DIR="/var/lib/zabbix"
 # Configuration files directory
 ZABBIX_ETC_DIR="/etc/zabbix"
 # Web interface www-root directory
-ZBX_FRONTEND_PATH="/usr/share/zabbix"
+ZABBIX_WWW_ROOT="/usr/share/zabbix"
 
 # usage: file_env VAR [DEFAULT]
 # as example: file_env 'MYSQL_PASSWORD' 'zabbix'
@@ -69,90 +57,8 @@ file_env() {
     unset "$fileVar"
 }
 
-configure_db_mysql() {
-    [ "${DB_SERVER_HOST}" != "localhost" ] && return
-
-    echo "** Configuring local MySQL server"
-
-    MYSQL_ALLOW_EMPTY_PASSWORD=true
-    MYSQL_DATA_DIR="/var/lib/mysql"
-
-    if [ -f "/etc/mysql/my.cnf" ]; then
-        MYSQL_CONF_FILE="/etc/mysql/my.cnf"
-    elif [ -f "/etc/my.cnf.d/server.cnf" ]; then
-        MYSQL_CONF_FILE="/etc/my.cnf.d/server.cnf"
-        DB_SERVER_SOCKET="/var/lib/mysql/mysql.sock"
-    elif [ -f "/etc/my.cnf.d/mariadb-server.cnf" ]; then
-        MYSQL_CONF_FILE="/etc/my.cnf.d/mariadb-server.cnf"
-        DB_SERVER_SOCKET="/var/run/mysqld/mysqld.sock"
-    else
-        echo "**** Could not found MySQL configuration file"
-        exit 1
-    fi
-
-    if [ -f "/usr/bin/mysqld" ]; then
-        MYSQLD=/usr/bin/mysqld
-    elif [ -f "/usr/sbin/mysqld" ]; then
-        MYSQLD=/usr/sbin/mysqld
-    elif [ -f "/usr/libexec/mysqld" ]; then
-        MYSQLD=/usr/libexec/mysqld
-    else
-        echo "**** Could not found mysqld binary file"
-        exit 1
-    fi
-
-    sed -Ei 's/^(bind-address|log)/#&/' "$MYSQL_CONF_FILE"
-
-    if [ ! -d "$MYSQL_DATA_DIR/mysql" ]; then
-        [ -d "$MYSQL_DATA_DIR" ] || mkdir -p "$MYSQL_DATA_DIR"
-
-        chown -R mysql:mysql "$MYSQL_DATA_DIR"
-
-        echo "** Installing initial MySQL database schemas"
-        mysql_install_db --user=mysql --datadir="$MYSQL_DATA_DIR" 2>&1
-    else
-        echo "**** MySQL data directory is not empty. Using already existing installation."
-        chown -R mysql:mysql "$MYSQL_DATA_DIR"
-    fi
-
-    mkdir -p /var/run/mysqld
-    ln -s /var/run/mysqld /run/mysqld
-    chown -R mysql:mysql /var/run/mysqld
-    chown -R mysql:mysql /run/mysqld
-
-    echo "** Starting MySQL server in background mode"
-
-    nohup $MYSQLD --basedir=/usr --datadir=/var/lib/mysql --plugin-dir=/usr/lib/mysql/plugin \
-            --user=mysql --log-output=none --pid-file=/var/lib/mysql/mysqld.pid \
-            --port=3306 --character-set-server=utf8 --collation-server=utf8_bin &
-}
-
 prepare_system() {
-    local type=$1
-    local web_server=$2
-
     echo "** Preparing the system"
-
-    if [ "$type" != "appliance" ]; then
-        return
-    fi
-
-    ZBX_ADD_AGENT=${ZBX_ADD_AGENT:-"false"}
-    ZBX_ADD_JAVA_GATEWAY=${ZBX_ADD_JAVA_GATEWAY:-"false"}
-    ZBX_ADD_SERVER=${ZBX_ADD_SERVER:-"true"}
-    [ "${ZBX_ADD_SERVER}" == "true" ] && ZBX_SERVER_HOST="localhost"
-    [ "${ZBX_ADD_SERVER}" == "true" ] && ZBX_SERVER_PORT="10051"
-    ZBX_MAIN_DB=${ZBX_MAIN_DB:-"mysql"}
-    ZBX_ADD_PROXY=${ZBX_ADD_PROXY:-"false"}
-    ZBX_PROXY_DB=${ZBX_PROXY_DB:-"sqlite3"}
-    ZBX_ADD_WEB=${ZBX_ADD_WEB:-"true"}
-    ZBX_WEB_SERVER=${ZBX_WEB_SERVER:-"nginx"}
-    DB_SERVER_HOST=${DB_SERVER_HOST:-"localhost"}
-    [ "${ZBX_ADD_JAVA_GATEWAY}" == "true" ] && ZBX_JAVAGATEWAY_ENABLE="true"
-    [ "${ZBX_ADD_JAVA_GATEWAY}" == "true" ] && ZBX_JAVAGATEWAY="localhost"
-    [ "${ZBX_ADD_JAVA_GATEWAY}" == "true" ] && ZBX_JAVAGATEWAYPORT="10052"
-
-    [ "${ZBX_ADD_SERVER}" == "true" ] && configure_db_${ZBX_MAIN_DB}
 }
 
 escape_spec_char() {
@@ -199,6 +105,7 @@ update_config_var() {
         return
     fi
 
+
     # Escaping characters in parameter value and name
     var_value=$(escape_spec_char "$var_value")
     var_name=$(escape_spec_char "$var_name")
@@ -216,78 +123,14 @@ update_config_var() {
 
 }
 
-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
-}
-
-# Check prerequisites for MySQL database
-check_variables_mysql() {
-    local type=$1
-
-    DB_SERVER_HOST=${DB_SERVER_HOST:-"mysql-server"}
-    DB_SERVER_PORT=${DB_SERVER_PORT:-"3306"}
-    USE_DB_ROOT_USER=false
-    CREATE_ZBX_DB_USER=false
-    file_env MYSQL_USER
-    file_env MYSQL_PASSWORD
-
-    if [ "$type" != "" ]; then
-        file_env MYSQL_ROOT_PASSWORD
-    fi
-
-    if [ ! -n "${MYSQL_USER}" ] && [ "${MYSQL_RANDOM_ROOT_PASSWORD}" == "true" ]; then
-        echo "**** Impossible to use MySQL server because of unknown Zabbix user and random 'root' password"
-        exit 1
-    fi
-
-    if [ ! -n "${MYSQL_USER}" ] && [ ! -n "${MYSQL_ROOT_PASSWORD}" ] && [ "${MYSQL_ALLOW_EMPTY_PASSWORD}" != "true" ]; then
-        echo "*** Impossible to use MySQL server because 'root' password is not defined and it is not empty"
-        exit 1
-    fi
-
-    if [ "${MYSQL_ALLOW_EMPTY_PASSWORD}" == "true" ] || [ -n "${MYSQL_ROOT_PASSWORD}" ]; then
-        USE_DB_ROOT_USER=true
-        DB_SERVER_ROOT_USER="root"
-        DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""}
-    fi
-
-    [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true
-
-    # If root password is not specified use provided credentials
-    DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}}
-    [ "${MYSQL_ALLOW_EMPTY_PASSWORD}" == "true" ] || DB_SERVER_ROOT_PASS=${DB_SERVER_ROOT_PASS:-${MYSQL_PASSWORD}}
-    DB_SERVER_ZBX_USER=${MYSQL_USER:-"zabbix"}
-    DB_SERVER_ZBX_PASS=${MYSQL_PASSWORD:-"zabbix"}
-
-    if [ "$type" == "proxy" ]; then
-        DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix_proxy"}
-    else
-        DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix"}
-    fi
-}
-
 # Check prerequisites for PostgreSQL database
-check_variables_postgresql() {
-    local type=$1
-
+check_variables() {
     file_env POSTGRES_USER
     file_env POSTGRES_PASSWORD
 
-    DB_SERVER_HOST=${DB_SERVER_HOST:-"postgres-server"}
-    DB_SERVER_PORT=${DB_SERVER_PORT:-"5432"}
-    CREATE_ZBX_DB_USER=${CREATE_ZBX_DB_USER:-"false"}
+    : ${DB_SERVER_HOST:="postgres-server"}
+    : ${DB_SERVER_PORT:="5432"}
+    : ${CREATE_ZBX_DB_USER:="false"}
 
     DB_SERVER_ROOT_USER=${POSTGRES_USER:-"postgres"}
     DB_SERVER_ROOT_PASS=${POSTGRES_PASSWORD:-""}
@@ -295,41 +138,12 @@ check_variables_postgresql() {
     DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"}
     DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"}
 
-    DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA:-"public"}
+    : ${DB_SERVER_SCHEMA:="public"}
 
-    if [ "$type" == "proxy" ]; then
-        DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"}
-    else
-        DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix"}
-    fi
+    DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix"}
 }
 
-check_db_connect_mysql() {
-    echo "********************"
-    echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}"
-    echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}"
-    echo "* DB_SERVER_DBNAME: ${DB_SERVER_DBNAME}"
-    if [ "${DEBUG_MODE}" == "true" ]; then
-        if [ "${USE_DB_ROOT_USER}" == "true" ]; then
-            echo "* DB_SERVER_ROOT_USER: ${DB_SERVER_ROOT_USER}"
-            echo "* DB_SERVER_ROOT_PASS: ${DB_SERVER_ROOT_PASS}"
-        fi
-        echo "* DB_SERVER_ZBX_USER: ${DB_SERVER_ZBX_USER}"
-        echo "* DB_SERVER_ZBX_PASS: ${DB_SERVER_ZBX_PASS}"
-        echo "********************"
-    fi
-    echo "********************"
-
-    WAIT_TIMEOUT=5
-
-    while [ ! "$(mysqladmin ping -h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT} -u ${DB_SERVER_ROOT_USER} \
-                --password="${DB_SERVER_ROOT_PASS}" --silent --connect_timeout=10)" ]; do
-        echo "**** MySQL server is not available. Waiting $WAIT_TIMEOUT seconds..."
-        sleep $WAIT_TIMEOUT
-    done
-}
-
-check_db_connect_postgresql() {
+check_db_connect() {
     echo "********************"
     echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}"
     echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}"
@@ -350,7 +164,6 @@ check_db_connect_postgresql() {
         DB_SERVER_ROOT_PASS=${DB_SERVER_ZBX_PASS}
     fi
 
-
     if [ -n "${DB_SERVER_ZBX_PASS}" ]; then
         export PGPASSWORD="${DB_SERVER_ZBX_PASS}"
     fi
@@ -371,540 +184,42 @@ check_db_connect_postgresql() {
     unset PGOPTIONS
 }
 
-
-mysql_query() {
-    query=$1
-    local result=""
-
-    result=$(mysql --silent --skip-column-names -h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT} \
-             -u ${DB_SERVER_ROOT_USER} --password="${DB_SERVER_ROOT_PASS}" -e "$query")
-
-    echo $result
-}
-
-psql_query() {
-    query=$1
-    db=$2
-
-    local result=""
-
-    if [ -n "${DB_SERVER_ZBX_PASS}" ]; then
-        export PGPASSWORD="${DB_SERVER_ZBX_PASS}"
-    fi
-    
-    if [ -n "${DB_SERVER_SCHEMA}" ]; then
-        PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}"
-        export PGOPTIONS
-    fi
-
-    result=$(psql -A -q -t  -h ${DB_SERVER_HOST} -p ${DB_SERVER_PORT} \
-             -U ${DB_SERVER_ROOT_USER} -c "$query" $db 2>/dev/null);
-
-    unset PGPASSWORD
-    unset PGOPTIONS
-
-    echo $result
-}
-
-create_db_user_mysql() {
-    [ "${CREATE_ZBX_DB_USER}" == "true" ] || return
-
-    echo "** Creating '${DB_SERVER_ZBX_USER}' user in MySQL database"
-
-    USER_EXISTS=$(mysql_query "SELECT 1 FROM mysql.user WHERE user = '${DB_SERVER_ZBX_USER}' AND host = '%'")
-
-    if [ -z "$USER_EXISTS" ]; then
-        mysql_query "CREATE USER '${DB_SERVER_ZBX_USER}'@'%' IDENTIFIED BY '${DB_SERVER_ZBX_PASS}'" 1>/dev/null
-    else
-        mysql_query "ALTER USER ${DB_SERVER_ZBX_USER} IDENTIFIED BY '${DB_SERVER_ZBX_PASS}';" 1>/dev/null
-    fi
-
-    mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
-}
-
-create_db_user_postgresql() {
-    [ "${CREATE_ZBX_DB_USER}" == "true" ] || return
-
-    echo "** Creating '${DB_SERVER_ZBX_USER}' user in PostgreSQL database"
-
-    USER_EXISTS=$(psql_query "SELECT 1 FROM pg_roles WHERE rolname='${DB_SERVER_ZBX_USER}'")
-
-    if [ -z "$USER_EXISTS" ]; then
-        psql_query "CREATE USER ${DB_SERVER_ZBX_USER} WITH PASSWORD '${DB_SERVER_ZBX_PASS}'" 1>/dev/null
-    else
-        psql_query "ALTER USER ${DB_SERVER_ZBX_USER} WITH ENCRYPTED PASSWORD '${DB_SERVER_ZBX_PASS}'" 1>/dev/null
-    fi
-}
-
-create_db_database_mysql() {
-    DB_EXISTS=$(mysql_query "SELECT SCHEMA_NAME FROM information_schema.SCHEMATA WHERE SCHEMA_NAME='${DB_SERVER_DBNAME}'")
-
-    if [ -z ${DB_EXISTS} ]; then
-        echo "** Database '${DB_SERVER_DBNAME}' does not exist. Creating..."
-        mysql_query "CREATE DATABASE ${DB_SERVER_DBNAME} CHARACTER SET utf8 COLLATE utf8_bin" 1>/dev/null
-        # better solution?
-        mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
-    else
-        echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database COLLATE!"
-    fi
-}
-
-create_db_database_postgresql() {
-    DB_EXISTS=$(psql_query "SELECT 1 AS result FROM pg_database WHERE datname='${DB_SERVER_DBNAME}'")
-
-    if [ -z ${DB_EXISTS} ]; then
-        echo "** Database '${DB_SERVER_DBNAME}' does not exist. Creating..."
-        psql_query "CREATE DATABASE ${DB_SERVER_DBNAME} WITH OWNER ${DB_SERVER_ZBX_USER} ENCODING='UTF8' LC_CTYPE='en_US.utf8' LC_COLLATE='en_US.utf8'" 1>/dev/null
-    else
-        echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!"
-    fi
-
-    psql_query "CREATE SCHEMA IF NOT EXISTS ${DB_SERVER_SCHEMA}"
-}
-
-create_db_schema_mysql() {
-    local type=$1
-
-    DBVERSION_TABLE_EXISTS=$(mysql_query "SELECT 1 FROM information_schema.tables WHERE table_schema='${DB_SERVER_DBNAME}' and table_name = 'dbversion'")
-
-    if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
-        echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
-        ZBX_DB_VERSION=$(mysql_query "SELECT mandatory FROM ${DB_SERVER_DBNAME}.dbversion")
-    fi
-
-    if [ -z "${ZBX_DB_VERSION}" ]; then
-        echo "** Creating '${DB_SERVER_DBNAME}' schema in MySQL"
-
-        zcat /usr/share/doc/zabbix-$type-mysql/create.sql.gz | mysql --silent --skip-column-names \
-                    -h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT} \
-                    -u ${DB_SERVER_ROOT_USER} --password="${DB_SERVER_ROOT_PASS}"  \
-                    ${DB_SERVER_DBNAME} 1>/dev/null
-    fi
-}
-
-create_db_schema_postgresql() {
-    local type=$1
-
-    DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = 
-                                         c.relnamespace WHERE  n.nspname = '$DB_SERVER_SCHEMA' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
-
-    if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
-        echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
-        ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_SCHEMA}.dbversion" "${DB_SERVER_DBNAME}")
-    fi
-
-    if [ -z "${ZBX_DB_VERSION}" ]; then
-        echo "** Creating '${DB_SERVER_DBNAME}' schema in PostgreSQL"
-
-        if [ -n "${DB_SERVER_ZBX_PASS}" ]; then
-            export PGPASSWORD="${DB_SERVER_ZBX_PASS}"
-        fi
-
-        if [ -n "${DB_SERVER_SCHEMA}" ]; then
-            PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}"
-            export PGOPTIONS
-        fi
-
-        zcat /usr/share/doc/zabbix-$type-postgresql/create.sql.gz | psql -q \
-                -h ${DB_SERVER_HOST} -p ${DB_SERVER_PORT} \
-                -U ${DB_SERVER_ZBX_USER} ${DB_SERVER_DBNAME} 1>/dev/null
-
-        unset PGPASSWORD
-        unset PGOPTIONS
-    fi
-}
-
-prepare_web_server_apache() {
-    if [ -d "/etc/apache2/sites-available" ]; then
-        APACHE_SITES_DIR=/etc/apache2/sites-available
-    elif [ -d "/etc/apache2/conf.d" ]; then
-        APACHE_SITES_DIR=/etc/apache2/conf.d
-    elif [ -d "/etc/httpd/conf.d" ]; then
-        APACHE_SITES_DIR=/etc/httpd/conf.d
-    else
-        echo "**** Apache is not available"
-        exit 1
-    fi
-
-    if [ -f "/usr/sbin/a2dissite" ]; then
-        echo "** Disable default site"
-        /usr/sbin/a2dissite 000-default 1>/dev/null
-        rm -rf "$APACHE_SITES_DIR/*"
-    elif [ -f "/etc/apache2/conf.d/default.conf" ]; then
-        echo "** Disable default site"
-        rm -f "/etc/apache2/conf.d/default.conf"
-    elif [ -f "/etc/httpd/conf.d/welcome.conf" ]; then
-        echo "** Disable default site"
-        rm -f "/etc/httpd/conf.d/welcome.conf"
-        rm -f "/etc/httpd/conf.d/ssl.conf"
-    fi
+prepare_web_server() {
+    APACHE_SITES_DIR="/etc/apache2/sites-enabled"
 
     echo "** Adding Zabbix virtual host (HTTP)"
     if [ -f "$ZABBIX_ETC_DIR/apache.conf" ]; then
         ln -s "$ZABBIX_ETC_DIR/apache.conf" "$APACHE_SITES_DIR/zabbix.conf"
-        if [ -f "/usr/sbin/a2dissite" ]; then
-            /usr/sbin/a2ensite zabbix.conf 1>/dev/null
-        fi
     else
         echo "**** Impossible to enable HTTP virtual host"
     fi
 
-    if [ -f "/etc/apache2/conf.d/ssl.conf" ]; then
-        rm -f "/etc/apache2/conf.d/ssl.conf"
-    fi
-
     if [ -f "/etc/ssl/apache2/ssl.crt" ] && [ -f "/etc/ssl/apache2/ssl.key" ]; then
-        echo "** Enable SSL support for Apache2"
-        if [ -f "/usr/sbin/a2enmod" ]; then
-            /usr/sbin/a2enmod ssl 1>/dev/null
-        fi
-
         echo "** Adding Zabbix virtual host (HTTPS)"
         if [ -f "$ZABBIX_ETC_DIR/apache_ssl.conf" ]; then
             ln -s "$ZABBIX_ETC_DIR/apache_ssl.conf" "$APACHE_SITES_DIR/zabbix_ssl.conf"
-            if [ -f "/usr/sbin/a2dissite" ]; then
-                /usr/sbin/a2ensite zabbix_ssl.conf 1>/dev/null
-            fi
         else
             echo "**** Impossible to enable HTTPS virtual host"
         fi
     else
         echo "**** Impossible to enable SSL support for Apache2. Certificates are missed."
     fi
-
-    # Change Apache2 logging to stdout and stderr
-    if [ -f "/etc/apache2/apache2.conf" ]; then
-        sed -ri \
-            -e 's!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g' \
-            -e 's!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g' \
-            "/etc/apache2/apache2.conf"
-    fi
-
-    if [ -f "/etc/httpd/conf/httpd.conf" ]; then
-        sed -ri \
-            -e 's!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g' \
-            -e 's!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g' \
-            "/etc/httpd/conf/httpd.conf"
-    fi
-
-    if [ -f "/etc/apache2/httpd.conf" ]; then
-        sed -ri \
-            -e 's!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g' \
-            -e 's!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g' \
-            "/etc/apache2/httpd.conf"
-    fi
-
-    if [ -f "/etc/apache2/conf-available/other-vhosts-access-log.conf" ]; then
-        sed -ri \
-            -e 's!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g' \
-            -e 's!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g' \
-            "/etc/apache2/conf-available/other-vhosts-access-log.conf"
-    fi
-
-    if [ -f "/etc/apache2/conf.d/mpm.conf" ]; then
-        sed -ri \
-            -e 's!^(\s*PidFile)\s+\S+!\1 "/var/run/httpd.pid"!g' \
-            "/etc/apache2/conf.d/mpm.conf"
-    fi
-
-    if [ -f "/var/run/apache2/apache2.pid" ]; then
-        rm -f "/var/run/apache2/apache2.pid"
-    fi
-
-    if [ -f "/var/run/httpd/httpd.pid" ]; then
-        rm -f "/var/run/httpd/httpd.pid"
-    fi
 }
 
-prepare_web_server_nginx() {
-    NGINX_CONFD_DIR="/etc/nginx/conf.d"
-    NGINX_SSL_CONFIG="/etc/ssl/nginx"
-    PHP_SESSIONS_DIR="/var/lib/php5"
-
-    echo "** Disable default vhosts"
-    rm -f $NGINX_CONFD_DIR/*.conf
-
-    echo "** Adding Zabbix virtual host (HTTP)"
-    if [ -f "$ZABBIX_ETC_DIR/nginx.conf" ]; then
-        ln -s "$ZABBIX_ETC_DIR/nginx.conf" "$NGINX_CONFD_DIR"
-    else
-        echo "**** Impossible to enable HTTP virtual host"
-    fi
-
-    if [ -f "$NGINX_SSL_CONFIG/ssl.crt" ] && [ -f "$NGINX_SSL_CONFIG/ssl.key" ] && [ -f "$NGINX_SSL_CONFIG/dhparam.pem" ]; then
-        echo "** Enable SSL support for Nginx"
-        if [ -f "$ZABBIX_ETC_DIR/nginx_ssl.conf" ]; then
-            ln -s "$ZABBIX_ETC_DIR/nginx_ssl.conf" "$NGINX_CONFD_DIR"
-        else
-            echo "**** Impossible to enable HTTPS virtual host"
-        fi
-    else
-        echo "**** Impossible to enable SSL support for Nginx. Certificates are missed."
-    fi
-
-    if [ -d "/var/log/nginx/" ]; then
-        ln -sf /dev/fd/2 /var/log/nginx/error.log
-    fi
-
-    ln -sf /dev/fd/2 /var/log/php5-fpm.log
-    ln -sf /dev/fd/2 /var/log/php7.2-fpm.log
-}
-
-stop_databases() {
-    if ([ "${ZBX_MAIN_DB}" == "mysql" ] || [ "${ZBX_PROXY_DB}" == "mysql" ]) && [ "${DB_SERVER_HOST}" == "localhost" ]; then
-        mysql_query "DELETE FROM mysql.user WHERE host = 'localhost' AND user != 'root'" 1>/dev/null
-
-        if [ -f "/var/lib/mysql/mysqld.pid" ]; then
-            kill -TERM $(cat /var/lib/mysql/mysqld.pid)
-        elif [ -f "/var/run/mysqld/mysqld.pid" ]; then
-            kill -TERM $(cat /var/run/mysqld/mysqld.pid)
-        fi
-    fi
-
-    if [ "${ZBX_MAIN_DB}" == "postgresql" ] && [ "${DB_SERVER_HOST}" == "localhost" ]; then
-        if [ "${OS_CODENAME}" == "alpine" ]; then
-            PGDATA=/var/lib/postgresql
-            BINDIR=/usr/bin
-        else
-            PGDATA=/var/lib/postgresql/9.3/main
-            BINDIR=/usr/lib/postgresql/9.3/bin
-        fi
-        su -c "$BINDIR/pg_ctl -D \"$PGDATA\" -m fast -w stop --silent" postgres 1>/dev/null 2>/dev/null
-    fi
-}
-
-clear_deploy() {
-    local type=$1
-    echo "** Cleaning the system"
-
-    [ "$type" != "appliance" ] && return
-
-    stop_databases
-}
-
-update_zbx_config() {
-    local type=$1
-    local db_type=$2
-
-    echo "** Preparing Zabbix $type configuration file"
-
-    ZBX_CONFIG=$ZABBIX_ETC_DIR/zabbix_$type.conf
-
-    if [ "$type" == "proxy" ]; then
-        update_config_var $ZBX_CONFIG "ProxyMode" "${ZBX_PROXYMODE}"
-        update_config_var $ZBX_CONFIG "Server" "${ZBX_SERVER_HOST}"
-        update_config_var $ZBX_CONFIG "ServerPort" "${ZBX_SERVER_PORT}"
-        if [ -z "${ZBX_HOSTNAME}" ] && [ -n "${ZBX_HOSTNAMEITEM}" ]; then
-            update_config_var $ZBX_CONFIG "Hostname" ""
-            update_config_var $ZBX_CONFIG "HostnameItem" "${ZBX_HOSTNAMEITEM}"
-        else
-            update_config_var $ZBX_CONFIG "Hostname" "${ZBX_HOSTNAME:-"zabbix-proxy-"$db_type}"
-            update_config_var $ZBX_CONFIG "HostnameItem" "${ZBX_HOSTNAMEITEM}"
-        fi
-    fi
-
-    if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
-        update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
-    else
-        update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
-    fi
-
-    update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
-    update_config_var $ZBX_CONFIG "LogType" "console"
-    update_config_var $ZBX_CONFIG "LogFile"
-    update_config_var $ZBX_CONFIG "LogFileSize"
-    update_config_var $ZBX_CONFIG "PidFile"
-
-    update_config_var $ZBX_CONFIG "DebugLevel" "${ZBX_DEBUGLEVEL}"
-
-    if [ "$db_type" == "sqlite3" ]; then
-        update_config_var $ZBX_CONFIG "DBHost"
-        update_config_var $ZBX_CONFIG "DBName" "/var/lib/zabbix/zabbix_proxy_db"
-        update_config_var $ZBX_CONFIG "DBUser"
-        update_config_var $ZBX_CONFIG "DBPort"
-        update_config_var $ZBX_CONFIG "DBPassword"
-    else
-        update_config_var $ZBX_CONFIG "DBHost" "${DB_SERVER_HOST}"
-        update_config_var $ZBX_CONFIG "DBName" "${DB_SERVER_DBNAME}"
-        update_config_var $ZBX_CONFIG "DBSchema" "${DB_SERVER_SCHEMA}"
-        update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}"
-        update_config_var $ZBX_CONFIG "DBPort" "${DB_SERVER_PORT}"
-        update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
-    fi
-
-    update_config_var $ZBX_CONFIG "DBSocket" "${DB_SERVER_SOCKET}"
-
-    if [ "$type" == "proxy" ]; then
-        update_config_var $ZBX_CONFIG "ProxyLocalBuffer" "${ZBX_PROXYLOCALBUFFER}"
-        update_config_var $ZBX_CONFIG "ProxyOfflineBuffer" "${ZBX_PROXYOFFLINEBUFFER}"
-        update_config_var $ZBX_CONFIG "HeartbeatFrequency" "${ZBX_PROXYHEARTBEATFREQUENCY}"
-        update_config_var $ZBX_CONFIG "ConfigFrequency" "${ZBX_CONFIGFREQUENCY}"
-        update_config_var $ZBX_CONFIG "DataSenderFrequency" "${ZBX_DATASENDERFREQUENCY}"
-    fi
-
-    update_config_var $ZBX_CONFIG "StartPollers" "${ZBX_STARTPOLLERS}"
-    update_config_var $ZBX_CONFIG "StartIPMIPollers" "${ZBX_IPMIPOLLERS}"
-    update_config_var $ZBX_CONFIG "StartPollersUnreachable" "${ZBX_STARTPOLLERSUNREACHABLE}"
-    update_config_var $ZBX_CONFIG "StartTrappers" "${ZBX_STARTTRAPPERS}"
-    update_config_var $ZBX_CONFIG "StartPingers" "${ZBX_STARTPINGERS}"
-    update_config_var $ZBX_CONFIG "StartDiscoverers" "${ZBX_STARTDISCOVERERS}"
-    update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}"
-
-    if [ "$type" == "server" ]; then
-        update_config_var $ZBX_CONFIG "StartTimers" "${ZBX_STARTTIMERS}"
-        update_config_var $ZBX_CONFIG "StartEscalators" "${ZBX_STARTESCALATORS}"
-    fi
-
-    ZBX_JAVAGATEWAY_ENABLE=${ZBX_JAVAGATEWAY_ENABLE:-"false"}
-    if [ "${ZBX_JAVAGATEWAY_ENABLE}" == "true" ]; then
-        update_config_var $ZBX_CONFIG "JavaGateway" "${ZBX_JAVAGATEWAY:-"zabbix-java-gateway"}"
-        update_config_var $ZBX_CONFIG "JavaGatewayPort" "${ZBX_JAVAGATEWAYPORT}"
-        update_config_var $ZBX_CONFIG "StartJavaPollers" "${ZBX_STARTJAVAPOLLERS:-"5"}"
-    else
-        update_config_var $ZBX_CONFIG "JavaGateway"
-        update_config_var $ZBX_CONFIG "JavaGatewayPort"
-        update_config_var $ZBX_CONFIG "StartJavaPollers"
-    fi
-
-    update_config_var $ZBX_CONFIG "StartVMwareCollectors" "${ZBX_STARTVMWARECOLLECTORS}"
-    update_config_var $ZBX_CONFIG "VMwareFrequency" "${ZBX_VMWAREFREQUENCY}"
-    update_config_var $ZBX_CONFIG "VMwarePerfFrequency" "${ZBX_VMWAREPERFFREQUENCY}"
-    update_config_var $ZBX_CONFIG "VMwareCacheSize" "${ZBX_VMWARECACHESIZE}"
-    update_config_var $ZBX_CONFIG "VMwareTimeout" "${ZBX_VMWARETIMEOUT}"
-
-    ZBX_ENABLE_SNMP_TRAPS=${ZBX_ENABLE_SNMP_TRAPS:-"false"}
-    if [ "${ZBX_ENABLE_SNMP_TRAPS}" == "true" ]; then
-        update_config_var $ZBX_CONFIG "SNMPTrapperFile" "${ZABBIX_USER_HOME_DIR}/snmptraps/snmptraps.log"
-        update_config_var $ZBX_CONFIG "StartSNMPTrapper" "1"
-    else
-        update_config_var $ZBX_CONFIG "SNMPTrapperFile"
-        update_config_var $ZBX_CONFIG "StartSNMPTrapper"
-    fi
-
-    update_config_var $ZBX_CONFIG "HousekeepingFrequency" "${ZBX_HOUSEKEEPINGFREQUENCY}"
-    if [ "$type" == "server" ]; then
-        update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}"
-        update_config_var $ZBX_CONFIG "SenderFrequency" "${ZBX_SENDERFREQUENCY}"
-    fi
-
-    update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}"
-
-    if [ "$type" == "server" ]; then
-        update_config_var $ZBX_CONFIG "CacheUpdateFrequency" "${ZBX_CACHEUPDATEFREQUENCY}"
-    fi
-
-    update_config_var $ZBX_CONFIG "StartDBSyncers" "${ZBX_STARTDBSYNCERS}"
-    update_config_var $ZBX_CONFIG "HistoryCacheSize" "${ZBX_HISTORYCACHESIZE}"
-    update_config_var $ZBX_CONFIG "HistoryIndexCacheSize" "${ZBX_HISTORYINDEXCACHESIZE}"
-
-    if [ "$type" == "server" ]; then 
-        update_config_var $ZBX_CONFIG "TrendCacheSize" "${ZBX_TRENDCACHESIZE}"
-        update_config_var $ZBX_CONFIG "ValueCacheSize" "${ZBX_VALUECACHESIZE}"
-    fi
-
-    update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}"
-    update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}"
-    update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}"
-    update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}"
-    update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}"
-
-    update_config_var $ZBX_CONFIG "AlertScriptsPath" "/usr/lib/zabbix/alertscripts"
-    update_config_var $ZBX_CONFIG "ExternalScripts" "/usr/lib/zabbix/externalscripts"
-
-    # Possible few fping locations
-    if [ -f "/usr/bin/fping" ]; then
-        update_config_var $ZBX_CONFIG "FpingLocation" "/usr/bin/fping"
-    else
-        update_config_var $ZBX_CONFIG "FpingLocation" "/usr/sbin/fping"
-    fi
-    if [ -f "/usr/bin/fping6" ]; then
-        update_config_var $ZBX_CONFIG "Fping6Location" "/usr/bin/fping6"
-    else
-        update_config_var $ZBX_CONFIG "Fping6Location" "/usr/sbin/fping6"
-    fi
-
-    update_config_var $ZBX_CONFIG "SSHKeyLocation" "$ZABBIX_USER_HOME_DIR/ssh_keys"
-    update_config_var $ZBX_CONFIG "LogSlowQueries" "${ZBX_LOGSLOWQUERIES}"
-
-    if [ "$type" == "server" ]; then 
-        update_config_var $ZBX_CONFIG "StartProxyPollers" "${ZBX_STARTPROXYPOLLERS}"
-        update_config_var $ZBX_CONFIG "ProxyConfigFrequency" "${ZBX_PROXYCONFIGFREQUENCY}"
-        update_config_var $ZBX_CONFIG "ProxyDataFrequency" "${ZBX_PROXYDATAFREQUENCY}"
-    fi
-
-    update_config_var $ZBX_CONFIG "SSLCertLocation" "$ZABBIX_USER_HOME_DIR/ssl/certs/"
-    update_config_var $ZBX_CONFIG "SSLKeyLocation" "$ZABBIX_USER_HOME_DIR/ssl/keys/"
-    update_config_var $ZBX_CONFIG "SSLCALocation" "$ZABBIX_USER_HOME_DIR/ssl/ssl_ca/"
-    update_config_var $ZBX_CONFIG "LoadModulePath" "$ZABBIX_USER_HOME_DIR/modules/"
-    update_config_multiple_var $ZBX_CONFIG "LoadModule" "${ZBX_LOADMODULE}"
-
-    if [ "$type" == "proxy" ]; then
-        update_config_var $ZBX_CONFIG "TLSConnect" "${ZBX_TLSCONNECT}"
-        update_config_var $ZBX_CONFIG "TLSAccept" "${ZBX_TLSACCEPT}"
-    fi
-    update_config_var $ZBX_CONFIG "TLSCAFile" "${ZBX_TLSCAFILE}"
-    update_config_var $ZBX_CONFIG "TLSCRLFile" "${ZBX_TLSCRLFILE}"
-
-    if [ "$type" == "proxy" ]; then
-        update_config_var $ZBX_CONFIG "TLSServerCertIssuer" "${ZBX_TLSSERVERCERTISSUER}"
-        update_config_var $ZBX_CONFIG "TLSServerCertSubject" "${ZBX_TLSSERVERCERTSUBJECT}"
-    fi
-
-    update_config_var $ZBX_CONFIG "TLSCertFile" "${ZBX_TLSCERTFILE}"
-    update_config_var $ZBX_CONFIG "TLSKeyFile" "${ZBX_TLSKEYFILE}"
-
-    if [ "$type" == "proxy" ]; then
-        update_config_var $ZBX_CONFIG "TLSPSKIdentity" "${ZBX_TLSPSKIDENTITY}"
-        update_config_var $ZBX_CONFIG "TLSPSKFile" "${ZBX_TLSPSKFILE}"
-    fi
-}
-
-
 prepare_zbx_web_config() {
-    local db_type=$1
     local server_name=""
 
     echo "** Preparing Zabbix frontend configuration file"
 
     ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php"
+    PHP_CONFIG_FILE="/etc/php/7.2/apache2/conf.d/99-zabbix.ini"
 
-    if [ -f "/usr/share/zabbix/conf/zabbix.conf.php" ]; then
-        rm -f "/usr/share/zabbix/conf/zabbix.conf.php"
-    fi
-
-    ln -s "$ZBX_WEB_CONFIG" "/usr/share/zabbix/conf/zabbix.conf.php"
-
-    # Different places of PHP configuration file
-    if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then
-        PHP_CONFIG_FILE="/etc/php5/conf.d/99-zabbix.ini"
-    elif [ -f "/etc/php5/fpm/conf.d/99-zabbix.ini" ]; then
-        PHP_CONFIG_FILE="/etc/php5/fpm/conf.d/99-zabbix.ini"
-    elif [ -f "/etc/php5/apache2/conf.d/99-zabbix.ini" ]; then
-        PHP_CONFIG_FILE="/etc/php5/apache2/conf.d/99-zabbix.ini"
-    elif [ -f "/etc/php/7.0/apache2/conf.d/99-zabbix.ini" ]; then
-        PHP_CONFIG_FILE="/etc/php/7.0/apache2/conf.d/99-zabbix.ini"
-    elif [ -f "/etc/php/7.0/fpm/conf.d/99-zabbix.ini" ]; then
-        PHP_CONFIG_FILE="/etc/php/7.0/fpm/conf.d/99-zabbix.ini"
-    elif [ -f "/etc/php.d/99-zabbix.ini" ]; then
-        PHP_CONFIG_FILE="/etc/php.d/99-zabbix.ini"
-    elif [ -f "/etc/php7/conf.d/99-zabbix.ini" ]; then
-        PHP_CONFIG_FILE="/etc/php7/conf.d/99-zabbix.ini"
-    elif [ -f "/etc/php/7.2/fpm/conf.d/99-zabbix.ini" ]; then
-        PHP_CONFIG_FILE="/etc/php/7.2/fpm/conf.d/99-zabbix.ini"
-    elif [ -f "/etc/php/7.2/apache2/conf.d/99-zabbix.ini" ]; then
-        PHP_CONFIG_FILE="/etc/php/7.2/apache2/conf.d/99-zabbix.ini"
-    fi
-
-    if [ -n "$PHP_CONFIG_FILE" ]; then
-        update_config_var "$PHP_CONFIG_FILE" "max_execution_time" "${ZBX_MAXEXECUTIONTIME:-"600"}"
-        update_config_var "$PHP_CONFIG_FILE" "memory_limit" "${ZBX_MEMORYLIMIT:-"128M"}" 
-        update_config_var "$PHP_CONFIG_FILE" "post_max_size" "${ZBX_POSTMAXSIZE:-"16M"}"
-        update_config_var "$PHP_CONFIG_FILE" "upload_max_filesize" "${ZBX_UPLOADMAXFILESIZE:-"2M"}"
-        update_config_var "$PHP_CONFIG_FILE" "max_input_time" "${ZBX_MAXINPUTTIME:-"300"}"
-        update_config_var "$PHP_CONFIG_FILE" "date.timezone" "${PHP_TZ}"
-    else
-        echo "**** Zabbix related PHP configuration file not found"
-    fi
+    update_config_var "$PHP_CONFIG_FILE" "max_execution_time" "${ZBX_MAXEXECUTIONTIME:-"600"}"
+    update_config_var "$PHP_CONFIG_FILE" "memory_limit" "${ZBX_MEMORYLIMIT:-"128M"}" 
+    update_config_var "$PHP_CONFIG_FILE" "post_max_size" "${ZBX_POSTMAXSIZE:-"16M"}"
+    update_config_var "$PHP_CONFIG_FILE" "upload_max_filesize" "${ZBX_UPLOADMAXFILESIZE:-"2M"}"
+    update_config_var "$PHP_CONFIG_FILE" "max_input_time" "${ZBX_MAXINPUTTIME:-"300"}"
+    update_config_var "$PHP_CONFIG_FILE" "date.timezone" "${PHP_TZ}"
 
     # Escaping characters in parameter value
     server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
@@ -922,223 +237,36 @@ prepare_zbx_web_config() {
         -e "s/{ZBX_SERVER_PORT}/${ZBX_SERVER_PORT}/g" \
         -e "s/{ZBX_SERVER_NAME}/$server_name/g" \
     "$ZBX_WEB_CONFIG"
-
-    [ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG"
-}
-
-prepare_zbx_agent_config() {
-    echo "** Preparing Zabbix agent configuration file"
-
-    ZBX_AGENT_CONFIG=$ZABBIX_ETC_DIR/zabbix_agentd.conf
-
-    ZBX_PASSIVESERVERS=${ZBX_PASSIVESERVERS:-""}
-    ZBX_ACTIVESERVERS=${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=${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=${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}"
-}
-
-prepare_java_gateway_config() {
-    echo "** Preparing Zabbix Java Gateway log configuration file"
-
-    ZBX_GATEWAY_CONFIG=$ZABBIX_ETC_DIR/zabbix_java_gateway_logback.xml
-
-    if [ -n "${ZBX_DEBUGLEVEL}" ]; then
-        echo "Updating $ZBX_GATEWAY_CONFIG 'DebugLevel' parameter: '${ZBX_DEBUGLEVEL}'... updated"
-        if [ -f "$ZBX_GATEWAY_CONFIG" ]; then
-            sed -i -e "/^.*<root level=/s/=.*/=\"${ZBX_DEBUGLEVEL}\">/" "$ZBX_GATEWAY_CONFIG"
-        else
-            echo "**** Zabbix Java Gateway log configuration file '$ZBX_GATEWAY_CONFIG' not found"
-        fi
-    fi
-}
-
-prepare_agent() {
-    echo "** Preparing Zabbix agent"
-    prepare_zbx_agent_config
-}
-
-prepare_server() {
-    local db_type=$1
-
-    echo "** Preparing Zabbix server"
-
-    check_variables_$db_type "server"
-    check_db_connect_$db_type
-    create_db_user_$db_type
-    create_db_database_$db_type
-    create_db_schema_$db_type "server"
-
-    update_zbx_config "server" "$db_type"
-}
-
-prepare_proxy() {
-    local db_type=$1
-
-    echo "Preparing Zabbix proxy"
-
-    if [ "$db_type" != "sqlite3" ]; then
-        check_variables_$db_type "proxy"
-        check_db_connect_$db_type
-        create_db_user_$db_type
-        create_db_database_$db_type
-        create_db_schema_$db_type "proxy"
-    fi
-
-    update_zbx_config "proxy" $db_type
 }
 
 prepare_web() {
-    local web_server=$1
-    local db_type=$2
-
     echo "** Preparing Zabbix web-interface"
-
-    check_variables_$db_type
-    check_db_connect_$db_type
-    prepare_web_server_$web_server
-    prepare_zbx_web_config $db_type
+        
+    check_variables
+    check_db_connect
+    prepare_web_server
+    prepare_zbx_web_config
 }
 
-prepare_java_gateway() {
-    echo "** Preparing Zabbix Java Gateway"
-
-    prepare_java_gateway_config
-}
 
 #################################################
 
-if [ ! -n "$zbx_type" ]; then
-    echo "**** Type of Zabbix component is not specified"
-    exit 1
-elif [ "$zbx_type" == "dev" ]; then
-    echo "** Deploying Zabbix installation from SVN"
-else
-    if [ ! -n "$zbx_db_type" ]; then
-        echo "**** Database type of Zabbix $zbx_type is not specified"
-        exit 1
-    fi
+echo "** Deploying Zabbix web-interface (Apache) with MySQL database"
 
-    if [ "$zbx_db_type" != "none" ]; then
-        if [ "$zbx_opt_type" != "none" ]; then
-            echo "** Deploying Zabbix $zbx_type ($zbx_opt_type) with $zbx_db_type database"
-        else
-            echo "** Deploying Zabbix $zbx_type with $zbx_db_type database"
-        fi
-    else
-        echo "** Deploying Zabbix $zbx_type"
-    fi
-fi
+prepare_system
 
-prepare_system "$zbx_type" "$zbx_opt_type"
+prepare_web
 
-[ "$zbx_type" == "server" ] && prepare_server $zbx_db_type
-[ "${ZBX_ADD_SERVER}" == "true" ] && prepare_server ${ZBX_MAIN_DB}
-
-[ "$zbx_type" == "proxy" ] && prepare_proxy $zbx_db_type
-[ "${ZBX_ADD_PROXY}" == "true" ] && prepare_proxy ${ZBX_PROXY_DB}
-
-[ "$zbx_type" == "frontend" ] && prepare_web $zbx_opt_type $zbx_db_type
-[ "${ZBX_ADD_WEB}" == "true" ] && prepare_web ${ZBX_WEB_SERVER} ${ZBX_MAIN_DB}
-
-[ "$zbx_type" == "agent" ] && prepare_agent
-[ "${ZBX_ADD_AGENT}" == "true" ] && prepare_agent
-
-[ "$zbx_type" == "java-gateway" ] && prepare_java_gateway
-[ "${ZBX_ADD_JAVA_GATEWAY}" == "true" ] && prepare_java_gateway
-
-clear_deploy "$zbx_type"
+clear_deploy
 
 echo "########################################################"
 
 if [ "$1" != "" ]; then
     echo "** Executing '$@'"
     exec "$@"
-elif [ "$zbx_type" == "agent" ]; then
-    echo "** Starting Zabbix agent"
-    exec su zabbix -s "/bin/bash" -c "/usr/sbin/zabbix_agentd --foreground -c /etc/zabbix/zabbix_agentd.conf"
-elif [ "$zbx_type" == "proxy" ]; then
-    echo "** Starting Zabbix proxy"
-    exec su zabbix -s "/bin/bash" -c "/usr/sbin/zabbix_proxy --foreground -c /etc/zabbix/zabbix_proxy.conf"
-elif [ "$zbx_type" == "server" ]; then
-    echo "** Starting Zabbix server"
-    exec su zabbix -s "/bin/bash" -c "/usr/sbin/zabbix_server --foreground -c /etc/zabbix/zabbix_server.conf"
-elif [ "$zbx_type" == "java-gateway" ]; then
-    echo "** Starting Zabbix Java Gateway"
-    exec su zabbix -s "/bin/bash" -c "/usr/sbin/zabbix_java_gateway"
-elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
-    echo "** Starting Zabbix frontend"
-    if [ -f "/usr/sbin/httpd" ]; then
-        exec /usr/sbin/httpd -D FOREGROUND
-    elif [ -f "/usr/sbin/apache2ctl" ]; then
-        exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
-    else
-        echo "Unknown Web-server. Exiting..."
-        exit 1
-    fi
-elif [ -f "/usr/bin/supervisord" ]; then
-    echo "** Executing supervisord"
-    exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf
+elif [ -f "/usr/sbin/httpd" ]; then
+    echo "** Executing HTTPD"
+    exec /usr/sbin/httpd -D FOREGROUND
 else
     echo "Unknown instructions. Exiting..."
     exit 1
diff --git a/web-nginx-mysql/ubuntu/Dockerfile b/web-nginx-mysql/ubuntu/Dockerfile
index b182ef961..30b547c9e 100644
--- a/web-nginx-mysql/ubuntu/Dockerfile
+++ b/web-nginx-mysql/ubuntu/Dockerfile
@@ -1,42 +1,25 @@
 FROM ubuntu:bionic
-LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
 
-ARG BUILD_DATE
-ARG VCS_REF
+LABEL org.opencontainers.image.title="Zabbix web-interface (Nginx, MySQL)" \
+      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 web-interface based on Nginx web server with MySQL database support" \
+      org.opencontainers.image.licenses="GPL v2.0"
 
-ARG APT_FLAGS_COMMON="-y"
-ARG APT_FLAGS_PERSISTENT="${APT_FLAGS_COMMON} --no-install-recommends"
-ARG APT_FLAGS_DEV="${APT_FLAGS_COMMON} --no-install-recommends"
-ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 TERM=xterm \
-    ZBX_TYPE=frontend ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=nginx
-
-LABEL org.label-schema.name="zabbix-web-${ZBX_OPT_TYPE}-${ZBX_DB_TYPE}-ubuntu" \
-      org.label-schema.vendor="Zabbix LLC" \
-      org.label-schema.url="https://zabbix.com/" \
-      org.label-schema.description="Zabbix web-interface based on Nginx web server with MySQL database support" \
-      org.label-schema.vcs-ref="${VCS_REF}" \
-      org.label-schema.build-date="${BUILD_DATE}" \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.license="GPL v2.0"
-    
 STOPSIGNAL SIGTERM
 
 RUN set -eux && \
-    apt-get ${APT_FLAGS_COMMON} update && \
-    DEBIAN_FRONTEND=noninteractive apt-get ${APT_FLAGS_PERSISTENT} install locales gnupg2 ca-certificates && \
-    locale-gen $LC_ALL && \
-    echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
-    addgroup --system --quiet zabbix && \
+    addgroup --system --gid 1995 --quiet zabbix && \
     adduser --quiet \
             --system --disabled-login \
-            --ingroup zabbix \
+            --ingroup zabbix --ingroup root \
+            --uid 1997 \
             --home /var/lib/zabbix/ \
-            --no-create-home \
         zabbix && \
     mkdir -p /etc/zabbix && \
     mkdir -p /etc/zabbix/web && \
-    chown --quiet -R zabbix:root /etc/zabbix && \
-    apt-get ${APT_FLAGS_COMMON} update && \
+    apt-get -y update && \
     NGINX_GPGKEY=573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62; \
     found=''; \
     for server in \
@@ -51,8 +34,8 @@ RUN set -eux && \
     test -z "$found" && echo >&2 "error: failed to fetch GPG key $NGINX_GPGKEY" && exit 1; \
     DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CODENAME') && \
     echo "deb https://nginx.org/packages/ubuntu/ $DISTRIB_CODENAME nginx" >> /etc/apt/sources.list.d/nginx.list && \
-    apt-get ${APT_FLAGS_COMMON} update && \
-    DEBIAN_FRONTEND=noninteractive apt-get ${APT_FLAGS_PERSISTENT} install \
+    apt-get -y update && \
+    DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
             curl \
             mysql-client \
             nginx \
@@ -66,30 +49,31 @@ RUN set -eux && \
             php7.2-xml \
             supervisor && \
     rm -f /etc/nginx/conf.d/*.conf && \
-    DEBIAN_FRONTEND=noninteractive apt-get ${APT_FLAGS_COMMON} purge \
+    rm -rf /var/cache/nginx/ && \
+    DEBIAN_FRONTEND=noninteractive apt-get -y purge \
             wget && \
-    apt-get ${APT_FLAGS_COMMON} autoremove && \
-    apt-get ${APT_FLAGS_COMMON} clean && \
-    mkdir -p /var/lib/php7 && \
-    chown --quiet -R www-data:www-data /var/lib/php7 && \
-    rm -rf /var/cache/nginx/* && \
+    apt-get -y autoremove && \
+    apt-get -y clean && \
     rm -rf /var/lib/apt/lists/*
 
 ARG MAJOR_VERSION=master
 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}
 
-LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
-      org.label-schema.version="${ZBX_VERSION}" \
-      org.label-schema.vcs-url="${ZBX_SOURCES}" \
-      org.label-schema.docker.cmd="docker run --name zabbix-web-${ZBX_OPT_TYPE}-${ZBX_DB_TYPE} --link mysql-server:mysql --link zabbix-server:zabbix-server -p 80:80 -d zabbix-web-${ZBX_OPT_TYPE}-${ZBX_DB_TYPE}:ubuntu-${ZBX_VERSION}"
+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}"
+
+COPY ["conf/etc/", "/etc/"]
 
 RUN set -eux && \
-    apt-get ${APT_FLAGS_COMMON} update && \
-    DEBIAN_FRONTEND=noninteractive apt-get ${APT_FLAGS_DEV} install \
+    apt-get -y update && \
+    DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
             gettext \
-            git && \
+            git \
+            locales && \
     cd /usr/share/ && \
     git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
     mkdir /usr/share/zabbix/ && \
@@ -99,6 +83,8 @@ RUN set -eux && \
     rm -f conf/zabbix.conf.php && \
     rm -rf tests && \
     ./locale/make_mo.sh && \
+    ln -s "/etc/zabbix/web/zabbix.conf.php" "/usr/share/zabbix/conf/zabbix.conf.php" && \
+    ./locale/make_mo.sh && \
     mkdir -p /var/lib/locales/supported.d/ && \
     rm -f /var/lib/locales/supported.d/local && \
     cat /usr/share/zabbix/include/locales.inc.php | grep display | grep true | awk '{$1=$1};1' | \
@@ -107,25 +93,23 @@ RUN set -eux && \
     dpkg-reconfigure locales && \
     find /usr/share/zabbix/locale -name '*.po' | xargs rm -f && \
     find /usr/share/zabbix/locale -name '*.sh' | xargs rm -f && \
-    DEBIAN_FRONTEND=noninteractive apt-get ${APT_FLAGS_COMMON} purge \
+    chown --quiet -R zabbix:root /etc/zabbix/ /usr/share/zabbix/conf/ && \
+    chgrp -R 0 /etc/zabbix/ /usr/share/zabbix/conf/ && \
+    chmod -R g=u /etc/zabbix/ /usr/share/zabbix/conf/ && \
+    DEBIAN_FRONTEND=noninteractive apt-get -y purge \
             gettext \
-            git && \
-    apt-get ${APT_FLAGS_COMMON} autoremove && \
-    apt-get ${APT_FLAGS_COMMON} clean && \
+            git \
+            locales && \
+    apt-get -y autoremove && \
+    apt-get -y clean && \
     rm -rf /var/lib/apt/lists/*
 
-EXPOSE 80/TCP 443/TCP
+EXPOSE 8080/TCP 8443/TCP
 
 WORKDIR /usr/share/zabbix
 
 VOLUME ["/etc/ssl/nginx"]
 
-COPY ["conf/etc/supervisor/", "/etc/supervisor/"]
-COPY ["conf/etc/zabbix/nginx.conf", "/etc/zabbix/"]
-COPY ["conf/etc/zabbix/nginx_ssl.conf", "/etc/zabbix/"]
-COPY ["conf/etc/zabbix/web/zabbix.conf.php", "/etc/zabbix/web/"]
-COPY ["conf/etc/nginx/nginx.conf", "/etc/nginx/"]
-COPY ["conf/etc/php/7.2/fpm/conf.d/99-zabbix.ini", "/etc/php/7.2/fpm/conf.d/"]
 COPY ["docker-entrypoint.sh", "/usr/bin/"]
 
 ENTRYPOINT ["docker-entrypoint.sh"]
diff --git a/web-nginx-mysql/ubuntu/conf/etc/nginx/nginx.conf b/web-nginx-mysql/ubuntu/conf/etc/nginx/nginx.conf
index fe6ad67e0..3bed3cf89 100644
--- a/web-nginx-mysql/ubuntu/conf/etc/nginx/nginx.conf
+++ b/web-nginx-mysql/ubuntu/conf/etc/nginx/nginx.conf
@@ -1,10 +1,10 @@
-user www-data;
+#user nginx;
 worker_processes 5;
-#worker_rlimit_nofile 256000;
+worker_rlimit_nofile 256000;
 
-error_log /dev/fd/2 warn;
+error_log /dev/fd/2 error;
 
-pid        /var/run/nginx.pid;
+pid        /tmp/nginx.pid;
 
 events {
     worker_connections 5120;
@@ -21,6 +21,13 @@ http {
                     '"$http_user_agent" "$http_x_forwarded_for"';
 
     access_log /dev/fd/1 main;
+    error_log /dev/fd/2 error;
+
+    client_body_temp_path /tmp/client_body 1 2;
+    proxy_temp_path /tmp/proxy 1 2;
+    fastcgi_temp_path /tmp/fastcgi 1 2;
+    uwsgi_temp_path /tmp/uwsgi 1 2;
+    scgi_temp_path /tmp/scgi 1 2;
 
     client_body_timeout             5m;
     send_timeout                    5m;
diff --git a/web-nginx-mysql/ubuntu/conf/etc/supervisor/supervisord.conf b/web-nginx-mysql/ubuntu/conf/etc/supervisor/supervisord.conf
index 925bb1838..f8d80e461 100644
--- a/web-nginx-mysql/ubuntu/conf/etc/supervisor/supervisord.conf
+++ b/web-nginx-mysql/ubuntu/conf/etc/supervisor/supervisord.conf
@@ -1,17 +1,17 @@
 ; supervisor config file
 
 [unix_http_server]
-file = /var/run/supervisor.sock   ; (the path to the socket file)
+file = /tmp/supervisor.sock        ; (the path to the socket file)
 chmod = 0700                       ; sockef file mode (default 0700)
 username = zbx
 password = password
 
 [supervisord]
 logfile = /dev/stdout                        ; (main log file;default $CWD/supervisord.log)
-pidfile = /var/run/supervisord.pid           ; (supervisord pidfile;default supervisord.pid)
+pidfile = /tmp/supervisord.pid               ; (supervisord pidfile;default supervisord.pid)
 childlogdir = /tmp                           ; ('AUTO' child log dir, default $TEMP)
 critical = critical
-user = root
+;user = zabbix
 logfile_maxbytes = 0
 logfile_backupcount = 0
 loglevel = info
@@ -23,7 +23,7 @@ loglevel = info
 supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
 
 [supervisorctl]
-serverurl = unix:///var/run/supervisor.sock ; use a unix:// URL  for a unix socket
+serverurl = unix:///tmp/supervisor.sock ; use a unix:// URL  for a unix socket
 
 ; The [include] section can just contain the "files" setting.  This
 ; setting can list multiple files (separated by whitespace or
diff --git a/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx.conf b/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx.conf
index e1331f0bf..0d5decc6f 100644
--- a/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx.conf
+++ b/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx.conf
@@ -1,5 +1,5 @@
 server {
-    listen          80;
+    listen          8080;
     server_name     zabbix;
     index           index.php;
 
diff --git a/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx_ssl.conf b/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx_ssl.conf
index 2d68009ab..c8b5423aa 100644
--- a/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx_ssl.conf
+++ b/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx_ssl.conf
@@ -1,5 +1,5 @@
 server {
-    listen          443 ssl http2;
+    listen          8443 ssl http2;
     server_name     zabbix;
     server_name_in_redirect off;
 
diff --git a/web-nginx-mysql/ubuntu/docker-entrypoint.sh b/web-nginx-mysql/ubuntu/docker-entrypoint.sh
index 9d07320e5..6e98197ef 100755
--- a/web-nginx-mysql/ubuntu/docker-entrypoint.sh
+++ b/web-nginx-mysql/ubuntu/docker-entrypoint.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -eo pipefail
+set -o pipefail
 
 set +e
 
@@ -9,16 +9,6 @@ if [ "${DEBUG_MODE}" == "true" ]; then
     set -o xtrace
 fi
 
-# Type of Zabbix component
-# Possible values: [server, proxy, agent, frontend, java-gateway, appliance]
-zbx_type=${ZBX_TYPE}
-# Type of Zabbix database
-# Possible values: [mysql, postgresql]
-zbx_db_type=${ZBX_DB_TYPE}
-# Type of web-server. Valid only with zbx_type = frontend
-# Possible values: [apache, nginx]
-zbx_opt_type=${ZBX_OPT_TYPE}
-
 # Default Zabbix installation name
 # Used only by Zabbix web-interface
 ZBX_SERVER_NAME=${ZBX_SERVER_NAME:-"Zabbix docker"}
@@ -69,90 +59,8 @@ file_env() {
     unset "$fileVar"
 }
 
-configure_db_mysql() {
-    [ "${DB_SERVER_HOST}" != "localhost" ] && return
-
-    echo "** Configuring local MySQL server"
-
-    MYSQL_ALLOW_EMPTY_PASSWORD=true
-    MYSQL_DATA_DIR="/var/lib/mysql"
-
-    if [ -f "/etc/mysql/my.cnf" ]; then
-        MYSQL_CONF_FILE="/etc/mysql/my.cnf"
-    elif [ -f "/etc/my.cnf.d/server.cnf" ]; then
-        MYSQL_CONF_FILE="/etc/my.cnf.d/server.cnf"
-        DB_SERVER_SOCKET="/var/lib/mysql/mysql.sock"
-    elif [ -f "/etc/my.cnf.d/mariadb-server.cnf" ]; then
-        MYSQL_CONF_FILE="/etc/my.cnf.d/mariadb-server.cnf"
-        DB_SERVER_SOCKET="/var/run/mysqld/mysqld.sock"
-    else
-        echo "**** Could not found MySQL configuration file"
-        exit 1
-    fi
-
-    if [ -f "/usr/bin/mysqld" ]; then
-        MYSQLD=/usr/bin/mysqld
-    elif [ -f "/usr/sbin/mysqld" ]; then
-        MYSQLD=/usr/sbin/mysqld
-    elif [ -f "/usr/libexec/mysqld" ]; then
-        MYSQLD=/usr/libexec/mysqld
-    else
-        echo "**** Could not found mysqld binary file"
-        exit 1
-    fi
-
-    sed -Ei 's/^(bind-address|log)/#&/' "$MYSQL_CONF_FILE"
-
-    if [ ! -d "$MYSQL_DATA_DIR/mysql" ]; then
-        [ -d "$MYSQL_DATA_DIR" ] || mkdir -p "$MYSQL_DATA_DIR"
-
-        chown -R mysql:mysql "$MYSQL_DATA_DIR"
-
-        echo "** Installing initial MySQL database schemas"
-        mysql_install_db --user=mysql --datadir="$MYSQL_DATA_DIR" 2>&1
-    else
-        echo "**** MySQL data directory is not empty. Using already existing installation."
-        chown -R mysql:mysql "$MYSQL_DATA_DIR"
-    fi
-
-    mkdir -p /var/run/mysqld
-    ln -s /var/run/mysqld /run/mysqld
-    chown -R mysql:mysql /var/run/mysqld
-    chown -R mysql:mysql /run/mysqld
-
-    echo "** Starting MySQL server in background mode"
-
-    nohup $MYSQLD --basedir=/usr --datadir=/var/lib/mysql --plugin-dir=/usr/lib/mysql/plugin \
-            --user=mysql --log-output=none --pid-file=/var/lib/mysql/mysqld.pid \
-            --port=3306 --character-set-server=utf8 --collation-server=utf8_bin &
-}
-
 prepare_system() {
-    local type=$1
-    local web_server=$2
-
     echo "** Preparing the system"
-
-    if [ "$type" != "appliance" ]; then
-        return
-    fi
-
-    ZBX_ADD_AGENT=${ZBX_ADD_AGENT:-"false"}
-    ZBX_ADD_JAVA_GATEWAY=${ZBX_ADD_JAVA_GATEWAY:-"false"}
-    ZBX_ADD_SERVER=${ZBX_ADD_SERVER:-"true"}
-    [ "${ZBX_ADD_SERVER}" == "true" ] && ZBX_SERVER_HOST="localhost"
-    [ "${ZBX_ADD_SERVER}" == "true" ] && ZBX_SERVER_PORT="10051"
-    ZBX_MAIN_DB=${ZBX_MAIN_DB:-"mysql"}
-    ZBX_ADD_PROXY=${ZBX_ADD_PROXY:-"false"}
-    ZBX_PROXY_DB=${ZBX_PROXY_DB:-"sqlite3"}
-    ZBX_ADD_WEB=${ZBX_ADD_WEB:-"true"}
-    ZBX_WEB_SERVER=${ZBX_WEB_SERVER:-"nginx"}
-    DB_SERVER_HOST=${DB_SERVER_HOST:-"localhost"}
-    [ "${ZBX_ADD_JAVA_GATEWAY}" == "true" ] && ZBX_JAVAGATEWAY_ENABLE="true"
-    [ "${ZBX_ADD_JAVA_GATEWAY}" == "true" ] && ZBX_JAVAGATEWAY="localhost"
-    [ "${ZBX_ADD_JAVA_GATEWAY}" == "true" ] && ZBX_JAVAGATEWAYPORT="10052"
-
-    [ "${ZBX_ADD_SERVER}" == "true" ] && configure_db_${ZBX_MAIN_DB}
 }
 
 escape_spec_char() {
@@ -199,13 +107,9 @@ update_config_var() {
         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
+    # Escaping characters in parameter value and name
     var_value=$(escape_spec_char "$var_value")
+    var_name=$(escape_spec_char "$var_name")
 
     if [ "$(grep -E "^$var_name=" $config_path)" ] && [ "$is_multiple" != "true" ]; then
         sed -i -e "/^$var_name=/s/=.*/=$var_value/" "$config_path"
@@ -237,20 +141,14 @@ update_config_multiple_var() {
 }
 
 # Check prerequisites for MySQL database
-check_variables_mysql() {
-    local type=$1
-
-    DB_SERVER_HOST=${DB_SERVER_HOST:-"mysql-server"}
-    DB_SERVER_PORT=${DB_SERVER_PORT:-"3306"}
+check_variables() {
+    : ${DB_SERVER_HOST:="mysql-server"}
+    : ${DB_SERVER_PORT:="3306"}
     USE_DB_ROOT_USER=false
     CREATE_ZBX_DB_USER=false
     file_env MYSQL_USER
     file_env MYSQL_PASSWORD
 
-    if [ "$type" != "" ]; then
-        file_env MYSQL_ROOT_PASSWORD
-    fi
-
     if [ ! -n "${MYSQL_USER}" ] && [ "${MYSQL_RANDOM_ROOT_PASSWORD}" == "true" ]; then
         echo "**** Impossible to use MySQL server because of unknown Zabbix user and random 'root' password"
         exit 1
@@ -270,45 +168,15 @@ check_variables_mysql() {
     [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true
 
     # If root password is not specified use provided credentials
-    DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}}
+    : ${DB_SERVER_ROOT_USER:=${MYSQL_USER}}....
     [ "${MYSQL_ALLOW_EMPTY_PASSWORD}" == "true" ] || DB_SERVER_ROOT_PASS=${DB_SERVER_ROOT_PASS:-${MYSQL_PASSWORD}}
     DB_SERVER_ZBX_USER=${MYSQL_USER:-"zabbix"}
     DB_SERVER_ZBX_PASS=${MYSQL_PASSWORD:-"zabbix"}
 
-    if [ "$type" == "proxy" ]; then
-        DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix_proxy"}
-    else
-        DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix"}
-    fi
+    DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix"}
 }
 
-# Check prerequisites for PostgreSQL database
-check_variables_postgresql() {
-    local type=$1
-
-    file_env POSTGRES_USER
-    file_env POSTGRES_PASSWORD
-
-    DB_SERVER_HOST=${DB_SERVER_HOST:-"postgres-server"}
-    DB_SERVER_PORT=${DB_SERVER_PORT:-"5432"}
-    CREATE_ZBX_DB_USER=${CREATE_ZBX_DB_USER:-"false"}
-
-    DB_SERVER_ROOT_USER=${POSTGRES_USER:-"postgres"}
-    DB_SERVER_ROOT_PASS=${POSTGRES_PASSWORD:-""}
-
-    DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"}
-    DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"}
-
-    DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA:-"public"}
-
-    if [ "$type" == "proxy" ]; then
-        DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"}
-    else
-        DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix"}
-    fi
-}
-
-check_db_connect_mysql() {
+check_db_connect() {
     echo "********************"
     echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}"
     echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}"
@@ -333,297 +201,9 @@ check_db_connect_mysql() {
     done
 }
 
-check_db_connect_postgresql() {
-    echo "********************"
-    echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}"
-    echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}"
-    echo "* DB_SERVER_DBNAME: ${DB_SERVER_DBNAME}"
-    echo "* DB_SERVER_SCHEMA: ${DB_SERVER_SCHEMA}"
-    if [ "${DEBUG_MODE}" == "true" ]; then
-        if [ "${USE_DB_ROOT_USER}" == "true" ]; then
-            echo "* DB_SERVER_ROOT_USER: ${DB_SERVER_ROOT_USER}"
-            echo "* DB_SERVER_ROOT_PASS: ${DB_SERVER_ROOT_PASS}"
-        fi
-        echo "* DB_SERVER_ZBX_USER: ${DB_SERVER_ZBX_USER}"
-        echo "* DB_SERVER_ZBX_PASS: ${DB_SERVER_ZBX_PASS}"
-    fi
-    echo "********************"
-
-    if [ "${USE_DB_ROOT_USER}" != "true" ]; then
-        DB_SERVER_ROOT_USER=${DB_SERVER_ZBX_USER}
-        DB_SERVER_ROOT_PASS=${DB_SERVER_ZBX_PASS}
-    fi
-
-
-    if [ -n "${DB_SERVER_ZBX_PASS}" ]; then
-        export PGPASSWORD="${DB_SERVER_ZBX_PASS}"
-    fi
-
-    WAIT_TIMEOUT=5
-    
-    if [ -n "${DB_SERVER_SCHEMA}" ]; then
-        PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}"
-        export PGOPTIONS
-    fi
-
-    while [ ! "$(psql -h ${DB_SERVER_HOST} -p ${DB_SERVER_PORT} -U ${DB_SERVER_ROOT_USER} -d ${DB_SERVER_DBNAME} -l -q 2>/dev/null)" ]; do
-        echo "**** PostgreSQL server is not available. Waiting $WAIT_TIMEOUT seconds..."
-        sleep $WAIT_TIMEOUT
-    done
-
-    unset PGPASSWORD
-    unset PGOPTIONS
-}
-
-
-mysql_query() {
-    query=$1
-    local result=""
-
-    result=$(mysql --silent --skip-column-names -h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT} \
-             -u ${DB_SERVER_ROOT_USER} --password="${DB_SERVER_ROOT_PASS}" -e "$query")
-
-    echo $result
-}
-
-psql_query() {
-    query=$1
-    db=$2
-
-    local result=""
-
-    if [ -n "${DB_SERVER_ZBX_PASS}" ]; then
-        export PGPASSWORD="${DB_SERVER_ZBX_PASS}"
-    fi
-    
-    if [ -n "${DB_SERVER_SCHEMA}" ]; then
-        PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}"
-        export PGOPTIONS
-    fi
-
-    result=$(psql -A -q -t  -h ${DB_SERVER_HOST} -p ${DB_SERVER_PORT} \
-             -U ${DB_SERVER_ROOT_USER} -c "$query" $db 2>/dev/null);
-
-    unset PGPASSWORD
-    unset PGOPTIONS
-
-    echo $result
-}
-
-create_db_user_mysql() {
-    [ "${CREATE_ZBX_DB_USER}" == "true" ] || return
-
-    echo "** Creating '${DB_SERVER_ZBX_USER}' user in MySQL database"
-
-    USER_EXISTS=$(mysql_query "SELECT 1 FROM mysql.user WHERE user = '${DB_SERVER_ZBX_USER}' AND host = '%'")
-
-    if [ -z "$USER_EXISTS" ]; then
-        mysql_query "CREATE USER '${DB_SERVER_ZBX_USER}'@'%' IDENTIFIED BY '${DB_SERVER_ZBX_PASS}'" 1>/dev/null
-    else
-        mysql_query "ALTER USER ${DB_SERVER_ZBX_USER} IDENTIFIED BY '${DB_SERVER_ZBX_PASS}';" 1>/dev/null
-    fi
-
-    mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
-}
-
-create_db_user_postgresql() {
-    [ "${CREATE_ZBX_DB_USER}" == "true" ] || return
-
-    echo "** Creating '${DB_SERVER_ZBX_USER}' user in PostgreSQL database"
-
-    USER_EXISTS=$(psql_query "SELECT 1 FROM pg_roles WHERE rolname='${DB_SERVER_ZBX_USER}'")
-
-    if [ -z "$USER_EXISTS" ]; then
-        psql_query "CREATE USER ${DB_SERVER_ZBX_USER} WITH PASSWORD '${DB_SERVER_ZBX_PASS}'" 1>/dev/null
-    else
-        psql_query "ALTER USER ${DB_SERVER_ZBX_USER} WITH ENCRYPTED PASSWORD '${DB_SERVER_ZBX_PASS}'" 1>/dev/null
-    fi
-}
-
-create_db_database_mysql() {
-    DB_EXISTS=$(mysql_query "SELECT SCHEMA_NAME FROM information_schema.SCHEMATA WHERE SCHEMA_NAME='${DB_SERVER_DBNAME}'")
-
-    if [ -z ${DB_EXISTS} ]; then
-        echo "** Database '${DB_SERVER_DBNAME}' does not exist. Creating..."
-        mysql_query "CREATE DATABASE ${DB_SERVER_DBNAME} CHARACTER SET utf8 COLLATE utf8_bin" 1>/dev/null
-        # better solution?
-        mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
-    else
-        echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database COLLATE!"
-    fi
-}
-
-create_db_database_postgresql() {
-    DB_EXISTS=$(psql_query "SELECT 1 AS result FROM pg_database WHERE datname='${DB_SERVER_DBNAME}'")
-
-    if [ -z ${DB_EXISTS} ]; then
-        echo "** Database '${DB_SERVER_DBNAME}' does not exist. Creating..."
-        psql_query "CREATE DATABASE ${DB_SERVER_DBNAME} WITH OWNER ${DB_SERVER_ZBX_USER} ENCODING='UTF8' LC_CTYPE='en_US.utf8' LC_COLLATE='en_US.utf8'" 1>/dev/null
-    else
-        echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!"
-    fi
-
-    psql_query "CREATE SCHEMA IF NOT EXISTS ${DB_SERVER_SCHEMA}"
-}
-
-create_db_schema_mysql() {
-    local type=$1
-
-    DBVERSION_TABLE_EXISTS=$(mysql_query "SELECT 1 FROM information_schema.tables WHERE table_schema='${DB_SERVER_DBNAME}' and table_name = 'dbversion'")
-
-    if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
-        echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
-        ZBX_DB_VERSION=$(mysql_query "SELECT mandatory FROM ${DB_SERVER_DBNAME}.dbversion")
-    fi
-
-    if [ -z "${ZBX_DB_VERSION}" ]; then
-        echo "** Creating '${DB_SERVER_DBNAME}' schema in MySQL"
-
-        zcat /usr/share/doc/zabbix-$type-mysql/create.sql.gz | mysql --silent --skip-column-names \
-                    -h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT} \
-                    -u ${DB_SERVER_ROOT_USER} --password="${DB_SERVER_ROOT_PASS}"  \
-                    ${DB_SERVER_DBNAME} 1>/dev/null
-    fi
-}
-
-create_db_schema_postgresql() {
-    local type=$1
-
-    DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = 
-                                         c.relnamespace WHERE  n.nspname = '$DB_SERVER_SCHEMA' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
-
-    if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
-        echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
-        ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_SCHEMA}.dbversion" "${DB_SERVER_DBNAME}")
-    fi
-
-    if [ -z "${ZBX_DB_VERSION}" ]; then
-        echo "** Creating '${DB_SERVER_DBNAME}' schema in PostgreSQL"
-
-        if [ -n "${DB_SERVER_ZBX_PASS}" ]; then
-            export PGPASSWORD="${DB_SERVER_ZBX_PASS}"
-        fi
-
-        if [ -n "${DB_SERVER_SCHEMA}" ]; then
-            PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}"
-            export PGOPTIONS
-        fi
-
-        zcat /usr/share/doc/zabbix-$type-postgresql/create.sql.gz | psql -q \
-                -h ${DB_SERVER_HOST} -p ${DB_SERVER_PORT} \
-                -U ${DB_SERVER_ZBX_USER} ${DB_SERVER_DBNAME} 1>/dev/null
-
-        unset PGPASSWORD
-        unset PGOPTIONS
-    fi
-}
-
-prepare_web_server_apache() {
-    if [ -d "/etc/apache2/sites-available" ]; then
-        APACHE_SITES_DIR=/etc/apache2/sites-available
-    elif [ -d "/etc/apache2/conf.d" ]; then
-        APACHE_SITES_DIR=/etc/apache2/conf.d
-    elif [ -d "/etc/httpd/conf.d" ]; then
-        APACHE_SITES_DIR=/etc/httpd/conf.d
-    else
-        echo "**** Apache is not available"
-        exit 1
-    fi
-
-    if [ -f "/usr/sbin/a2dissite" ]; then
-        echo "** Disable default site"
-        /usr/sbin/a2dissite 000-default 1>/dev/null
-        rm -rf "$APACHE_SITES_DIR/*"
-    elif [ -f "/etc/apache2/conf.d/default.conf" ]; then
-        echo "** Disable default site"
-        rm -f "/etc/apache2/conf.d/default.conf"
-    elif [ -f "/etc/httpd/conf.d/welcome.conf" ]; then
-        echo "** Disable default site"
-        rm -f "/etc/httpd/conf.d/welcome.conf"
-        rm -f "/etc/httpd/conf.d/ssl.conf"
-    fi
-
-    echo "** Adding Zabbix virtual host (HTTP)"
-    if [ -f "$ZABBIX_ETC_DIR/apache.conf" ]; then
-        ln -s "$ZABBIX_ETC_DIR/apache.conf" "$APACHE_SITES_DIR/zabbix.conf"
-        if [ -f "/usr/sbin/a2dissite" ]; then
-            /usr/sbin/a2ensite zabbix.conf 1>/dev/null
-        fi
-    else
-        echo "**** Impossible to enable HTTP virtual host"
-    fi
-
-    if [ -f "/etc/apache2/conf.d/ssl.conf" ]; then
-        rm -f "/etc/apache2/conf.d/ssl.conf"
-    fi
-
-    if [ -f "/etc/ssl/apache2/ssl.crt" ] && [ -f "/etc/ssl/apache2/ssl.key" ]; then
-        echo "** Enable SSL support for Apache2"
-        if [ -f "/usr/sbin/a2enmod" ]; then
-            /usr/sbin/a2enmod ssl 1>/dev/null
-        fi
-
-        echo "** Adding Zabbix virtual host (HTTPS)"
-        if [ -f "$ZABBIX_ETC_DIR/apache_ssl.conf" ]; then
-            ln -s "$ZABBIX_ETC_DIR/apache_ssl.conf" "$APACHE_SITES_DIR/zabbix_ssl.conf"
-            if [ -f "/usr/sbin/a2dissite" ]; then
-                /usr/sbin/a2ensite zabbix_ssl.conf 1>/dev/null
-            fi
-        else
-            echo "**** Impossible to enable HTTPS virtual host"
-        fi
-    else
-        echo "**** Impossible to enable SSL support for Apache2. Certificates are missed."
-    fi
-
-    # Change Apache2 logging to stdout and stderr
-    if [ -f "/etc/apache2/apache2.conf" ]; then
-        sed -ri \
-            -e 's!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g' \
-            -e 's!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g' \
-            "/etc/apache2/apache2.conf"
-    fi
-
-    if [ -f "/etc/httpd/conf/httpd.conf" ]; then
-        sed -ri \
-            -e 's!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g' \
-            -e 's!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g' \
-            "/etc/httpd/conf/httpd.conf"
-    fi
-
-    if [ -f "/etc/apache2/httpd.conf" ]; then
-        sed -ri \
-            -e 's!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g' \
-            -e 's!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g' \
-            "/etc/apache2/httpd.conf"
-    fi
-
-    if [ -f "/etc/apache2/conf-available/other-vhosts-access-log.conf" ]; then
-        sed -ri \
-            -e 's!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g' \
-            -e 's!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g' \
-            "/etc/apache2/conf-available/other-vhosts-access-log.conf"
-    fi
-
-    if [ -f "/etc/apache2/conf.d/mpm.conf" ]; then
-        sed -ri \
-            -e 's!^(\s*PidFile)\s+\S+!\1 "/var/run/httpd.pid"!g' \
-            "/etc/apache2/conf.d/mpm.conf"
-    fi
-
-    if [ -f "/var/run/apache2/apache2.pid" ]; then
-        rm -f "/var/run/apache2/apache2.pid"
-    fi
-
-    if [ -f "/var/run/httpd/httpd.pid" ]; then
-        rm -f "/var/run/httpd/httpd.pid"
-    fi
-}
-
-prepare_web_server_nginx() {
+prepare_web_server() {
     NGINX_CONFD_DIR="/etc/nginx/conf.d"
     NGINX_SSL_CONFIG="/etc/ssl/nginx"
-    PHP_SESSIONS_DIR="/var/lib/php5"
 
     echo "** Adding Zabbix virtual host (HTTP)"
     if [ -f "$ZABBIX_ETC_DIR/nginx.conf" ]; then
@@ -643,269 +223,28 @@ prepare_web_server_nginx() {
         echo "**** Impossible to enable SSL support for Nginx. Certificates are missed."
     fi
 
-    if [ -d "/var/log/nginx/" ]; then
-        ln -sf /dev/fd/2 /var/log/nginx/error.log
-    fi
-
-    ln -sf /dev/fd/2 /var/log/php5-fpm.log
-    ln -sf /dev/fd/2 /var/log/php7.2-fpm.log
-}
-
-stop_databases() {
-    if ([ "${ZBX_MAIN_DB}" == "mysql" ] || [ "${ZBX_PROXY_DB}" == "mysql" ]) && [ "${DB_SERVER_HOST}" == "localhost" ]; then
-        mysql_query "DELETE FROM mysql.user WHERE host = 'localhost' AND user != 'root'" 1>/dev/null
-
-        if [ -f "/var/lib/mysql/mysqld.pid" ]; then
-            kill -TERM $(cat /var/lib/mysql/mysqld.pid)
-        elif [ -f "/var/run/mysqld/mysqld.pid" ]; then
-            kill -TERM $(cat /var/run/mysqld/mysqld.pid)
-        fi
-    fi
-
-    if [ "${ZBX_MAIN_DB}" == "postgresql" ] && [ "${DB_SERVER_HOST}" == "localhost" ]; then
-        if [ "${OS_CODENAME}" == "alpine" ]; then
-            PGDATA=/var/lib/postgresql
-            BINDIR=/usr/bin
-        else
-            PGDATA=/var/lib/postgresql/9.3/main
-            BINDIR=/usr/lib/postgresql/9.3/bin
-        fi
-        su -c "$BINDIR/pg_ctl -D \"$PGDATA\" -m fast -w stop --silent" postgres 1>/dev/null 2>/dev/null
-    fi
+    ln -sf /dev/fd/2 /var/log/nginx/error.log
 }
 
 clear_deploy() {
-    local type=$1
     echo "** Cleaning the system"
-
-    [ "$type" != "appliance" ] && return
-
-    stop_databases
 }
 
-update_zbx_config() {
-    local type=$1
-    local db_type=$2
-
-    echo "** Preparing Zabbix $type configuration file"
-
-    ZBX_CONFIG=$ZABBIX_ETC_DIR/zabbix_$type.conf
-
-    if [ "$type" == "proxy" ]; then
-        update_config_var $ZBX_CONFIG "ProxyMode" "${ZBX_PROXYMODE}"
-        update_config_var $ZBX_CONFIG "Server" "${ZBX_SERVER_HOST}"
-        update_config_var $ZBX_CONFIG "ServerPort" "${ZBX_SERVER_PORT}"
-        if [ -z "${ZBX_HOSTNAME}" ] && [ -n "${ZBX_HOSTNAMEITEM}" ]; then
-            update_config_var $ZBX_CONFIG "Hostname" ""
-            update_config_var $ZBX_CONFIG "HostnameItem" "${ZBX_HOSTNAMEITEM}"
-        else
-            update_config_var $ZBX_CONFIG "Hostname" "${ZBX_HOSTNAME:-"zabbix-proxy-"$db_type}"
-            update_config_var $ZBX_CONFIG "HostnameItem" "${ZBX_HOSTNAMEITEM}"
-        fi
-    fi
-
-    if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
-        update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
-    else
-        update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
-    fi
-
-    update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
-    update_config_var $ZBX_CONFIG "LogType" "console"
-    update_config_var $ZBX_CONFIG "LogFile"
-    update_config_var $ZBX_CONFIG "LogFileSize"
-    update_config_var $ZBX_CONFIG "PidFile"
-
-    update_config_var $ZBX_CONFIG "DebugLevel" "${ZBX_DEBUGLEVEL}"
-
-    if [ "$db_type" == "sqlite3" ]; then
-        update_config_var $ZBX_CONFIG "DBHost"
-        update_config_var $ZBX_CONFIG "DBName" "/var/lib/zabbix/zabbix_proxy_db"
-        update_config_var $ZBX_CONFIG "DBUser"
-        update_config_var $ZBX_CONFIG "DBPort"
-        update_config_var $ZBX_CONFIG "DBPassword"
-    else
-        update_config_var $ZBX_CONFIG "DBHost" "${DB_SERVER_HOST}"
-        update_config_var $ZBX_CONFIG "DBName" "${DB_SERVER_DBNAME}"
-        update_config_var $ZBX_CONFIG "DBSchema" "${DB_SERVER_SCHEMA}"
-        update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}"
-        update_config_var $ZBX_CONFIG "DBPort" "${DB_SERVER_PORT}"
-        update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
-    fi
-
-    update_config_var $ZBX_CONFIG "DBSocket" "${DB_SERVER_SOCKET}"
-
-    if [ "$type" == "proxy" ]; then
-        update_config_var $ZBX_CONFIG "ProxyLocalBuffer" "${ZBX_PROXYLOCALBUFFER}"
-        update_config_var $ZBX_CONFIG "ProxyOfflineBuffer" "${ZBX_PROXYOFFLINEBUFFER}"
-        update_config_var $ZBX_CONFIG "HeartbeatFrequency" "${ZBX_PROXYHEARTBEATFREQUENCY}"
-        update_config_var $ZBX_CONFIG "ConfigFrequency" "${ZBX_CONFIGFREQUENCY}"
-        update_config_var $ZBX_CONFIG "DataSenderFrequency" "${ZBX_DATASENDERFREQUENCY}"
-    fi
-
-    update_config_var $ZBX_CONFIG "StartPollers" "${ZBX_STARTPOLLERS}"
-    update_config_var $ZBX_CONFIG "StartIPMIPollers" "${ZBX_IPMIPOLLERS}"
-    update_config_var $ZBX_CONFIG "StartPollersUnreachable" "${ZBX_STARTPOLLERSUNREACHABLE}"
-    update_config_var $ZBX_CONFIG "StartTrappers" "${ZBX_STARTTRAPPERS}"
-    update_config_var $ZBX_CONFIG "StartPingers" "${ZBX_STARTPINGERS}"
-    update_config_var $ZBX_CONFIG "StartDiscoverers" "${ZBX_STARTDISCOVERERS}"
-    update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}"
-
-    if [ "$type" == "server" ]; then
-        update_config_var $ZBX_CONFIG "StartTimers" "${ZBX_STARTTIMERS}"
-        update_config_var $ZBX_CONFIG "StartEscalators" "${ZBX_STARTESCALATORS}"
-    fi
-
-    ZBX_JAVAGATEWAY_ENABLE=${ZBX_JAVAGATEWAY_ENABLE:-"false"}
-    if [ "${ZBX_JAVAGATEWAY_ENABLE}" == "true" ]; then
-        update_config_var $ZBX_CONFIG "JavaGateway" "${ZBX_JAVAGATEWAY:-"zabbix-java-gateway"}"
-        update_config_var $ZBX_CONFIG "JavaGatewayPort" "${ZBX_JAVAGATEWAYPORT}"
-        update_config_var $ZBX_CONFIG "StartJavaPollers" "${ZBX_STARTJAVAPOLLERS:-"5"}"
-    else
-        update_config_var $ZBX_CONFIG "JavaGateway"
-        update_config_var $ZBX_CONFIG "JavaGatewayPort"
-        update_config_var $ZBX_CONFIG "StartJavaPollers"
-    fi
-
-    update_config_var $ZBX_CONFIG "StartVMwareCollectors" "${ZBX_STARTVMWARECOLLECTORS}"
-    update_config_var $ZBX_CONFIG "VMwareFrequency" "${ZBX_VMWAREFREQUENCY}"
-    update_config_var $ZBX_CONFIG "VMwarePerfFrequency" "${ZBX_VMWAREPERFFREQUENCY}"
-    update_config_var $ZBX_CONFIG "VMwareCacheSize" "${ZBX_VMWARECACHESIZE}"
-    update_config_var $ZBX_CONFIG "VMwareTimeout" "${ZBX_VMWARETIMEOUT}"
-
-    ZBX_ENABLE_SNMP_TRAPS=${ZBX_ENABLE_SNMP_TRAPS:-"false"}
-    if [ "${ZBX_ENABLE_SNMP_TRAPS}" == "true" ]; then
-        update_config_var $ZBX_CONFIG "SNMPTrapperFile" "${ZABBIX_USER_HOME_DIR}/snmptraps/snmptraps.log"
-        update_config_var $ZBX_CONFIG "StartSNMPTrapper" "1"
-    else
-        update_config_var $ZBX_CONFIG "SNMPTrapperFile"
-        update_config_var $ZBX_CONFIG "StartSNMPTrapper"
-    fi
-
-    update_config_var $ZBX_CONFIG "HousekeepingFrequency" "${ZBX_HOUSEKEEPINGFREQUENCY}"
-    if [ "$type" == "server" ]; then
-        update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}"
-        update_config_var $ZBX_CONFIG "SenderFrequency" "${ZBX_SENDERFREQUENCY}"
-    fi
-
-    update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}"
-
-    if [ "$type" == "server" ]; then
-        update_config_var $ZBX_CONFIG "CacheUpdateFrequency" "${ZBX_CACHEUPDATEFREQUENCY}"
-    fi
-
-    update_config_var $ZBX_CONFIG "StartDBSyncers" "${ZBX_STARTDBSYNCERS}"
-    update_config_var $ZBX_CONFIG "HistoryCacheSize" "${ZBX_HISTORYCACHESIZE}"
-    update_config_var $ZBX_CONFIG "HistoryIndexCacheSize" "${ZBX_HISTORYINDEXCACHESIZE}"
-
-    if [ "$type" == "server" ]; then 
-        update_config_var $ZBX_CONFIG "TrendCacheSize" "${ZBX_TRENDCACHESIZE}"
-        update_config_var $ZBX_CONFIG "ValueCacheSize" "${ZBX_VALUECACHESIZE}"
-    fi
-
-    update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}"
-    update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}"
-    update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}"
-    update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}"
-    update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}"
-
-    update_config_var $ZBX_CONFIG "AlertScriptsPath" "/usr/lib/zabbix/alertscripts"
-    update_config_var $ZBX_CONFIG "ExternalScripts" "/usr/lib/zabbix/externalscripts"
-
-    # Possible few fping locations
-    if [ -f "/usr/bin/fping" ]; then
-        update_config_var $ZBX_CONFIG "FpingLocation" "/usr/bin/fping"
-    else
-        update_config_var $ZBX_CONFIG "FpingLocation" "/usr/sbin/fping"
-    fi
-    if [ -f "/usr/bin/fping6" ]; then
-        update_config_var $ZBX_CONFIG "Fping6Location" "/usr/bin/fping6"
-    else
-        update_config_var $ZBX_CONFIG "Fping6Location" "/usr/sbin/fping6"
-    fi
-
-    update_config_var $ZBX_CONFIG "SSHKeyLocation" "$ZABBIX_USER_HOME_DIR/ssh_keys"
-    update_config_var $ZBX_CONFIG "LogSlowQueries" "${ZBX_LOGSLOWQUERIES}"
-
-    if [ "$type" == "server" ]; then 
-        update_config_var $ZBX_CONFIG "StartProxyPollers" "${ZBX_STARTPROXYPOLLERS}"
-        update_config_var $ZBX_CONFIG "ProxyConfigFrequency" "${ZBX_PROXYCONFIGFREQUENCY}"
-        update_config_var $ZBX_CONFIG "ProxyDataFrequency" "${ZBX_PROXYDATAFREQUENCY}"
-    fi
-
-    update_config_var $ZBX_CONFIG "SSLCertLocation" "$ZABBIX_USER_HOME_DIR/ssl/certs/"
-    update_config_var $ZBX_CONFIG "SSLKeyLocation" "$ZABBIX_USER_HOME_DIR/ssl/keys/"
-    update_config_var $ZBX_CONFIG "SSLCALocation" "$ZABBIX_USER_HOME_DIR/ssl/ssl_ca/"
-    update_config_var $ZBX_CONFIG "LoadModulePath" "$ZABBIX_USER_HOME_DIR/modules/"
-    update_config_multiple_var $ZBX_CONFIG "LoadModule" "${ZBX_LOADMODULE}"
-
-    if [ "$type" == "proxy" ]; then
-        update_config_var $ZBX_CONFIG "TLSConnect" "${ZBX_TLSCONNECT}"
-        update_config_var $ZBX_CONFIG "TLSAccept" "${ZBX_TLSACCEPT}"
-    fi
-    update_config_var $ZBX_CONFIG "TLSCAFile" "${ZBX_TLSCAFILE}"
-    update_config_var $ZBX_CONFIG "TLSCRLFile" "${ZBX_TLSCRLFILE}"
-
-    if [ "$type" == "proxy" ]; then
-        update_config_var $ZBX_CONFIG "TLSServerCertIssuer" "${ZBX_TLSSERVERCERTISSUER}"
-        update_config_var $ZBX_CONFIG "TLSServerCertSubject" "${ZBX_TLSSERVERCERTSUBJECT}"
-    fi
-
-    update_config_var $ZBX_CONFIG "TLSCertFile" "${ZBX_TLSCERTFILE}"
-    update_config_var $ZBX_CONFIG "TLSKeyFile" "${ZBX_TLSKEYFILE}"
-
-    if [ "$type" == "proxy" ]; then
-        update_config_var $ZBX_CONFIG "TLSPSKIdentity" "${ZBX_TLSPSKIDENTITY}"
-        update_config_var $ZBX_CONFIG "TLSPSKFile" "${ZBX_TLSPSKFILE}"
-    fi
-}
-
-
 prepare_zbx_web_config() {
-    local db_type=$1
     local server_name=""
 
     echo "** Preparing Zabbix frontend configuration file"
 
     ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php"
 
-    if [ -f "/usr/share/zabbix/conf/zabbix.conf.php" ]; then
-        rm -f "/usr/share/zabbix/conf/zabbix.conf.php"
-    fi
+    PHP_CONFIG_FILE="/etc/php/7.2/apache2/conf.d/99-zabbix.ini"
 
-    ln -s "$ZBX_WEB_CONFIG" "/usr/share/zabbix/conf/zabbix.conf.php"
-
-    # Different places of PHP configuration file
-    if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then
-        PHP_CONFIG_FILE="/etc/php5/conf.d/99-zabbix.ini"
-    elif [ -f "/etc/php5/fpm/conf.d/99-zabbix.ini" ]; then
-        PHP_CONFIG_FILE="/etc/php5/fpm/conf.d/99-zabbix.ini"
-    elif [ -f "/etc/php5/apache2/conf.d/99-zabbix.ini" ]; then
-        PHP_CONFIG_FILE="/etc/php5/apache2/conf.d/99-zabbix.ini"
-    elif [ -f "/etc/php/7.0/apache2/conf.d/99-zabbix.ini" ]; then
-        PHP_CONFIG_FILE="/etc/php/7.0/apache2/conf.d/99-zabbix.ini"
-    elif [ -f "/etc/php/7.0/fpm/conf.d/99-zabbix.ini" ]; then
-        PHP_CONFIG_FILE="/etc/php/7.0/fpm/conf.d/99-zabbix.ini"
-    elif [ -f "/etc/php.d/99-zabbix.ini" ]; then
-        PHP_CONFIG_FILE="/etc/php.d/99-zabbix.ini"
-    elif [ -f "/etc/php7/conf.d/99-zabbix.ini" ]; then
-        PHP_CONFIG_FILE="/etc/php7/conf.d/99-zabbix.ini"
-    elif [ -f "/etc/php/7.2/fpm/conf.d/99-zabbix.ini" ]; then
-        PHP_CONFIG_FILE="/etc/php/7.2/fpm/conf.d/99-zabbix.ini"
-    elif [ -f "/etc/php/7.2/apache2/conf.d/99-zabbix.ini" ]; then
-        PHP_CONFIG_FILE="/etc/php/7.2/apache2/conf.d/99-zabbix.ini"
-    fi
-
-    if [ -n "$PHP_CONFIG_FILE" ]; then
-        update_config_var "$PHP_CONFIG_FILE" "max_execution_time" "${ZBX_MAXEXECUTIONTIME:-"600"}"
-        update_config_var "$PHP_CONFIG_FILE" "memory_limit" "${ZBX_MEMORYLIMIT:-"128M"}" 
-        update_config_var "$PHP_CONFIG_FILE" "post_max_size" "${ZBX_POSTMAXSIZE:-"16M"}"
-        update_config_var "$PHP_CONFIG_FILE" "upload_max_filesize" "${ZBX_UPLOADMAXFILESIZE:-"2M"}"
-        update_config_var "$PHP_CONFIG_FILE" "max_input_time" "${ZBX_MAXINPUTTIME:-"300"}"
-        update_config_var "$PHP_CONFIG_FILE" "date.timezone" "${PHP_TZ}"
-    else
-        echo "**** Zabbix related PHP configuration file not found"
-    fi
+    update_config_var "$PHP_CONFIG_FILE" "php_value[max_execution_time]" "${ZBX_MAXEXECUTIONTIME:-"600"}"
+    update_config_var "$PHP_CONFIG_FILE" "php_value[memory_limit]" "${ZBX_MEMORYLIMIT:-"128M"}"
+    update_config_var "$PHP_CONFIG_FILE" "php_value[post_max_size]" "${ZBX_POSTMAXSIZE:-"16M"}"
+    update_config_var "$PHP_CONFIG_FILE" "php_value[upload_max_filesize]" "${ZBX_UPLOADMAXFILESIZE:-"2M"}"
+    update_config_var "$PHP_CONFIG_FILE" "php_value[max_input_time]" "${ZBX_MAXINPUTTIME:-"300"}"
+    update_config_var "$PHP_CONFIG_FILE" "php_value[date.timezone]" "${PHP_TZ}"
 
     # Escaping characters in parameter value
     server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
@@ -923,220 +262,33 @@ prepare_zbx_web_config() {
         -e "s/{ZBX_SERVER_PORT}/${ZBX_SERVER_PORT}/g" \
         -e "s/{ZBX_SERVER_NAME}/$server_name/g" \
     "$ZBX_WEB_CONFIG"
-
-    [ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG"
-}
-
-prepare_zbx_agent_config() {
-    echo "** Preparing Zabbix agent configuration file"
-
-    ZBX_AGENT_CONFIG=$ZABBIX_ETC_DIR/zabbix_agentd.conf
-
-    ZBX_PASSIVESERVERS=${ZBX_PASSIVESERVERS:-""}
-    ZBX_ACTIVESERVERS=${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=${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=${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}"
-}
-
-prepare_java_gateway_config() {
-    echo "** Preparing Zabbix Java Gateway log configuration file"
-
-    ZBX_GATEWAY_CONFIG=$ZABBIX_ETC_DIR/zabbix_java_gateway_logback.xml
-
-    if [ -n "${ZBX_DEBUGLEVEL}" ]; then
-        echo "Updating $ZBX_GATEWAY_CONFIG 'DebugLevel' parameter: '${ZBX_DEBUGLEVEL}'... updated"
-        if [ -f "$ZBX_GATEWAY_CONFIG" ]; then
-            sed -i -e "/^.*<root level=/s/=.*/=\"${ZBX_DEBUGLEVEL}\">/" "$ZBX_GATEWAY_CONFIG"
-        else
-            echo "**** Zabbix Java Gateway log configuration file '$ZBX_GATEWAY_CONFIG' not found"
-        fi
-    fi
-}
-
-prepare_agent() {
-    echo "** Preparing Zabbix agent"
-    prepare_zbx_agent_config
-}
-
-prepare_server() {
-    local db_type=$1
-
-    echo "** Preparing Zabbix server"
-
-    check_variables_$db_type "server"
-    check_db_connect_$db_type
-    create_db_user_$db_type
-    create_db_database_$db_type
-    create_db_schema_$db_type "server"
-
-    update_zbx_config "server" "$db_type"
-}
-
-prepare_proxy() {
-    local db_type=$1
-
-    echo "Preparing Zabbix proxy"
-
-    if [ "$db_type" != "sqlite3" ]; then
-        check_variables_$db_type "proxy"
-        check_db_connect_$db_type
-        create_db_user_$db_type
-        create_db_database_$db_type
-        create_db_schema_$db_type "proxy"
-    fi
-
-    update_zbx_config "proxy" $db_type
 }
 
 prepare_web() {
-    local web_server=$1
-    local db_type=$2
-
     echo "** Preparing Zabbix web-interface"
 
-    check_variables_$db_type
-    check_db_connect_$db_type
-    prepare_web_server_$web_server
-    prepare_zbx_web_config $db_type
+    check_variables
+    check_db_connect
+    prepare_web_server
+    prepare_zbx_web_config
 }
 
-prepare_java_gateway() {
-    echo "** Preparing Zabbix Java Gateway"
-
-    prepare_java_gateway_config
-}
 
 #################################################
 
-if [ ! -n "$zbx_type" ]; then
-    echo "**** Type of Zabbix component is not specified"
-    exit 1
-elif [ "$zbx_type" == "dev" ]; then
-    echo "** Deploying Zabbix installation from SVN"
-else
-    if [ ! -n "$zbx_db_type" ]; then
-        echo "**** Database type of Zabbix $zbx_type is not specified"
-        exit 1
-    fi
+echo "** Deploying Zabbix web-interface (Nginx) with MySQL database"
 
-    if [ "$zbx_db_type" != "none" ]; then
-        if [ "$zbx_opt_type" != "none" ]; then
-            echo "** Deploying Zabbix $zbx_type ($zbx_opt_type) with $zbx_db_type database"
-        else
-            echo "** Deploying Zabbix $zbx_type with $zbx_db_type database"
-        fi
-    else
-        echo "** Deploying Zabbix $zbx_type"
-    fi
-fi
+prepare_system
 
-prepare_system "$zbx_type" "$zbx_opt_type"
+prepare_web
 
-[ "$zbx_type" == "server" ] && prepare_server $zbx_db_type
-[ "${ZBX_ADD_SERVER}" == "true" ] && prepare_server ${ZBX_MAIN_DB}
-
-[ "$zbx_type" == "proxy" ] && prepare_proxy $zbx_db_type
-[ "${ZBX_ADD_PROXY}" == "true" ] && prepare_proxy ${ZBX_PROXY_DB}
-
-[ "$zbx_type" == "frontend" ] && prepare_web $zbx_opt_type $zbx_db_type
-[ "${ZBX_ADD_WEB}" == "true" ] && prepare_web ${ZBX_WEB_SERVER} ${ZBX_MAIN_DB}
-
-[ "$zbx_type" == "agent" ] && prepare_agent
-[ "${ZBX_ADD_AGENT}" == "true" ] && prepare_agent
-
-[ "$zbx_type" == "java-gateway" ] && prepare_java_gateway
-[ "${ZBX_ADD_JAVA_GATEWAY}" == "true" ] && prepare_java_gateway
-
-clear_deploy "$zbx_type"
+clear_deploy
 
 echo "########################################################"
 
 if [ "$1" != "" ]; then
     echo "** Executing '$@'"
     exec "$@"
-elif [ "$zbx_type" == "agent" ]; then
-    echo "** Starting Zabbix agent"
-    exec su zabbix -s "/bin/bash" -c "/usr/sbin/zabbix_agentd --foreground -c /etc/zabbix/zabbix_agentd.conf"
-elif [ "$zbx_type" == "proxy" ]; then
-    echo "** Starting Zabbix proxy"
-    exec su zabbix -s "/bin/bash" -c "/usr/sbin/zabbix_proxy --foreground -c /etc/zabbix/zabbix_proxy.conf"
-elif [ "$zbx_type" == "server" ]; then
-    echo "** Starting Zabbix server"
-    exec su zabbix -s "/bin/bash" -c "/usr/sbin/zabbix_server --foreground -c /etc/zabbix/zabbix_server.conf"
-elif [ "$zbx_type" == "java-gateway" ]; then
-    echo "** Starting Zabbix Java Gateway"
-    exec su zabbix -s "/bin/bash" -c "/usr/sbin/zabbix_java_gateway"
-elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
-    echo "** Starting Zabbix frontend"
-    if [ -f "/usr/sbin/httpd" ]; then
-        exec /usr/sbin/httpd -D FOREGROUND
-    elif [ -f "/usr/sbin/apache2ctl" ]; then
-        exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
-    else
-        echo "Unknown Web-server. Exiting..."
-        exit 1
-    fi
 elif [ -f "/usr/bin/supervisord" ]; then
     echo "** Executing supervisord"
     exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf
diff --git a/web-nginx-pgsql/centos/docker-entrypoint.sh b/web-nginx-pgsql/centos/docker-entrypoint.sh
index 2ad94768e..34c2a877e 100755
--- a/web-nginx-pgsql/centos/docker-entrypoint.sh
+++ b/web-nginx-pgsql/centos/docker-entrypoint.sh
@@ -237,12 +237,6 @@ prepare_zbx_web_config() {
 
     ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php"
 
-    if [ -f "/usr/share/zabbix/conf/zabbix.conf.php" ]; then
-        rm -f "/usr/share/zabbix/conf/zabbix.conf.php"
-    fi
-
-    ln -s "$ZBX_WEB_CONFIG" "/usr/share/zabbix/conf/zabbix.conf.php"
-
     PHP_CONFIG_FILE="/etc/php-fpm.d/zabbix.conf"
 
     update_config_var "$PHP_CONFIG_FILE" "php_value[max_execution_time]" "${ZBX_MAXEXECUTIONTIME:-"600"}"
diff --git a/web-nginx-pgsql/ubuntu/conf/etc/nginx/nginx.conf b/web-nginx-pgsql/ubuntu/conf/etc/nginx/nginx.conf
index fe6ad67e0..3bed3cf89 100644
--- a/web-nginx-pgsql/ubuntu/conf/etc/nginx/nginx.conf
+++ b/web-nginx-pgsql/ubuntu/conf/etc/nginx/nginx.conf
@@ -1,10 +1,10 @@
-user www-data;
+#user nginx;
 worker_processes 5;
-#worker_rlimit_nofile 256000;
+worker_rlimit_nofile 256000;
 
-error_log /dev/fd/2 warn;
+error_log /dev/fd/2 error;
 
-pid        /var/run/nginx.pid;
+pid        /tmp/nginx.pid;
 
 events {
     worker_connections 5120;
@@ -21,6 +21,13 @@ http {
                     '"$http_user_agent" "$http_x_forwarded_for"';
 
     access_log /dev/fd/1 main;
+    error_log /dev/fd/2 error;
+
+    client_body_temp_path /tmp/client_body 1 2;
+    proxy_temp_path /tmp/proxy 1 2;
+    fastcgi_temp_path /tmp/fastcgi 1 2;
+    uwsgi_temp_path /tmp/uwsgi 1 2;
+    scgi_temp_path /tmp/scgi 1 2;
 
     client_body_timeout             5m;
     send_timeout                    5m;
diff --git a/web-nginx-pgsql/ubuntu/conf/etc/supervisor/supervisord.conf b/web-nginx-pgsql/ubuntu/conf/etc/supervisor/supervisord.conf
index 925bb1838..f8d80e461 100644
--- a/web-nginx-pgsql/ubuntu/conf/etc/supervisor/supervisord.conf
+++ b/web-nginx-pgsql/ubuntu/conf/etc/supervisor/supervisord.conf
@@ -1,17 +1,17 @@
 ; supervisor config file
 
 [unix_http_server]
-file = /var/run/supervisor.sock   ; (the path to the socket file)
+file = /tmp/supervisor.sock        ; (the path to the socket file)
 chmod = 0700                       ; sockef file mode (default 0700)
 username = zbx
 password = password
 
 [supervisord]
 logfile = /dev/stdout                        ; (main log file;default $CWD/supervisord.log)
-pidfile = /var/run/supervisord.pid           ; (supervisord pidfile;default supervisord.pid)
+pidfile = /tmp/supervisord.pid               ; (supervisord pidfile;default supervisord.pid)
 childlogdir = /tmp                           ; ('AUTO' child log dir, default $TEMP)
 critical = critical
-user = root
+;user = zabbix
 logfile_maxbytes = 0
 logfile_backupcount = 0
 loglevel = info
@@ -23,7 +23,7 @@ loglevel = info
 supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
 
 [supervisorctl]
-serverurl = unix:///var/run/supervisor.sock ; use a unix:// URL  for a unix socket
+serverurl = unix:///tmp/supervisor.sock ; use a unix:// URL  for a unix socket
 
 ; The [include] section can just contain the "files" setting.  This
 ; setting can list multiple files (separated by whitespace or
diff --git a/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx.conf b/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx.conf
index e1331f0bf..0d5decc6f 100644
--- a/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx.conf
+++ b/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx.conf
@@ -1,5 +1,5 @@
 server {
-    listen          80;
+    listen          8080;
     server_name     zabbix;
     index           index.php;
 
diff --git a/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx_ssl.conf b/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx_ssl.conf
index 2d68009ab..c8b5423aa 100644
--- a/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx_ssl.conf
+++ b/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx_ssl.conf
@@ -1,5 +1,5 @@
 server {
-    listen          443 ssl http2;
+    listen          8443 ssl http2;
     server_name     zabbix;
     server_name_in_redirect off;
 
diff --git a/web-nginx-pgsql/ubuntu/docker-entrypoint.sh b/web-nginx-pgsql/ubuntu/docker-entrypoint.sh
index d53256feb..a55aae6d9 100755
--- a/web-nginx-pgsql/ubuntu/docker-entrypoint.sh
+++ b/web-nginx-pgsql/ubuntu/docker-entrypoint.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -eo pipefail
+set -o pipefail
 
 set +e
 
@@ -9,16 +9,6 @@ if [ "${DEBUG_MODE}" == "true" ]; then
     set -o xtrace
 fi
 
-# Type of Zabbix component
-# Possible values: [server, proxy, agent, frontend, java-gateway, appliance]
-zbx_type=${ZBX_TYPE}
-# Type of Zabbix database
-# Possible values: [mysql, postgresql]
-zbx_db_type=${ZBX_DB_TYPE}
-# Type of web-server. Valid only with zbx_type = frontend
-# Possible values: [apache, nginx]
-zbx_opt_type=${ZBX_OPT_TYPE}
-
 # Default Zabbix installation name
 # Used only by Zabbix web-interface
 ZBX_SERVER_NAME=${ZBX_SERVER_NAME:-"Zabbix docker"}
@@ -69,90 +59,8 @@ file_env() {
     unset "$fileVar"
 }
 
-configure_db_mysql() {
-    [ "${DB_SERVER_HOST}" != "localhost" ] && return
-
-    echo "** Configuring local MySQL server"
-
-    MYSQL_ALLOW_EMPTY_PASSWORD=true
-    MYSQL_DATA_DIR="/var/lib/mysql"
-
-    if [ -f "/etc/mysql/my.cnf" ]; then
-        MYSQL_CONF_FILE="/etc/mysql/my.cnf"
-    elif [ -f "/etc/my.cnf.d/server.cnf" ]; then
-        MYSQL_CONF_FILE="/etc/my.cnf.d/server.cnf"
-        DB_SERVER_SOCKET="/var/lib/mysql/mysql.sock"
-    elif [ -f "/etc/my.cnf.d/mariadb-server.cnf" ]; then
-        MYSQL_CONF_FILE="/etc/my.cnf.d/mariadb-server.cnf"
-        DB_SERVER_SOCKET="/var/run/mysqld/mysqld.sock"
-    else
-        echo "**** Could not found MySQL configuration file"
-        exit 1
-    fi
-
-    if [ -f "/usr/bin/mysqld" ]; then
-        MYSQLD=/usr/bin/mysqld
-    elif [ -f "/usr/sbin/mysqld" ]; then
-        MYSQLD=/usr/sbin/mysqld
-    elif [ -f "/usr/libexec/mysqld" ]; then
-        MYSQLD=/usr/libexec/mysqld
-    else
-        echo "**** Could not found mysqld binary file"
-        exit 1
-    fi
-
-    sed -Ei 's/^(bind-address|log)/#&/' "$MYSQL_CONF_FILE"
-
-    if [ ! -d "$MYSQL_DATA_DIR/mysql" ]; then
-        [ -d "$MYSQL_DATA_DIR" ] || mkdir -p "$MYSQL_DATA_DIR"
-
-        chown -R mysql:mysql "$MYSQL_DATA_DIR"
-
-        echo "** Installing initial MySQL database schemas"
-        mysql_install_db --user=mysql --datadir="$MYSQL_DATA_DIR" 2>&1
-    else
-        echo "**** MySQL data directory is not empty. Using already existing installation."
-        chown -R mysql:mysql "$MYSQL_DATA_DIR"
-    fi
-
-    mkdir -p /var/run/mysqld
-    ln -s /var/run/mysqld /run/mysqld
-    chown -R mysql:mysql /var/run/mysqld
-    chown -R mysql:mysql /run/mysqld
-
-    echo "** Starting MySQL server in background mode"
-
-    nohup $MYSQLD --basedir=/usr --datadir=/var/lib/mysql --plugin-dir=/usr/lib/mysql/plugin \
-            --user=mysql --log-output=none --pid-file=/var/lib/mysql/mysqld.pid \
-            --port=3306 --character-set-server=utf8 --collation-server=utf8_bin &
-}
-
 prepare_system() {
-    local type=$1
-    local web_server=$2
-
     echo "** Preparing the system"
-
-    if [ "$type" != "appliance" ]; then
-        return
-    fi
-
-    ZBX_ADD_AGENT=${ZBX_ADD_AGENT:-"false"}
-    ZBX_ADD_JAVA_GATEWAY=${ZBX_ADD_JAVA_GATEWAY:-"false"}
-    ZBX_ADD_SERVER=${ZBX_ADD_SERVER:-"true"}
-    [ "${ZBX_ADD_SERVER}" == "true" ] && ZBX_SERVER_HOST="localhost"
-    [ "${ZBX_ADD_SERVER}" == "true" ] && ZBX_SERVER_PORT="10051"
-    ZBX_MAIN_DB=${ZBX_MAIN_DB:-"mysql"}
-    ZBX_ADD_PROXY=${ZBX_ADD_PROXY:-"false"}
-    ZBX_PROXY_DB=${ZBX_PROXY_DB:-"sqlite3"}
-    ZBX_ADD_WEB=${ZBX_ADD_WEB:-"true"}
-    ZBX_WEB_SERVER=${ZBX_WEB_SERVER:-"nginx"}
-    DB_SERVER_HOST=${DB_SERVER_HOST:-"localhost"}
-    [ "${ZBX_ADD_JAVA_GATEWAY}" == "true" ] && ZBX_JAVAGATEWAY_ENABLE="true"
-    [ "${ZBX_ADD_JAVA_GATEWAY}" == "true" ] && ZBX_JAVAGATEWAY="localhost"
-    [ "${ZBX_ADD_JAVA_GATEWAY}" == "true" ] && ZBX_JAVAGATEWAYPORT="10052"
-
-    [ "${ZBX_ADD_SERVER}" == "true" ] && configure_db_${ZBX_MAIN_DB}
 }
 
 escape_spec_char() {
@@ -199,13 +107,9 @@ update_config_var() {
         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
+    # Escaping characters in parameter value and name
     var_value=$(escape_spec_char "$var_value")
+    var_name=$(escape_spec_char "$var_name")
 
     if [ "$(grep -E "^$var_name=" $config_path)" ] && [ "$is_multiple" != "true" ]; then
         sed -i -e "/^$var_name=/s/=.*/=$var_value/" "$config_path"
@@ -236,62 +140,14 @@ update_config_multiple_var() {
     done
 }
 
-# Check prerequisites for MySQL database
-check_variables_mysql() {
-    local type=$1
-
-    DB_SERVER_HOST=${DB_SERVER_HOST:-"mysql-server"}
-    DB_SERVER_PORT=${DB_SERVER_PORT:-"3306"}
-    USE_DB_ROOT_USER=false
-    CREATE_ZBX_DB_USER=false
-    file_env MYSQL_USER
-    file_env MYSQL_PASSWORD
-
-    if [ "$type" != "" ]; then
-        file_env MYSQL_ROOT_PASSWORD
-    fi
-
-    if [ ! -n "${MYSQL_USER}" ] && [ "${MYSQL_RANDOM_ROOT_PASSWORD}" == "true" ]; then
-        echo "**** Impossible to use MySQL server because of unknown Zabbix user and random 'root' password"
-        exit 1
-    fi
-
-    if [ ! -n "${MYSQL_USER}" ] && [ ! -n "${MYSQL_ROOT_PASSWORD}" ] && [ "${MYSQL_ALLOW_EMPTY_PASSWORD}" != "true" ]; then
-        echo "*** Impossible to use MySQL server because 'root' password is not defined and it is not empty"
-        exit 1
-    fi
-
-    if [ "${MYSQL_ALLOW_EMPTY_PASSWORD}" == "true" ] || [ -n "${MYSQL_ROOT_PASSWORD}" ]; then
-        USE_DB_ROOT_USER=true
-        DB_SERVER_ROOT_USER="root"
-        DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""}
-    fi
-
-    [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true
-
-    # If root password is not specified use provided credentials
-    DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}}
-    [ "${MYSQL_ALLOW_EMPTY_PASSWORD}" == "true" ] || DB_SERVER_ROOT_PASS=${DB_SERVER_ROOT_PASS:-${MYSQL_PASSWORD}}
-    DB_SERVER_ZBX_USER=${MYSQL_USER:-"zabbix"}
-    DB_SERVER_ZBX_PASS=${MYSQL_PASSWORD:-"zabbix"}
-
-    if [ "$type" == "proxy" ]; then
-        DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix_proxy"}
-    else
-        DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix"}
-    fi
-}
-
 # Check prerequisites for PostgreSQL database
-check_variables_postgresql() {
-    local type=$1
-
+check_variables() {
     file_env POSTGRES_USER
     file_env POSTGRES_PASSWORD
 
-    DB_SERVER_HOST=${DB_SERVER_HOST:-"postgres-server"}
-    DB_SERVER_PORT=${DB_SERVER_PORT:-"5432"}
-    CREATE_ZBX_DB_USER=${CREATE_ZBX_DB_USER:-"false"}
+    : ${DB_SERVER_HOST:="postgres-server"}
+    : ${DB_SERVER_PORT:="5432"}
+    : ${CREATE_ZBX_DB_USER:="false"}
 
     DB_SERVER_ROOT_USER=${POSTGRES_USER:-"postgres"}
     DB_SERVER_ROOT_PASS=${POSTGRES_PASSWORD:-""}
@@ -299,53 +155,31 @@ check_variables_postgresql() {
     DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"}
     DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"}
 
-    DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA:-"public"}
+    : ${DB_SERVER_SCHEMA:="public"}
 
-    if [ "$type" == "proxy" ]; then
-        DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"}
-    else
-        DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix"}
-    fi
+    DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix"}
 }
 
-check_db_connect_mysql() {
-    echo "********************"
-    echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}"
-    echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}"
-    echo "* DB_SERVER_DBNAME: ${DB_SERVER_DBNAME}"
-    if [ "${USE_DB_ROOT_USER}" == "true" ]; then
-        echo "* DB_SERVER_ROOT_USER: ${DB_SERVER_ROOT_USER}"
-        echo "* DB_SERVER_ROOT_PASS: ${DB_SERVER_ROOT_PASS}"
-    fi
-    echo "* DB_SERVER_ZBX_USER: ${DB_SERVER_ZBX_USER}"
-    echo "* DB_SERVER_ZBX_PASS: ${DB_SERVER_ZBX_PASS}"
-    echo "********************"
-
-    WAIT_TIMEOUT=5
-
-    while [ ! "$(mysqladmin ping -h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT} -u ${DB_SERVER_ROOT_USER} \
-                --password="${DB_SERVER_ROOT_PASS}" --silent --connect_timeout=10)" ]; do
-        echo "**** MySQL server is not available. Waiting $WAIT_TIMEOUT seconds..."
-        sleep $WAIT_TIMEOUT
-    done
-}
-
-check_db_connect_postgresql() {
+check_db_connect() {
     echo "********************"
     echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}"
     echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}"
     echo "* DB_SERVER_DBNAME: ${DB_SERVER_DBNAME}"
     echo "* DB_SERVER_SCHEMA: ${DB_SERVER_SCHEMA}"
-    if [ "${USE_DB_ROOT_USER}" == "true" ]; then
-        echo "* DB_SERVER_ROOT_USER: ${DB_SERVER_ROOT_USER}"
-        echo "* DB_SERVER_ROOT_PASS: ${DB_SERVER_ROOT_PASS}"
-    else
+    if [ "${DEBUG_MODE}" == "true" ]; then
+        if [ "${USE_DB_ROOT_USER}" == "true" ]; then
+            echo "* DB_SERVER_ROOT_USER: ${DB_SERVER_ROOT_USER}"
+            echo "* DB_SERVER_ROOT_PASS: ${DB_SERVER_ROOT_PASS}"
+        fi
+        echo "* DB_SERVER_ZBX_USER: ${DB_SERVER_ZBX_USER}"
+        echo "* DB_SERVER_ZBX_PASS: ${DB_SERVER_ZBX_PASS}"
+    fi
+    echo "********************"
+
+    if [ "${USE_DB_ROOT_USER}" != "true" ]; then
         DB_SERVER_ROOT_USER=${DB_SERVER_ZBX_USER}
         DB_SERVER_ROOT_PASS=${DB_SERVER_ZBX_PASS}
     fi
-    echo "* DB_SERVER_ZBX_USER: ${DB_SERVER_ZBX_USER}"
-    echo "* DB_SERVER_ZBX_PASS: ${DB_SERVER_ZBX_PASS}"
-    echo "********************"
 
     if [ -n "${DB_SERVER_ZBX_PASS}" ]; then
         export PGPASSWORD="${DB_SERVER_ZBX_PASS}"
@@ -367,255 +201,9 @@ check_db_connect_postgresql() {
     unset PGOPTIONS
 }
 
-
-mysql_query() {
-    query=$1
-    local result=""
-
-    result=$(mysql --silent --skip-column-names -h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT} \
-             -u ${DB_SERVER_ROOT_USER} --password="${DB_SERVER_ROOT_PASS}" -e "$query")
-
-    echo $result
-}
-
-psql_query() {
-    query=$1
-    db=$2
-
-    local result=""
-
-    if [ -n "${DB_SERVER_ZBX_PASS}" ]; then
-        export PGPASSWORD="${DB_SERVER_ZBX_PASS}"
-    fi
-    
-    if [ -n "${DB_SERVER_SCHEMA}" ]; then
-        PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}"
-        export PGOPTIONS
-    fi
-
-    result=$(psql -A -q -t  -h ${DB_SERVER_HOST} -p ${DB_SERVER_PORT} \
-             -U ${DB_SERVER_ROOT_USER} -c "$query" $db 2>/dev/null);
-
-    unset PGPASSWORD
-    unset PGOPTIONS
-
-    echo $result
-}
-
-create_db_user_mysql() {
-    [ "${CREATE_ZBX_DB_USER}" == "true" ] || return
-
-    echo "** Creating '${DB_SERVER_ZBX_USER}' user in MySQL database"
-
-    USER_EXISTS=$(mysql_query "SELECT 1 FROM mysql.user WHERE user = '${DB_SERVER_ZBX_USER}' AND host = '%'")
-
-    if [ -z "$USER_EXISTS" ]; then
-        mysql_query "CREATE USER '${DB_SERVER_ZBX_USER}'@'%' IDENTIFIED BY '${DB_SERVER_ZBX_PASS}'" 1>/dev/null
-    else
-        mysql_query "ALTER USER ${DB_SERVER_ZBX_USER} IDENTIFIED BY '${DB_SERVER_ZBX_PASS}';" 1>/dev/null
-    fi
-
-    mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
-}
-
-create_db_user_postgresql() {
-    [ "${CREATE_ZBX_DB_USER}" == "true" ] || return
-
-    echo "** Creating '${DB_SERVER_ZBX_USER}' user in PostgreSQL database"
-
-    USER_EXISTS=$(psql_query "SELECT 1 FROM pg_roles WHERE rolname='${DB_SERVER_ZBX_USER}'")
-
-    if [ -z "$USER_EXISTS" ]; then
-        psql_query "CREATE USER ${DB_SERVER_ZBX_USER} WITH PASSWORD '${DB_SERVER_ZBX_PASS}'" 1>/dev/null
-    else
-        psql_query "ALTER USER ${DB_SERVER_ZBX_USER} WITH ENCRYPTED PASSWORD '${DB_SERVER_ZBX_PASS}'" 1>/dev/null
-    fi
-}
-
-create_db_database_mysql() {
-    DB_EXISTS=$(mysql_query "SELECT SCHEMA_NAME FROM information_schema.SCHEMATA WHERE SCHEMA_NAME='${DB_SERVER_DBNAME}'")
-
-    if [ -z ${DB_EXISTS} ]; then
-        echo "** Database '${DB_SERVER_DBNAME}' does not exist. Creating..."
-        mysql_query "CREATE DATABASE ${DB_SERVER_DBNAME} CHARACTER SET utf8 COLLATE utf8_bin" 1>/dev/null
-        # better solution?
-        mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
-    else
-        echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database COLLATE!"
-    fi
-}
-
-create_db_database_postgresql() {
-    DB_EXISTS=$(psql_query "SELECT 1 AS result FROM pg_database WHERE datname='${DB_SERVER_DBNAME}'")
-
-    if [ -z ${DB_EXISTS} ]; then
-        echo "** Database '${DB_SERVER_DBNAME}' does not exist. Creating..."
-        psql_query "CREATE DATABASE ${DB_SERVER_DBNAME} WITH OWNER ${DB_SERVER_ZBX_USER} ENCODING='UTF8' LC_CTYPE='en_US.utf8' LC_COLLATE='en_US.utf8'" 1>/dev/null
-    else
-        echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!"
-    fi
-
-    psql_query "CREATE SCHEMA IF NOT EXISTS ${DB_SERVER_SCHEMA}"
-}
-
-create_db_schema_mysql() {
-    local type=$1
-
-    DBVERSION_TABLE_EXISTS=$(mysql_query "SELECT 1 FROM information_schema.tables WHERE table_schema='${DB_SERVER_DBNAME}' and table_name = 'dbversion'")
-
-    if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
-        echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
-        ZBX_DB_VERSION=$(mysql_query "SELECT mandatory FROM ${DB_SERVER_DBNAME}.dbversion")
-    fi
-
-    if [ -z "${ZBX_DB_VERSION}" ]; then
-        echo "** Creating '${DB_SERVER_DBNAME}' schema in MySQL"
-
-        zcat /usr/share/doc/zabbix-$type-mysql/create.sql.gz | mysql --silent --skip-column-names \
-                    -h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT} \
-                    -u ${DB_SERVER_ROOT_USER} --password="${DB_SERVER_ROOT_PASS}"  \
-                    ${DB_SERVER_DBNAME} 1>/dev/null
-    fi
-}
-
-create_db_schema_postgresql() {
-    local type=$1
-
-    DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = 
-                                         c.relnamespace WHERE  n.nspname = '$DB_SERVER_SCHEMA' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
-
-    if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
-        echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
-        ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_SCHEMA}.dbversion" "${DB_SERVER_DBNAME}")
-    fi
-
-    if [ -z "${ZBX_DB_VERSION}" ]; then
-        echo "** Creating '${DB_SERVER_DBNAME}' schema in PostgreSQL"
-
-        if [ -n "${DB_SERVER_ZBX_PASS}" ]; then
-            export PGPASSWORD="${DB_SERVER_ZBX_PASS}"
-        fi
-
-        if [ -n "${DB_SERVER_SCHEMA}" ]; then
-            PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}"
-            export PGOPTIONS
-        fi
-
-        zcat /usr/share/doc/zabbix-$type-postgresql/create.sql.gz | psql -q \
-                -h ${DB_SERVER_HOST} -p ${DB_SERVER_PORT} \
-                -U ${DB_SERVER_ZBX_USER} ${DB_SERVER_DBNAME} 1>/dev/null
-
-        unset PGPASSWORD
-        unset PGOPTIONS
-    fi
-}
-
-prepare_web_server_apache() {
-    if [ -d "/etc/apache2/sites-available" ]; then
-        APACHE_SITES_DIR=/etc/apache2/sites-available
-    elif [ -d "/etc/apache2/conf.d" ]; then
-        APACHE_SITES_DIR=/etc/apache2/conf.d
-    elif [ -d "/etc/httpd/conf.d" ]; then
-        APACHE_SITES_DIR=/etc/httpd/conf.d
-    else
-        echo "**** Apache is not available"
-        exit 1
-    fi
-
-    if [ -f "/usr/sbin/a2dissite" ]; then
-        echo "** Disable default site"
-        /usr/sbin/a2dissite 000-default 1>/dev/null
-        rm -rf "$APACHE_SITES_DIR/*"
-    elif [ -f "/etc/apache2/conf.d/default.conf" ]; then
-        echo "** Disable default site"
-        rm -f "/etc/apache2/conf.d/default.conf"
-    elif [ -f "/etc/httpd/conf.d/welcome.conf" ]; then
-        echo "** Disable default site"
-        rm -f "/etc/httpd/conf.d/welcome.conf"
-        rm -f "/etc/httpd/conf.d/ssl.conf"
-    fi
-
-    echo "** Adding Zabbix virtual host (HTTP)"
-    if [ -f "$ZABBIX_ETC_DIR/apache.conf" ]; then
-        ln -s "$ZABBIX_ETC_DIR/apache.conf" "$APACHE_SITES_DIR/zabbix.conf"
-        if [ -f "/usr/sbin/a2dissite" ]; then
-            /usr/sbin/a2ensite zabbix.conf 1>/dev/null
-        fi
-    else
-        echo "**** Impossible to enable HTTP virtual host"
-    fi
-
-    if [ -f "/etc/apache2/conf.d/ssl.conf" ]; then
-        rm -f "/etc/apache2/conf.d/ssl.conf"
-    fi
-
-    if [ -f "/etc/ssl/apache2/ssl.crt" ] && [ -f "/etc/ssl/apache2/ssl.key" ]; then
-        echo "** Enable SSL support for Apache2"
-        if [ -f "/usr/sbin/a2enmod" ]; then
-            /usr/sbin/a2enmod ssl 1>/dev/null
-        fi
-
-        echo "** Adding Zabbix virtual host (HTTPS)"
-        if [ -f "$ZABBIX_ETC_DIR/apache_ssl.conf" ]; then
-            ln -s "$ZABBIX_ETC_DIR/apache_ssl.conf" "$APACHE_SITES_DIR/zabbix_ssl.conf"
-            if [ -f "/usr/sbin/a2dissite" ]; then
-                /usr/sbin/a2ensite zabbix_ssl.conf 1>/dev/null
-            fi
-        else
-            echo "**** Impossible to enable HTTPS virtual host"
-        fi
-    else
-        echo "**** Impossible to enable SSL support for Apache2. Certificates are missed."
-    fi
-
-    # Change Apache2 logging to stdout and stderr
-    if [ -f "/etc/apache2/apache2.conf" ]; then
-        sed -ri \
-            -e 's!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g' \
-            -e 's!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g' \
-            "/etc/apache2/apache2.conf"
-    fi
-
-    if [ -f "/etc/httpd/conf/httpd.conf" ]; then
-        sed -ri \
-            -e 's!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g' \
-            -e 's!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g' \
-            "/etc/httpd/conf/httpd.conf"
-    fi
-
-    if [ -f "/etc/apache2/httpd.conf" ]; then
-        sed -ri \
-            -e 's!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g' \
-            -e 's!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g' \
-            "/etc/apache2/httpd.conf"
-    fi
-
-    if [ -f "/etc/apache2/conf-available/other-vhosts-access-log.conf" ]; then
-        sed -ri \
-            -e 's!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g' \
-            -e 's!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g' \
-            "/etc/apache2/conf-available/other-vhosts-access-log.conf"
-    fi
-
-    if [ -f "/etc/apache2/conf.d/mpm.conf" ]; then
-        sed -ri \
-            -e 's!^(\s*PidFile)\s+\S+!\1 "/var/run/httpd.pid"!g' \
-            "/etc/apache2/conf.d/mpm.conf"
-    fi
-
-    if [ -f "/var/run/apache2/apache2.pid" ]; then
-        rm -f "/var/run/apache2/apache2.pid"
-    fi
-
-    if [ -f "/var/run/httpd/httpd.pid" ]; then
-        rm -f "/var/run/httpd/httpd.pid"
-    fi
-}
-
-prepare_web_server_nginx() {
+prepare_web_server() {
     NGINX_CONFD_DIR="/etc/nginx/conf.d"
     NGINX_SSL_CONFIG="/etc/ssl/nginx"
-    PHP_SESSIONS_DIR="/var/lib/php5"
 
     echo "** Adding Zabbix virtual host (HTTP)"
     if [ -f "$ZABBIX_ETC_DIR/nginx.conf" ]; then
@@ -635,269 +223,28 @@ prepare_web_server_nginx() {
         echo "**** Impossible to enable SSL support for Nginx. Certificates are missed."
     fi
 
-    if [ -d "/var/log/nginx/" ]; then
-        ln -sf /dev/fd/2 /var/log/nginx/error.log
-    fi
-
-    ln -sf /dev/fd/2 /var/log/php5-fpm.log
-    ln -sf /dev/fd/2 /var/log/php7.2-fpm.log
-}
-
-stop_databases() {
-    if ([ "${ZBX_MAIN_DB}" == "mysql" ] || [ "${ZBX_PROXY_DB}" == "mysql" ]) && [ "${DB_SERVER_HOST}" == "localhost" ]; then
-        mysql_query "DELETE FROM mysql.user WHERE host = 'localhost' AND user != 'root'" 1>/dev/null
-
-        if [ -f "/var/lib/mysql/mysqld.pid" ]; then
-            kill -TERM $(cat /var/lib/mysql/mysqld.pid)
-        elif [ -f "/var/run/mysqld/mysqld.pid" ]; then
-            kill -TERM $(cat /var/run/mysqld/mysqld.pid)
-        fi
-    fi
-
-    if [ "${ZBX_MAIN_DB}" == "postgresql" ] && [ "${DB_SERVER_HOST}" == "localhost" ]; then
-        if [ "${OS_CODENAME}" == "alpine" ]; then
-            PGDATA=/var/lib/postgresql
-            BINDIR=/usr/bin
-        else
-            PGDATA=/var/lib/postgresql/9.3/main
-            BINDIR=/usr/lib/postgresql/9.3/bin
-        fi
-        su -c "$BINDIR/pg_ctl -D \"$PGDATA\" -m fast -w stop --silent" postgres 1>/dev/null 2>/dev/null
-    fi
+    ln -sf /dev/fd/2 /var/log/nginx/error.log
 }
 
 clear_deploy() {
-    local type=$1
     echo "** Cleaning the system"
-
-    [ "$type" != "appliance" ] && return
-
-    stop_databases
 }
 
-update_zbx_config() {
-    local type=$1
-    local db_type=$2
-
-    echo "** Preparing Zabbix $type configuration file"
-
-    ZBX_CONFIG=$ZABBIX_ETC_DIR/zabbix_$type.conf
-
-    if [ "$type" == "proxy" ]; then
-        update_config_var $ZBX_CONFIG "ProxyMode" "${ZBX_PROXYMODE}"
-        update_config_var $ZBX_CONFIG "Server" "${ZBX_SERVER_HOST}"
-        update_config_var $ZBX_CONFIG "ServerPort" "${ZBX_SERVER_PORT}"
-        if [ -z "${ZBX_HOSTNAME}" ] && [ -n "${ZBX_HOSTNAMEITEM}" ]; then
-            update_config_var $ZBX_CONFIG "Hostname" ""
-            update_config_var $ZBX_CONFIG "HostnameItem" "${ZBX_HOSTNAMEITEM}"
-        else
-            update_config_var $ZBX_CONFIG "Hostname" "${ZBX_HOSTNAME:-"zabbix-proxy-"$db_type}"
-            update_config_var $ZBX_CONFIG "HostnameItem" "${ZBX_HOSTNAMEITEM}"
-        fi
-    fi
-
-    if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
-        update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
-    else
-        update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
-    fi
-
-    update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
-    update_config_var $ZBX_CONFIG "LogType" "console"
-    update_config_var $ZBX_CONFIG "LogFile"
-    update_config_var $ZBX_CONFIG "LogFileSize"
-    update_config_var $ZBX_CONFIG "PidFile"
-
-    update_config_var $ZBX_CONFIG "DebugLevel" "${ZBX_DEBUGLEVEL}"
-
-    if [ "$db_type" == "sqlite3" ]; then
-        update_config_var $ZBX_CONFIG "DBHost"
-        update_config_var $ZBX_CONFIG "DBName" "/var/lib/zabbix/zabbix_proxy_db"
-        update_config_var $ZBX_CONFIG "DBUser"
-        update_config_var $ZBX_CONFIG "DBPort"
-        update_config_var $ZBX_CONFIG "DBPassword"
-    else
-        update_config_var $ZBX_CONFIG "DBHost" "${DB_SERVER_HOST}"
-        update_config_var $ZBX_CONFIG "DBName" "${DB_SERVER_DBNAME}"
-        update_config_var $ZBX_CONFIG "DBSchema" "${DB_SERVER_SCHEMA}"
-        update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}"
-        update_config_var $ZBX_CONFIG "DBPort" "${DB_SERVER_PORT}"
-        update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
-    fi
-
-    update_config_var $ZBX_CONFIG "DBSocket" "${DB_SERVER_SOCKET}"
-
-    if [ "$type" == "proxy" ]; then
-        update_config_var $ZBX_CONFIG "ProxyLocalBuffer" "${ZBX_PROXYLOCALBUFFER}"
-        update_config_var $ZBX_CONFIG "ProxyOfflineBuffer" "${ZBX_PROXYOFFLINEBUFFER}"
-        update_config_var $ZBX_CONFIG "HeartbeatFrequency" "${ZBX_PROXYHEARTBEATFREQUENCY}"
-        update_config_var $ZBX_CONFIG "ConfigFrequency" "${ZBX_CONFIGFREQUENCY}"
-        update_config_var $ZBX_CONFIG "DataSenderFrequency" "${ZBX_DATASENDERFREQUENCY}"
-    fi
-
-    update_config_var $ZBX_CONFIG "StartPollers" "${ZBX_STARTPOLLERS}"
-    update_config_var $ZBX_CONFIG "StartIPMIPollers" "${ZBX_IPMIPOLLERS}"
-    update_config_var $ZBX_CONFIG "StartPollersUnreachable" "${ZBX_STARTPOLLERSUNREACHABLE}"
-    update_config_var $ZBX_CONFIG "StartTrappers" "${ZBX_STARTTRAPPERS}"
-    update_config_var $ZBX_CONFIG "StartPingers" "${ZBX_STARTPINGERS}"
-    update_config_var $ZBX_CONFIG "StartDiscoverers" "${ZBX_STARTDISCOVERERS}"
-    update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}"
-
-    if [ "$type" == "server" ]; then
-        update_config_var $ZBX_CONFIG "StartTimers" "${ZBX_STARTTIMERS}"
-        update_config_var $ZBX_CONFIG "StartEscalators" "${ZBX_STARTESCALATORS}"
-    fi
-
-    ZBX_JAVAGATEWAY_ENABLE=${ZBX_JAVAGATEWAY_ENABLE:-"false"}
-    if [ "${ZBX_JAVAGATEWAY_ENABLE}" == "true" ]; then
-        update_config_var $ZBX_CONFIG "JavaGateway" "${ZBX_JAVAGATEWAY:-"zabbix-java-gateway"}"
-        update_config_var $ZBX_CONFIG "JavaGatewayPort" "${ZBX_JAVAGATEWAYPORT}"
-        update_config_var $ZBX_CONFIG "StartJavaPollers" "${ZBX_STARTJAVAPOLLERS:-"5"}"
-    else
-        update_config_var $ZBX_CONFIG "JavaGateway"
-        update_config_var $ZBX_CONFIG "JavaGatewayPort"
-        update_config_var $ZBX_CONFIG "StartJavaPollers"
-    fi
-
-    update_config_var $ZBX_CONFIG "StartVMwareCollectors" "${ZBX_STARTVMWARECOLLECTORS}"
-    update_config_var $ZBX_CONFIG "VMwareFrequency" "${ZBX_VMWAREFREQUENCY}"
-    update_config_var $ZBX_CONFIG "VMwarePerfFrequency" "${ZBX_VMWAREPERFFREQUENCY}"
-    update_config_var $ZBX_CONFIG "VMwareCacheSize" "${ZBX_VMWARECACHESIZE}"
-    update_config_var $ZBX_CONFIG "VMwareTimeout" "${ZBX_VMWARETIMEOUT}"
-
-    ZBX_ENABLE_SNMP_TRAPS=${ZBX_ENABLE_SNMP_TRAPS:-"false"}
-    if [ "${ZBX_ENABLE_SNMP_TRAPS}" == "true" ]; then
-        update_config_var $ZBX_CONFIG "SNMPTrapperFile" "${ZABBIX_USER_HOME_DIR}/snmptraps/snmptraps.log"
-        update_config_var $ZBX_CONFIG "StartSNMPTrapper" "1"
-    else
-        update_config_var $ZBX_CONFIG "SNMPTrapperFile"
-        update_config_var $ZBX_CONFIG "StartSNMPTrapper"
-    fi
-
-    update_config_var $ZBX_CONFIG "HousekeepingFrequency" "${ZBX_HOUSEKEEPINGFREQUENCY}"
-    if [ "$type" == "server" ]; then
-        update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}"
-        update_config_var $ZBX_CONFIG "SenderFrequency" "${ZBX_SENDERFREQUENCY}"
-    fi
-
-    update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}"
-
-    if [ "$type" == "server" ]; then
-        update_config_var $ZBX_CONFIG "CacheUpdateFrequency" "${ZBX_CACHEUPDATEFREQUENCY}"
-    fi
-
-    update_config_var $ZBX_CONFIG "StartDBSyncers" "${ZBX_STARTDBSYNCERS}"
-    update_config_var $ZBX_CONFIG "HistoryCacheSize" "${ZBX_HISTORYCACHESIZE}"
-    update_config_var $ZBX_CONFIG "HistoryIndexCacheSize" "${ZBX_HISTORYINDEXCACHESIZE}"
-
-    if [ "$type" == "server" ]; then 
-        update_config_var $ZBX_CONFIG "TrendCacheSize" "${ZBX_TRENDCACHESIZE}"
-        update_config_var $ZBX_CONFIG "ValueCacheSize" "${ZBX_VALUECACHESIZE}"
-    fi
-
-    update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}"
-    update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}"
-    update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}"
-    update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}"
-    update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}"
-
-    update_config_var $ZBX_CONFIG "AlertScriptsPath" "/usr/lib/zabbix/alertscripts"
-    update_config_var $ZBX_CONFIG "ExternalScripts" "/usr/lib/zabbix/externalscripts"
-
-    # Possible few fping locations
-    if [ -f "/usr/bin/fping" ]; then
-        update_config_var $ZBX_CONFIG "FpingLocation" "/usr/bin/fping"
-    else
-        update_config_var $ZBX_CONFIG "FpingLocation" "/usr/sbin/fping"
-    fi
-    if [ -f "/usr/bin/fping6" ]; then
-        update_config_var $ZBX_CONFIG "Fping6Location" "/usr/bin/fping6"
-    else
-        update_config_var $ZBX_CONFIG "Fping6Location" "/usr/sbin/fping6"
-    fi
-
-    update_config_var $ZBX_CONFIG "SSHKeyLocation" "$ZABBIX_USER_HOME_DIR/ssh_keys"
-    update_config_var $ZBX_CONFIG "LogSlowQueries" "${ZBX_LOGSLOWQUERIES}"
-
-    if [ "$type" == "server" ]; then 
-        update_config_var $ZBX_CONFIG "StartProxyPollers" "${ZBX_STARTPROXYPOLLERS}"
-        update_config_var $ZBX_CONFIG "ProxyConfigFrequency" "${ZBX_PROXYCONFIGFREQUENCY}"
-        update_config_var $ZBX_CONFIG "ProxyDataFrequency" "${ZBX_PROXYDATAFREQUENCY}"
-    fi
-
-    update_config_var $ZBX_CONFIG "SSLCertLocation" "$ZABBIX_USER_HOME_DIR/ssl/certs/"
-    update_config_var $ZBX_CONFIG "SSLKeyLocation" "$ZABBIX_USER_HOME_DIR/ssl/keys/"
-    update_config_var $ZBX_CONFIG "SSLCALocation" "$ZABBIX_USER_HOME_DIR/ssl/ssl_ca/"
-    update_config_var $ZBX_CONFIG "LoadModulePath" "$ZABBIX_USER_HOME_DIR/modules/"
-    update_config_multiple_var $ZBX_CONFIG "LoadModule" "${ZBX_LOADMODULE}"
-
-    if [ "$type" == "proxy" ]; then
-        update_config_var $ZBX_CONFIG "TLSConnect" "${ZBX_TLSCONNECT}"
-        update_config_var $ZBX_CONFIG "TLSAccept" "${ZBX_TLSACCEPT}"
-    fi
-    update_config_var $ZBX_CONFIG "TLSCAFile" "${ZBX_TLSCAFILE}"
-    update_config_var $ZBX_CONFIG "TLSCRLFile" "${ZBX_TLSCRLFILE}"
-
-    if [ "$type" == "proxy" ]; then
-        update_config_var $ZBX_CONFIG "TLSServerCertIssuer" "${ZBX_TLSSERVERCERTISSUER}"
-        update_config_var $ZBX_CONFIG "TLSServerCertSubject" "${ZBX_TLSSERVERCERTSUBJECT}"
-    fi
-
-    update_config_var $ZBX_CONFIG "TLSCertFile" "${ZBX_TLSCERTFILE}"
-    update_config_var $ZBX_CONFIG "TLSKeyFile" "${ZBX_TLSKEYFILE}"
-
-    if [ "$type" == "proxy" ]; then
-        update_config_var $ZBX_CONFIG "TLSPSKIdentity" "${ZBX_TLSPSKIDENTITY}"
-        update_config_var $ZBX_CONFIG "TLSPSKFile" "${ZBX_TLSPSKFILE}"
-    fi
-}
-
-
 prepare_zbx_web_config() {
-    local db_type=$1
     local server_name=""
 
     echo "** Preparing Zabbix frontend configuration file"
 
     ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php"
 
-    if [ -f "/usr/share/zabbix/conf/zabbix.conf.php" ]; then
-        rm -f "/usr/share/zabbix/conf/zabbix.conf.php"
-    fi
+    PHP_CONFIG_FILE="/etc/php/7.2/apache2/conf.d/99-zabbix.ini"
 
-    ln -s "$ZBX_WEB_CONFIG" "/usr/share/zabbix/conf/zabbix.conf.php"
-
-    # Different places of PHP configuration file
-    if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then
-        PHP_CONFIG_FILE="/etc/php5/conf.d/99-zabbix.ini"
-    elif [ -f "/etc/php5/fpm/conf.d/99-zabbix.ini" ]; then
-        PHP_CONFIG_FILE="/etc/php5/fpm/conf.d/99-zabbix.ini"
-    elif [ -f "/etc/php5/apache2/conf.d/99-zabbix.ini" ]; then
-        PHP_CONFIG_FILE="/etc/php5/apache2/conf.d/99-zabbix.ini"
-    elif [ -f "/etc/php/7.0/apache2/conf.d/99-zabbix.ini" ]; then
-        PHP_CONFIG_FILE="/etc/php/7.0/apache2/conf.d/99-zabbix.ini"
-    elif [ -f "/etc/php/7.0/fpm/conf.d/99-zabbix.ini" ]; then
-        PHP_CONFIG_FILE="/etc/php/7.0/fpm/conf.d/99-zabbix.ini"
-    elif [ -f "/etc/php.d/99-zabbix.ini" ]; then
-        PHP_CONFIG_FILE="/etc/php.d/99-zabbix.ini"
-    elif [ -f "/etc/php7/conf.d/99-zabbix.ini" ]; then
-        PHP_CONFIG_FILE="/etc/php7/conf.d/99-zabbix.ini"
-    elif [ -f "/etc/php/7.2/fpm/conf.d/99-zabbix.ini" ]; then
-        PHP_CONFIG_FILE="/etc/php/7.2/fpm/conf.d/99-zabbix.ini"
-    elif [ -f "/etc/php/7.2/apache2/conf.d/99-zabbix.ini" ]; then
-        PHP_CONFIG_FILE="/etc/php/7.2/apache2/conf.d/99-zabbix.ini"
-    fi
-
-    if [ -n "$PHP_CONFIG_FILE" ]; then
-        update_config_var "$PHP_CONFIG_FILE" "max_execution_time" "${ZBX_MAXEXECUTIONTIME:-"600"}"
-        update_config_var "$PHP_CONFIG_FILE" "memory_limit" "${ZBX_MEMORYLIMIT:-"128M"}" 
-        update_config_var "$PHP_CONFIG_FILE" "post_max_size" "${ZBX_POSTMAXSIZE:-"16M"}"
-        update_config_var "$PHP_CONFIG_FILE" "upload_max_filesize" "${ZBX_UPLOADMAXFILESIZE:-"2M"}"
-        update_config_var "$PHP_CONFIG_FILE" "max_input_time" "${ZBX_MAXINPUTTIME:-"300"}"
-        update_config_var "$PHP_CONFIG_FILE" "date.timezone" "${PHP_TZ}"
-    else
-        echo "**** Zabbix related PHP configuration file not found"
-    fi
+    update_config_var "$PHP_CONFIG_FILE" "php_value[max_execution_time]" "${ZBX_MAXEXECUTIONTIME:-"600"}"
+    update_config_var "$PHP_CONFIG_FILE" "php_value[memory_limit]" "${ZBX_MEMORYLIMIT:-"128M"}"
+    update_config_var "$PHP_CONFIG_FILE" "php_value[post_max_size]" "${ZBX_POSTMAXSIZE:-"16M"}"
+    update_config_var "$PHP_CONFIG_FILE" "php_value[upload_max_filesize]" "${ZBX_UPLOADMAXFILESIZE:-"2M"}"
+    update_config_var "$PHP_CONFIG_FILE" "php_value[max_input_time]" "${ZBX_MAXINPUTTIME:-"300"}"
+    update_config_var "$PHP_CONFIG_FILE" "php_value[date.timezone]" "${PHP_TZ}"
 
     # Escaping characters in parameter value
     server_name=$(escape_spec_char "${ZBX_SERVER_NAME}")
@@ -915,220 +262,33 @@ prepare_zbx_web_config() {
         -e "s/{ZBX_SERVER_PORT}/${ZBX_SERVER_PORT}/g" \
         -e "s/{ZBX_SERVER_NAME}/$server_name/g" \
     "$ZBX_WEB_CONFIG"
-
-    [ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG"
-}
-
-prepare_zbx_agent_config() {
-    echo "** Preparing Zabbix agent configuration file"
-
-    ZBX_AGENT_CONFIG=$ZABBIX_ETC_DIR/zabbix_agentd.conf
-
-    ZBX_PASSIVESERVERS=${ZBX_PASSIVESERVERS:-""}
-    ZBX_ACTIVESERVERS=${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=${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=${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}"
-}
-
-prepare_java_gateway_config() {
-    echo "** Preparing Zabbix Java Gateway log configuration file"
-
-    ZBX_GATEWAY_CONFIG=$ZABBIX_ETC_DIR/zabbix_java_gateway_logback.xml
-
-    if [ -n "${ZBX_DEBUGLEVEL}" ]; then
-        echo "Updating $ZBX_GATEWAY_CONFIG 'DebugLevel' parameter: '${ZBX_DEBUGLEVEL}'... updated"
-        if [ -f "$ZBX_GATEWAY_CONFIG" ]; then
-            sed -i -e "/^.*<root level=/s/=.*/=\"${ZBX_DEBUGLEVEL}\">/" "$ZBX_GATEWAY_CONFIG"
-        else
-            echo "**** Zabbix Java Gateway log configuration file '$ZBX_GATEWAY_CONFIG' not found"
-        fi
-    fi
-}
-
-prepare_agent() {
-    echo "** Preparing Zabbix agent"
-    prepare_zbx_agent_config
-}
-
-prepare_server() {
-    local db_type=$1
-
-    echo "** Preparing Zabbix server"
-
-    check_variables_$db_type "server"
-    check_db_connect_$db_type
-    create_db_user_$db_type
-    create_db_database_$db_type
-    create_db_schema_$db_type "server"
-
-    update_zbx_config "server" "$db_type"
-}
-
-prepare_proxy() {
-    local db_type=$1
-
-    echo "Preparing Zabbix proxy"
-
-    if [ "$db_type" != "sqlite3" ]; then
-        check_variables_$db_type "proxy"
-        check_db_connect_$db_type
-        create_db_user_$db_type
-        create_db_database_$db_type
-        create_db_schema_$db_type "proxy"
-    fi
-
-    update_zbx_config "proxy" $db_type
 }
 
 prepare_web() {
-    local web_server=$1
-    local db_type=$2
-
     echo "** Preparing Zabbix web-interface"
 
-    check_variables_$db_type
-    check_db_connect_$db_type
-    prepare_web_server_$web_server
-    prepare_zbx_web_config $db_type
+    check_variables
+    check_db_connect
+    prepare_web_server
+    prepare_zbx_web_config
 }
 
-prepare_java_gateway() {
-    echo "** Preparing Zabbix Java Gateway"
-
-    prepare_java_gateway_config
-}
 
 #################################################
 
-if [ ! -n "$zbx_type" ]; then
-    echo "**** Type of Zabbix component is not specified"
-    exit 1
-elif [ "$zbx_type" == "dev" ]; then
-    echo "** Deploying Zabbix installation from SVN"
-else
-    if [ ! -n "$zbx_db_type" ]; then
-        echo "**** Database type of Zabbix $zbx_type is not specified"
-        exit 1
-    fi
+echo "** Deploying Zabbix web-interface (Nginx) with PostgreSQL database"
 
-    if [ "$zbx_db_type" != "none" ]; then
-        if [ "$zbx_opt_type" != "none" ]; then
-            echo "** Deploying Zabbix $zbx_type ($zbx_opt_type) with $zbx_db_type database"
-        else
-            echo "** Deploying Zabbix $zbx_type with $zbx_db_type database"
-        fi
-    else
-        echo "** Deploying Zabbix $zbx_type"
-    fi
-fi
+prepare_system
 
-prepare_system "$zbx_type" "$zbx_opt_type"
+prepare_web
 
-[ "$zbx_type" == "server" ] && prepare_server $zbx_db_type
-[ "${ZBX_ADD_SERVER}" == "true" ] && prepare_server ${ZBX_MAIN_DB}
-
-[ "$zbx_type" == "proxy" ] && prepare_proxy $zbx_db_type
-[ "${ZBX_ADD_PROXY}" == "true" ] && prepare_proxy ${ZBX_PROXY_DB}
-
-[ "$zbx_type" == "frontend" ] && prepare_web $zbx_opt_type $zbx_db_type
-[ "${ZBX_ADD_WEB}" == "true" ] && prepare_web ${ZBX_WEB_SERVER} ${ZBX_MAIN_DB}
-
-[ "$zbx_type" == "agent" ] && prepare_agent
-[ "${ZBX_ADD_AGENT}" == "true" ] && prepare_agent
-
-[ "$zbx_type" == "java-gateway" ] && prepare_java_gateway
-[ "${ZBX_ADD_JAVA_GATEWAY}" == "true" ] && prepare_java_gateway
-
-clear_deploy "$zbx_type"
+clear_deploy
 
 echo "########################################################"
 
 if [ "$1" != "" ]; then
     echo "** Executing '$@'"
     exec "$@"
-elif [ "$zbx_type" == "agent" ]; then
-    echo "** Starting Zabbix agent"
-    exec su zabbix -s "/bin/bash" -c "/usr/sbin/zabbix_agentd --foreground -c /etc/zabbix/zabbix_agentd.conf"
-elif [ "$zbx_type" == "proxy" ]; then
-    echo "** Starting Zabbix proxy"
-    exec su zabbix -s "/bin/bash" -c "/usr/sbin/zabbix_proxy --foreground -c /etc/zabbix/zabbix_proxy.conf"
-elif [ "$zbx_type" == "server" ]; then
-    echo "** Starting Zabbix server"
-    exec su zabbix -s "/bin/bash" -c "/usr/sbin/zabbix_server --foreground -c /etc/zabbix/zabbix_server.conf"
-elif [ "$zbx_type" == "java-gateway" ]; then
-    echo "** Starting Zabbix Java Gateway"
-    exec su zabbix -s "/bin/bash" -c "/usr/sbin/zabbix_java_gateway"
-elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
-    echo "** Starting Zabbix frontend"
-    if [ -f "/usr/sbin/httpd" ]; then
-        exec /usr/sbin/httpd -D FOREGROUND
-    elif [ -f "/usr/sbin/apache2ctl" ]; then
-        exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
-    else
-        echo "Unknown Web-server. Exiting..."
-        exit 1
-    fi
 elif [ -f "/usr/bin/supervisord" ]; then
     echo "** Executing supervisord"
     exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf