diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index e09c34500..a88c7db08 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -43,7 +43,6 @@ jobs:
           - web-apache-pgsql
           - web-nginx-mysql
           - web-nginx-pgsql
-          - web-service
         os:
          - alpine
          - ubuntu
@@ -79,10 +78,6 @@ jobs:
             DOCKER_PLATFORM="linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le"
           fi
 
-          if [ "${{ matrix.build }}" == "web-service" ]; then
-            DOCKER_PLATFORM="linux/amd64,linux/arm64"
-          fi
-
           if [ "${{ matrix.os }}" == "ubuntu" ]; then
             DOCKER_PLATFORM="linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le"
           fi
@@ -95,10 +90,6 @@ jobs:
             DOCKER_PLATFORM=${DOCKER_PLATFORM%",linux/ppc64le"}
           fi
 
-          if [ "${{ matrix.build }}" == "web-service" ]; then
-            DOCKER_PLATFORM=${DOCKER_PLATFORM%",linux/ppc64le"}
-          fi
-
           echo ::set-output name=list::${DOCKER_PLATFORM}
 
       - name: Prepare environment (push)
diff --git a/agent2/ubuntu/Dockerfile b/agent2/ubuntu/Dockerfile
index 318bf13b0..0d0d51183 100644
--- a/agent2/ubuntu/Dockerfile
+++ b/agent2/ubuntu/Dockerfile
@@ -67,7 +67,7 @@ RUN set -eux && \
             make \
             pkg-config \
             git \
-            gcc \
+            g++ \
             golang && \
     cd /tmp/ && \
     git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
diff --git a/server-mysql/alpine/docker-entrypoint.sh b/server-mysql/alpine/docker-entrypoint.sh
index f4707e4d0..599fc7259 100755
--- a/server-mysql/alpine/docker-entrypoint.sh
+++ b/server-mysql/alpine/docker-entrypoint.sh
@@ -407,6 +407,7 @@ update_zbx_config() {
     if [ -n "${ZBX_EXPORTFILESIZE}" ]; then
         update_config_var $ZBX_CONFIG "ExportDir" "$ZABBIX_USER_HOME_DIR/export/"
         update_config_var $ZBX_CONFIG "ExportFileSize" "${ZBX_EXPORTFILESIZE}"
+        update_config_var $ZBX_CONFIG "ExportType" "${ZBX_EXPORTTYPE}"
     fi
 
     update_config_var $ZBX_CONFIG "FpingLocation" "/usr/sbin/fping"
diff --git a/server-mysql/centos/docker-entrypoint.sh b/server-mysql/centos/docker-entrypoint.sh
index 85ea82c46..97a5a97fe 100755
--- a/server-mysql/centos/docker-entrypoint.sh
+++ b/server-mysql/centos/docker-entrypoint.sh
@@ -404,6 +404,7 @@ update_zbx_config() {
     if [ -n "${ZBX_EXPORTFILESIZE}" ]; then
         update_config_var $ZBX_CONFIG "ExportDir" "$ZABBIX_USER_HOME_DIR/export/"
         update_config_var $ZBX_CONFIG "ExportFileSize" "${ZBX_EXPORTFILESIZE}"
+        update_config_var $ZBX_CONFIG "ExportType" "${ZBX_EXPORTTYPE}"
     fi
 
     update_config_var $ZBX_CONFIG "FpingLocation" "/usr/sbin/fping"
diff --git a/server-mysql/rhel/docker-entrypoint.sh b/server-mysql/rhel/docker-entrypoint.sh
index 85ea82c46..97a5a97fe 100755
--- a/server-mysql/rhel/docker-entrypoint.sh
+++ b/server-mysql/rhel/docker-entrypoint.sh
@@ -404,6 +404,7 @@ update_zbx_config() {
     if [ -n "${ZBX_EXPORTFILESIZE}" ]; then
         update_config_var $ZBX_CONFIG "ExportDir" "$ZABBIX_USER_HOME_DIR/export/"
         update_config_var $ZBX_CONFIG "ExportFileSize" "${ZBX_EXPORTFILESIZE}"
+        update_config_var $ZBX_CONFIG "ExportType" "${ZBX_EXPORTTYPE}"
     fi
 
     update_config_var $ZBX_CONFIG "FpingLocation" "/usr/sbin/fping"
diff --git a/server-mysql/ubuntu/docker-entrypoint.sh b/server-mysql/ubuntu/docker-entrypoint.sh
index eaef8689d..1c219f920 100755
--- a/server-mysql/ubuntu/docker-entrypoint.sh
+++ b/server-mysql/ubuntu/docker-entrypoint.sh
@@ -404,6 +404,7 @@ update_zbx_config() {
     if [ -n "${ZBX_EXPORTFILESIZE}" ]; then
         update_config_var $ZBX_CONFIG "ExportDir" "$ZABBIX_USER_HOME_DIR/export/"
         update_config_var $ZBX_CONFIG "ExportFileSize" "${ZBX_EXPORTFILESIZE}"
+        update_config_var $ZBX_CONFIG "ExportType" "${ZBX_EXPORTTYPE}"
     fi
 
     update_config_var $ZBX_CONFIG "FpingLocation" "/usr/bin/fping"
diff --git a/server-pgsql/alpine/docker-entrypoint.sh b/server-pgsql/alpine/docker-entrypoint.sh
index f21a62da8..fb0feede1 100755
--- a/server-pgsql/alpine/docker-entrypoint.sh
+++ b/server-pgsql/alpine/docker-entrypoint.sh
@@ -442,6 +442,7 @@ update_zbx_config() {
     if [ -n "${ZBX_EXPORTFILESIZE}" ]; then
         update_config_var $ZBX_CONFIG "ExportDir" "$ZABBIX_USER_HOME_DIR/export/"
         update_config_var $ZBX_CONFIG "ExportFileSize" "${ZBX_EXPORTFILESIZE}"
+        update_config_var $ZBX_CONFIG "ExportType" "${ZBX_EXPORTTYPE}"
     fi
 
     update_config_var $ZBX_CONFIG "FpingLocation" "/usr/sbin/fping"
diff --git a/server-pgsql/centos/docker-entrypoint.sh b/server-pgsql/centos/docker-entrypoint.sh
index f21a62da8..fb0feede1 100755
--- a/server-pgsql/centos/docker-entrypoint.sh
+++ b/server-pgsql/centos/docker-entrypoint.sh
@@ -442,6 +442,7 @@ update_zbx_config() {
     if [ -n "${ZBX_EXPORTFILESIZE}" ]; then
         update_config_var $ZBX_CONFIG "ExportDir" "$ZABBIX_USER_HOME_DIR/export/"
         update_config_var $ZBX_CONFIG "ExportFileSize" "${ZBX_EXPORTFILESIZE}"
+        update_config_var $ZBX_CONFIG "ExportType" "${ZBX_EXPORTTYPE}"
     fi
 
     update_config_var $ZBX_CONFIG "FpingLocation" "/usr/sbin/fping"
diff --git a/server-pgsql/ubuntu/docker-entrypoint.sh b/server-pgsql/ubuntu/docker-entrypoint.sh
index 48c642eff..189da1856 100755
--- a/server-pgsql/ubuntu/docker-entrypoint.sh
+++ b/server-pgsql/ubuntu/docker-entrypoint.sh
@@ -442,6 +442,7 @@ update_zbx_config() {
     if [ -n "${ZBX_EXPORTFILESIZE}" ]; then
         update_config_var $ZBX_CONFIG "ExportDir" "$ZABBIX_USER_HOME_DIR/export/"
         update_config_var $ZBX_CONFIG "ExportFileSize" "${ZBX_EXPORTFILESIZE}"
+        update_config_var $ZBX_CONFIG "ExportType" "${ZBX_EXPORTTYPE}"
     fi
 
     update_config_var $ZBX_CONFIG "FpingLocation" "/usr/bin/fping"