diff --git a/Dockerfiles/build-mysql/alpine/patches/.gitkeep b/Dockerfiles/build-mysql/alpine/patches/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/Dockerfiles/build-mysql/alpine/patches/chromedp_no_sandbox.patch b/Dockerfiles/build-mysql/alpine/patches/chromedp_no_sandbox.patch
deleted file mode 100644
index c8a2e162c..000000000
--- a/Dockerfiles/build-mysql/alpine/patches/chromedp_no_sandbox.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/go/cmd/zabbix_web_service/pdf_report_creator.go b/src/go/cmd/zabbix_web_service/pdf_report_creator.go
-index afab41204d1..f1a9b859f34 100644
---- a/src/go/cmd/zabbix_web_service/pdf_report_creator.go
-+++ b/src/go/cmd/zabbix_web_service/pdf_report_creator.go
-@@ -100,7 +100,11 @@ func (h *handler) report(w http.ResponseWriter, r *http.Request) {
- 		return
- 	}
- 
--	opts := chromedp.DefaultExecAllocatorOptions[:]
-+	opts := append(chromedp.DefaultExecAllocatorOptions[:],
-+                chromedp.DisableGPU,
-+                chromedp.NoSandbox,
-+                chromedp.Flag("disable-setuid-sandbox", true),
-+        )
- 
- 	if options.IgnoreURLCertErrors == 1 {
- 		opts = append(opts, chromedp.Flag("ignore-certificate-errors", "1"))
diff --git a/Dockerfiles/build-mysql/centos/patches/.gitkeep b/Dockerfiles/build-mysql/centos/patches/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/Dockerfiles/build-mysql/centos/patches/chromedp_no_sandbox.patch b/Dockerfiles/build-mysql/centos/patches/chromedp_no_sandbox.patch
deleted file mode 100644
index c8a2e162c..000000000
--- a/Dockerfiles/build-mysql/centos/patches/chromedp_no_sandbox.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/go/cmd/zabbix_web_service/pdf_report_creator.go b/src/go/cmd/zabbix_web_service/pdf_report_creator.go
-index afab41204d1..f1a9b859f34 100644
---- a/src/go/cmd/zabbix_web_service/pdf_report_creator.go
-+++ b/src/go/cmd/zabbix_web_service/pdf_report_creator.go
-@@ -100,7 +100,11 @@ func (h *handler) report(w http.ResponseWriter, r *http.Request) {
- 		return
- 	}
- 
--	opts := chromedp.DefaultExecAllocatorOptions[:]
-+	opts := append(chromedp.DefaultExecAllocatorOptions[:],
-+                chromedp.DisableGPU,
-+                chromedp.NoSandbox,
-+                chromedp.Flag("disable-setuid-sandbox", true),
-+        )
- 
- 	if options.IgnoreURLCertErrors == 1 {
- 		opts = append(opts, chromedp.Flag("ignore-certificate-errors", "1"))
diff --git a/Dockerfiles/build-mysql/ol/patches/.gitkeep b/Dockerfiles/build-mysql/ol/patches/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/Dockerfiles/build-mysql/ol/patches/chromedp_no_sandbox.patch b/Dockerfiles/build-mysql/ol/patches/chromedp_no_sandbox.patch
deleted file mode 100644
index c8a2e162c..000000000
--- a/Dockerfiles/build-mysql/ol/patches/chromedp_no_sandbox.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/go/cmd/zabbix_web_service/pdf_report_creator.go b/src/go/cmd/zabbix_web_service/pdf_report_creator.go
-index afab41204d1..f1a9b859f34 100644
---- a/src/go/cmd/zabbix_web_service/pdf_report_creator.go
-+++ b/src/go/cmd/zabbix_web_service/pdf_report_creator.go
-@@ -100,7 +100,11 @@ func (h *handler) report(w http.ResponseWriter, r *http.Request) {
- 		return
- 	}
- 
--	opts := chromedp.DefaultExecAllocatorOptions[:]
-+	opts := append(chromedp.DefaultExecAllocatorOptions[:],
-+                chromedp.DisableGPU,
-+                chromedp.NoSandbox,
-+                chromedp.Flag("disable-setuid-sandbox", true),
-+        )
- 
- 	if options.IgnoreURLCertErrors == 1 {
- 		opts = append(opts, chromedp.Flag("ignore-certificate-errors", "1"))
diff --git a/Dockerfiles/build-mysql/rhel/patches/.gitkeep b/Dockerfiles/build-mysql/rhel/patches/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/Dockerfiles/build-mysql/rhel/patches/chromedp_no_sandbox.patch b/Dockerfiles/build-mysql/rhel/patches/chromedp_no_sandbox.patch
deleted file mode 100644
index c8a2e162c..000000000
--- a/Dockerfiles/build-mysql/rhel/patches/chromedp_no_sandbox.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/go/cmd/zabbix_web_service/pdf_report_creator.go b/src/go/cmd/zabbix_web_service/pdf_report_creator.go
-index afab41204d1..f1a9b859f34 100644
---- a/src/go/cmd/zabbix_web_service/pdf_report_creator.go
-+++ b/src/go/cmd/zabbix_web_service/pdf_report_creator.go
-@@ -100,7 +100,11 @@ func (h *handler) report(w http.ResponseWriter, r *http.Request) {
- 		return
- 	}
- 
--	opts := chromedp.DefaultExecAllocatorOptions[:]
-+	opts := append(chromedp.DefaultExecAllocatorOptions[:],
-+                chromedp.DisableGPU,
-+                chromedp.NoSandbox,
-+                chromedp.Flag("disable-setuid-sandbox", true),
-+        )
- 
- 	if options.IgnoreURLCertErrors == 1 {
- 		opts = append(opts, chromedp.Flag("ignore-certificate-errors", "1"))
diff --git a/Dockerfiles/build-mysql/ubuntu/patches/.gitkeep b/Dockerfiles/build-mysql/ubuntu/patches/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/Dockerfiles/build-mysql/ubuntu/patches/chromedp_no_sandbox.patch b/Dockerfiles/build-mysql/ubuntu/patches/chromedp_no_sandbox.patch
deleted file mode 100644
index c8a2e162c..000000000
--- a/Dockerfiles/build-mysql/ubuntu/patches/chromedp_no_sandbox.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/go/cmd/zabbix_web_service/pdf_report_creator.go b/src/go/cmd/zabbix_web_service/pdf_report_creator.go
-index afab41204d1..f1a9b859f34 100644
---- a/src/go/cmd/zabbix_web_service/pdf_report_creator.go
-+++ b/src/go/cmd/zabbix_web_service/pdf_report_creator.go
-@@ -100,7 +100,11 @@ func (h *handler) report(w http.ResponseWriter, r *http.Request) {
- 		return
- 	}
- 
--	opts := chromedp.DefaultExecAllocatorOptions[:]
-+	opts := append(chromedp.DefaultExecAllocatorOptions[:],
-+                chromedp.DisableGPU,
-+                chromedp.NoSandbox,
-+                chromedp.Flag("disable-setuid-sandbox", true),
-+        )
- 
- 	if options.IgnoreURLCertErrors == 1 {
- 		opts = append(opts, chromedp.Flag("ignore-certificate-errors", "1"))
diff --git a/Dockerfiles/build-pgsql/alpine/patches/.gitkeep b/Dockerfiles/build-pgsql/alpine/patches/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/Dockerfiles/build-pgsql/alpine/patches/chromedp_no_sandbox.patch b/Dockerfiles/build-pgsql/alpine/patches/chromedp_no_sandbox.patch
deleted file mode 100644
index c8a2e162c..000000000
--- a/Dockerfiles/build-pgsql/alpine/patches/chromedp_no_sandbox.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/go/cmd/zabbix_web_service/pdf_report_creator.go b/src/go/cmd/zabbix_web_service/pdf_report_creator.go
-index afab41204d1..f1a9b859f34 100644
---- a/src/go/cmd/zabbix_web_service/pdf_report_creator.go
-+++ b/src/go/cmd/zabbix_web_service/pdf_report_creator.go
-@@ -100,7 +100,11 @@ func (h *handler) report(w http.ResponseWriter, r *http.Request) {
- 		return
- 	}
- 
--	opts := chromedp.DefaultExecAllocatorOptions[:]
-+	opts := append(chromedp.DefaultExecAllocatorOptions[:],
-+                chromedp.DisableGPU,
-+                chromedp.NoSandbox,
-+                chromedp.Flag("disable-setuid-sandbox", true),
-+        )
- 
- 	if options.IgnoreURLCertErrors == 1 {
- 		opts = append(opts, chromedp.Flag("ignore-certificate-errors", "1"))
diff --git a/Dockerfiles/build-pgsql/centos/patches/.gitkeep b/Dockerfiles/build-pgsql/centos/patches/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/Dockerfiles/build-pgsql/centos/patches/chromedp_no_sandbox.patch b/Dockerfiles/build-pgsql/centos/patches/chromedp_no_sandbox.patch
deleted file mode 100644
index c8a2e162c..000000000
--- a/Dockerfiles/build-pgsql/centos/patches/chromedp_no_sandbox.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/go/cmd/zabbix_web_service/pdf_report_creator.go b/src/go/cmd/zabbix_web_service/pdf_report_creator.go
-index afab41204d1..f1a9b859f34 100644
---- a/src/go/cmd/zabbix_web_service/pdf_report_creator.go
-+++ b/src/go/cmd/zabbix_web_service/pdf_report_creator.go
-@@ -100,7 +100,11 @@ func (h *handler) report(w http.ResponseWriter, r *http.Request) {
- 		return
- 	}
- 
--	opts := chromedp.DefaultExecAllocatorOptions[:]
-+	opts := append(chromedp.DefaultExecAllocatorOptions[:],
-+                chromedp.DisableGPU,
-+                chromedp.NoSandbox,
-+                chromedp.Flag("disable-setuid-sandbox", true),
-+        )
- 
- 	if options.IgnoreURLCertErrors == 1 {
- 		opts = append(opts, chromedp.Flag("ignore-certificate-errors", "1"))
diff --git a/Dockerfiles/build-pgsql/ol/patches/.gitkeep b/Dockerfiles/build-pgsql/ol/patches/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/Dockerfiles/build-pgsql/ol/patches/chromedp_no_sandbox.patch b/Dockerfiles/build-pgsql/ol/patches/chromedp_no_sandbox.patch
deleted file mode 100644
index c8a2e162c..000000000
--- a/Dockerfiles/build-pgsql/ol/patches/chromedp_no_sandbox.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/go/cmd/zabbix_web_service/pdf_report_creator.go b/src/go/cmd/zabbix_web_service/pdf_report_creator.go
-index afab41204d1..f1a9b859f34 100644
---- a/src/go/cmd/zabbix_web_service/pdf_report_creator.go
-+++ b/src/go/cmd/zabbix_web_service/pdf_report_creator.go
-@@ -100,7 +100,11 @@ func (h *handler) report(w http.ResponseWriter, r *http.Request) {
- 		return
- 	}
- 
--	opts := chromedp.DefaultExecAllocatorOptions[:]
-+	opts := append(chromedp.DefaultExecAllocatorOptions[:],
-+                chromedp.DisableGPU,
-+                chromedp.NoSandbox,
-+                chromedp.Flag("disable-setuid-sandbox", true),
-+        )
- 
- 	if options.IgnoreURLCertErrors == 1 {
- 		opts = append(opts, chromedp.Flag("ignore-certificate-errors", "1"))
diff --git a/Dockerfiles/build-pgsql/rhel/Dockerfile b/Dockerfiles/build-pgsql/rhel/Dockerfile
deleted file mode 100644
index abf373b69..000000000
--- a/Dockerfiles/build-pgsql/rhel/Dockerfile
+++ /dev/null
@@ -1,184 +0,0 @@
-# syntax=docker/dockerfile:1
-ARG MAJOR_VERSION=7.0
-ARG RELEASE=7
-ARG ZBX_VERSION=${MAJOR_VERSION}.7
-ARG BUILD_BASE_IMAGE=zabbix-build-base:rhel-${ZBX_VERSION}
-
-FROM ${BUILD_BASE_IMAGE} AS builder
-
-ARG MAJOR_VERSION
-ARG RELEASE
-ARG ZBX_VERSION
-ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
-ARG GIT_BRANCH
-
-ARG ZBX_PLUGINS_VERSION=${GIT_BRANCH:-$ZBX_VERSION}
-ARG CFLAGS
-
-LABEL description="Zabbix build base for PostgreSQL based images" \
-      maintainer="alexey.pustovalov@zabbix.com" \
-      name="zabbix/zabbix-build-pgsql-70" \
-      release="${RELEASE}" \
-      summary="Zabbix build base (PostgreSQL)" \
-      url="https://www.zabbix.com/" \
-      vendor="Zabbix SIA" \
-      version="${MAJOR_VERSION}" \
-      io.k8s.description="Zabbix build base for PostgreSQL based images" \
-      io.k8s.display-name="Zabbix build base (PostgreSQL)" \
-      io.openshift.expose-services="" \
-      io.openshift.tags="zabbix,build,pgsql" \
-      org.label-schema.description="Zabbix build base for PostgreSQL based images" \
-      org.label-schema.license="AGPL v3.0" \
-      org.label-schema.name="zabbix-build-pgsql-rhel" \
-      org.label-schema.url="https://zabbix.com/" \
-      org.label-schema.vcs-ref="${VCS_REF}" \
-      org.label-schema.vendor="Zabbix SIA"
-
-ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \
-    DB_TYPE=postgresql \
-    CFLAGS=${CFLAGS:-"-fPIC -pie -Wl,-z,relro,-z,now,-z,defs -D_FORTIFY_SOURCE=2 -fexceptions -O2 -pipe"} \
-    MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \
-    POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \
-    MSSQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mssql.git MSSQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \
-    EMBER_PLUS_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/ember-plus.git EMBER_PLUS_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION}
-
-RUN --mount=type=cache,target=/root/.cache/go-build/ \
-    --mount=type=cache,target=/root/go/ \
-    --mount=from=sources,target=/tmp/src \
-    --mount=type=bind,source=patches/,target=/tmp/patches \
-    set -eux && \
-    cd /tmp/ && \
-    mkdir -p ${ZBX_OUTPUT_DIR}/agent/sbin/ && \
-    mkdir -p ${ZBX_OUTPUT_DIR}/agent/conf/ && \
-    mkdir -p ${ZBX_OUTPUT_DIR}/agent2/sbin/ && \
-    mkdir -p ${ZBX_OUTPUT_DIR}/agent2/conf/ && \
-    mkdir -p ${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d/ && \
-    mkdir -p ${ZBX_OUTPUT_DIR}/proxy/sbin/ && \
-    mkdir -p ${ZBX_OUTPUT_DIR}/proxy/conf/ && \
-    mkdir -p ${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE}/ && \
-    mkdir -p ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/with-compression/ && \
-    mkdir -p ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/without-compression/ && \
-    mkdir -p ${ZBX_OUTPUT_DIR}/server/sbin/ && \
-    mkdir -p ${ZBX_OUTPUT_DIR}/server/conf/ && \
-    mkdir -p ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/ && \
-    mkdir -p ${ZBX_OUTPUT_DIR}/java_gateway/sbin/ && \
-    mkdir -p ${ZBX_OUTPUT_DIR}/web_service/sbin/ && \
-    mkdir -p ${ZBX_OUTPUT_DIR}/web_service/conf/ && \
-    mkdir -p ${ZBX_OUTPUT_DIR}/general/sbin/ && \
-    mkdir -p ${ZBX_OUTPUT_DIR}/general/bin/ && \
-    mkdir -p ${ZBX_OUTPUT_DIR}/general/conf/ && \
-    if [ -f "/tmp/src/bootstrap.sh" ]; then \
-        cp -R /tmp/src ${ZBX_SOURCES_DIR}; \
-    else \
-        git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH:-$ZBX_VERSION} --depth 1 --single-branch ${ZBX_SOURCES_DIR}; \
-    fi && \
-    cd ${ZBX_SOURCES_DIR} && \
-    for patch_filename in /tmp/patches/*.patch; do \
-        if [ -f "$patch_filename" ]; then \
-            patch -p1 < $patch_filename; \
-        fi \
-    done && \
-    zabbix_revision=`git rev-parse --short HEAD` && \
-    sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
-    sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/go/pkg/version/version.go && \
-    sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \
-    ./bootstrap.sh && \
-    ./configure \
-            --datadir=/usr/lib \
-            --libdir=/usr/lib/zabbix \
-            --prefix=/usr \
-            --sysconfdir=/etc/zabbix \
-            --enable-ipv6 \
-            --enable-agent \
-            --enable-agent2 \
-            --enable-java \
-            --enable-proxy \
-            --enable-server \
-            --enable-webservice \
-            --with-ldap \
-            --with-libcurl \
-            --with-libmodbus \
-            --with-libpcre2 \
-            --with-libxml2 \
-            --with-${DB_TYPE} \
-            --with-net-snmp \
-            --with-openipmi \
-            --with-openssl \
-            --with-ssh \
-            --with-unixodbc \
-            --silent && \
-    make -j"$(nproc)" -s dbschema && \
-    make -j"$(nproc)" -s && \
-    make -j"$(nproc)" -s gettext && \
-    cat database/${DB_TYPE}/schema.sql > database/${DB_TYPE}/create.sql && \
-    gzip -c database/${DB_TYPE}/create.sql > ${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE}/create.sql.gz && \
-    cat database/${DB_TYPE}/images.sql >> database/${DB_TYPE}/create.sql && \
-    cat database/${DB_TYPE}/data.sql >> database/${DB_TYPE}/create.sql && \
-    gzip -c database/${DB_TYPE}/create.sql > ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/create.sql.gz && \
-    rm -rf database/${DB_TYPE}/create.sql && \
-    cp -R ${ZBX_SOURCES_DIR}/database/postgresql/timescaledb/schema.sql ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/timescaledb.sql && \
-    cp -R ${ZBX_SOURCES_DIR}/database/postgresql/timescaledb/option-patches/with-compression/*.sql ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/with-compression/ && \
-    cp -R ${ZBX_SOURCES_DIR}/database/postgresql/timescaledb/option-patches/without-compression/*.sql ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/without-compression/ && \
-    mkdir /tmp/fonts/ && \
-    curl --tlsv1.2 -sSf -L "https://noto-website-2.storage.googleapis.com/pkgs/NotoSansCJKjp-hinted.zip" -o /tmp/fonts/NotoSansCJKjp-hinted.zip && \
-    unzip /tmp/fonts/NotoSansCJKjp-hinted.zip -d /tmp/fonts/ && \
-    cp /tmp/fonts/NotoSansCJKjp-Regular.otf ${ZBX_SOURCES_DIR}/ui/assets/fonts/NotoSansCJKjp-Regular.ttf && \
-    cp /tmp/fonts/LICENSE_OFL.txt ${ZBX_SOURCES_DIR}/ui/assets/fonts/ && \
-    rm -f ${ZBX_SOURCES_DIR}/ui/assets/fonts/DejaVuSans.ttf && \
-    sed -i -r "s/(define\(.*_FONT_NAME.*)DejaVuSans/\1NotoSansCJKjp-Regular/" ${ZBX_SOURCES_DIR}/ui/include/defines.inc.php && \
-    rm -rf /tmp/fonts/ && \
-    chmod o+r ${ZBX_SOURCES_DIR}/ui/assets/fonts/* && \
-    strip ${ZBX_SOURCES_DIR}/src/zabbix_agent/zabbix_agentd && \
-    strip ${ZBX_SOURCES_DIR}/src/zabbix_server/zabbix_server && \
-    strip ${ZBX_SOURCES_DIR}/src/zabbix_proxy/zabbix_proxy && \
-    strip ${ZBX_SOURCES_DIR}/src/go/bin/zabbix_agent2 && \
-    strip ${ZBX_SOURCES_DIR}/src/zabbix_get/zabbix_get && \
-    strip ${ZBX_SOURCES_DIR}/src/zabbix_sender/zabbix_sender && \
-    strip ${ZBX_SOURCES_DIR}/src/go/bin/zabbix_web_service && \
-    cp ${ZBX_SOURCES_DIR}/src/zabbix_agent/zabbix_agentd ${ZBX_OUTPUT_DIR}/agent/sbin/ && \
-    cp ${ZBX_SOURCES_DIR}/conf/zabbix_agentd.conf ${ZBX_OUTPUT_DIR}/agent/conf/ && \
-    cp -R ${ZBX_SOURCES_DIR}/conf/zabbix_agentd/ ${ZBX_OUTPUT_DIR}/agent/conf/ && \
-    cp ${ZBX_SOURCES_DIR}/src/go/bin/zabbix_agent2 ${ZBX_OUTPUT_DIR}/agent2/sbin/ && \
-    cp ${ZBX_SOURCES_DIR}/src/go/conf/zabbix_agent2.conf ${ZBX_OUTPUT_DIR}/agent2/conf/ && \
-    cp -R ${ZBX_SOURCES_DIR}/src/go/conf/zabbix_agent2.d/ ${ZBX_OUTPUT_DIR}/agent2/conf/ && \
-    cp ${ZBX_SOURCES_DIR}/src/zabbix_server/zabbix_server ${ZBX_OUTPUT_DIR}/server/sbin/ && \
-    cp ${ZBX_SOURCES_DIR}/conf/zabbix_server.conf ${ZBX_OUTPUT_DIR}/server/conf/ && \
-    cp ${ZBX_SOURCES_DIR}/src/zabbix_proxy/zabbix_proxy ${ZBX_OUTPUT_DIR}/proxy/sbin/ && \
-    cp ${ZBX_SOURCES_DIR}/conf/zabbix_proxy.conf ${ZBX_OUTPUT_DIR}/proxy/conf/ && \
-    cp -R ${ZBX_SOURCES_DIR}/src/zabbix_java/bin/ ${ZBX_OUTPUT_DIR}/java_gateway/sbin/ && \
-    cp -R ${ZBX_SOURCES_DIR}/src/zabbix_java/lib/ ${ZBX_OUTPUT_DIR}/java_gateway/sbin/ && \
-    cp ${ZBX_SOURCES_DIR}/src/go/bin/zabbix_web_service ${ZBX_OUTPUT_DIR}/web_service/sbin/ && \
-    cp ${ZBX_SOURCES_DIR}/src/go/conf/zabbix_web_service.conf ${ZBX_OUTPUT_DIR}/web_service/conf/ && \
-    cp ${ZBX_SOURCES_DIR}/src/zabbix_get/zabbix_get ${ZBX_OUTPUT_DIR}/general/bin/ && \
-    cp ${ZBX_SOURCES_DIR}/src/zabbix_sender/zabbix_sender ${ZBX_OUTPUT_DIR}/general/bin/ && \
-    make -s distclean && \
-    cd /tmp/ && \
-    mkdir -p ${ZBX_OUTPUT_DIR}/agent2/sbin/zabbix-agent2-plugin/ && \
-    mkdir -p ${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d/ && \
-    git -c advice.detachedHead=false clone ${MONGODB_PLUGIN_SOURCES} --branch ${MONGODB_PLUGIN_VERSION} --depth 1 --single-branch /tmp/mongodb-plugin-${MONGODB_PLUGIN_VERSION} && \
-    cd /tmp/mongodb-plugin-${MONGODB_PLUGIN_VERSION} && \
-    make && \
-    strip /tmp/mongodb-plugin-${MONGODB_PLUGIN_VERSION}/zabbix-agent2-plugin-mongodb && \
-    cp /tmp/mongodb-plugin-${MONGODB_PLUGIN_VERSION}/zabbix-agent2-plugin-mongodb ${ZBX_OUTPUT_DIR}/agent2/sbin/zabbix-agent2-plugin/mongodb && \
-    cp /tmp/mongodb-plugin-${MONGODB_PLUGIN_VERSION}/mongodb.conf ${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d/ && \
-    cd /tmp/ && \
-    git -c advice.detachedHead=false clone ${POSTGRESQL_PLUGIN_SOURCES} --branch ${POSTGRESQL_PLUGIN_VERSION} --depth 1 --single-branch /tmp/postgresql-plugin-${POSTGRESQL_PLUGIN_VERSION} && \
-    cd /tmp/postgresql-plugin-${POSTGRESQL_PLUGIN_VERSION} && \
-    make && \
-    strip /tmp/postgresql-plugin-${POSTGRESQL_PLUGIN_VERSION}/zabbix-agent2-plugin-postgresql && \
-    cp /tmp/postgresql-plugin-${POSTGRESQL_PLUGIN_VERSION}/zabbix-agent2-plugin-postgresql ${ZBX_OUTPUT_DIR}/agent2/sbin/zabbix-agent2-plugin/postgresql && \
-    cp /tmp/postgresql-plugin-${POSTGRESQL_PLUGIN_VERSION}/postgresql.conf ${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d/ && \
-    cd /tmp/ && \
-    git -c advice.detachedHead=false clone ${MSSQL_PLUGIN_SOURCES} --branch ${MSSQL_PLUGIN_VERSION} --depth 1 --single-branch /tmp/mssql-plugin-${MSSQL_PLUGIN_VERSION} && \
-    cd /tmp/mssql-plugin-${MSSQL_PLUGIN_VERSION} && \
-    make && \
-    strip /tmp/mssql-plugin-${MSSQL_PLUGIN_VERSION}/zabbix-agent2-plugin-mssql && \
-    cp /tmp/mssql-plugin-${MSSQL_PLUGIN_VERSION}/zabbix-agent2-plugin-mssql ${ZBX_OUTPUT_DIR}/agent2/sbin/zabbix-agent2-plugin/mssql && \
-    cp /tmp/mssql-plugin-${MSSQL_PLUGIN_VERSION}/mssql.conf ${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d/ && \
-    cd /tmp/ && \
-    git -c advice.detachedHead=false clone ${EMBER_PLUS_PLUGIN_SOURCES} --branch ${EMBER_PLUS_PLUGIN_VERSION} --depth 1 --single-branch /tmp/ember-plugin-${EMBER_PLUS_PLUGIN_VERSION} && \
-    cd /tmp/ember-plugin-${EMBER_PLUS_PLUGIN_VERSION} && \
-    make && \
-    strip /tmp/ember-plugin-${EMBER_PLUS_PLUGIN_VERSION}/zabbix-agent2-plugin-ember-plus && \
-    cp /tmp/ember-plugin-${EMBER_PLUS_PLUGIN_VERSION}/zabbix-agent2-plugin-ember-plus ${ZBX_OUTPUT_DIR}/agent2/sbin/zabbix-agent2-plugin/ember-plus && \
-    cp /tmp/ember-plugin-${EMBER_PLUS_PLUGIN_VERSION}/ember.conf ${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d/
diff --git a/Dockerfiles/build-pgsql/rhel/patches/chromedp_no_sandbox.patch b/Dockerfiles/build-pgsql/rhel/patches/chromedp_no_sandbox.patch
deleted file mode 100644
index c8a2e162c..000000000
--- a/Dockerfiles/build-pgsql/rhel/patches/chromedp_no_sandbox.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/go/cmd/zabbix_web_service/pdf_report_creator.go b/src/go/cmd/zabbix_web_service/pdf_report_creator.go
-index afab41204d1..f1a9b859f34 100644
---- a/src/go/cmd/zabbix_web_service/pdf_report_creator.go
-+++ b/src/go/cmd/zabbix_web_service/pdf_report_creator.go
-@@ -100,7 +100,11 @@ func (h *handler) report(w http.ResponseWriter, r *http.Request) {
- 		return
- 	}
- 
--	opts := chromedp.DefaultExecAllocatorOptions[:]
-+	opts := append(chromedp.DefaultExecAllocatorOptions[:],
-+                chromedp.DisableGPU,
-+                chromedp.NoSandbox,
-+                chromedp.Flag("disable-setuid-sandbox", true),
-+        )
- 
- 	if options.IgnoreURLCertErrors == 1 {
- 		opts = append(opts, chromedp.Flag("ignore-certificate-errors", "1"))
diff --git a/Dockerfiles/build-pgsql/ubuntu/patches/.gitkeep b/Dockerfiles/build-pgsql/ubuntu/patches/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/Dockerfiles/build-pgsql/ubuntu/patches/chromedp_no_sandbox.patch b/Dockerfiles/build-pgsql/ubuntu/patches/chromedp_no_sandbox.patch
deleted file mode 100644
index c8a2e162c..000000000
--- a/Dockerfiles/build-pgsql/ubuntu/patches/chromedp_no_sandbox.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/go/cmd/zabbix_web_service/pdf_report_creator.go b/src/go/cmd/zabbix_web_service/pdf_report_creator.go
-index afab41204d1..f1a9b859f34 100644
---- a/src/go/cmd/zabbix_web_service/pdf_report_creator.go
-+++ b/src/go/cmd/zabbix_web_service/pdf_report_creator.go
-@@ -100,7 +100,11 @@ func (h *handler) report(w http.ResponseWriter, r *http.Request) {
- 		return
- 	}
- 
--	opts := chromedp.DefaultExecAllocatorOptions[:]
-+	opts := append(chromedp.DefaultExecAllocatorOptions[:],
-+                chromedp.DisableGPU,
-+                chromedp.NoSandbox,
-+                chromedp.Flag("disable-setuid-sandbox", true),
-+        )
- 
- 	if options.IgnoreURLCertErrors == 1 {
- 		opts = append(opts, chromedp.Flag("ignore-certificate-errors", "1"))
diff --git a/Dockerfiles/server-pgsql/rhel/Dockerfile b/Dockerfiles/server-pgsql/rhel/Dockerfile
deleted file mode 100644
index 75c18285c..000000000
--- a/Dockerfiles/server-pgsql/rhel/Dockerfile
+++ /dev/null
@@ -1,177 +0,0 @@
-# syntax=docker/dockerfile:1
-ARG MAJOR_VERSION=7.0
-ARG RELEASE=7
-ARG ZBX_VERSION=${MAJOR_VERSION}.7
-ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:rhel-${ZBX_VERSION}
-
-FROM ${BUILD_BASE_IMAGE} AS builder
-
-FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5
-
-ARG MAJOR_VERSION
-ARG RELEASE
-ARG ZBX_VERSION
-ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
-
-ENV TERM=xterm \
-    ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
-    MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \
-    NMAP_PRIVILEGED="" \
-    ZABBIX_USER_HOME_DIR="/var/lib/zabbix" \
-    ZABBIX_CONF_DIR="/etc/zabbix" \
-    ZBX_FPINGLOCATION="/usr/sbin/fping"
-
-LABEL description="Zabbix server with PostgreSQL database support" \
-      maintainer="alexey.pustovalov@zabbix.com" \
-      name="zabbix/zabbix-server-pgsql-70" \
-      release="${RELEASE}" \
-      run="docker run --name zabbix-server --link postgresql:pgsql-server -p 10051:10051 -d registry.connect.redhat.com/zabbix/zabbix-server-pgsql-70:${ZBX_VERSION}" \
-      summary="Zabbix server (PostgreSQL)" \
-      url="https://www.zabbix.com/" \
-      vendor="Zabbix SIA" \
-      version="${MAJOR_VERSION}" \
-      io.k8s.description="Zabbix server with PostgreSQL database support" \
-      io.k8s.display-name="Zabbix server (PostgreSQL)" \
-      io.openshift.expose-services="10051:10051" \
-      io.openshift.tags="zabbix,zabbix-server,pgsql" \
-      org.label-schema.build-date="${BUILD_DATE}" \
-      org.label-schema.description="Zabbix server with PostgreSQL database support" \
-      org.label-schema.docker.cmd="docker run --name zabbix-server --link postgresql:pgsql-server -p 10051:10051 -d registry.connect.redhat.com/zabbix/zabbix-server-pgsql-70:${ZBX_VERSION}" \
-      org.label-schema.license="AGPL v3.0" \
-      org.label-schema.name="zabbix-server-pgsql-rhel" \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.url="https://zabbix.com/" \
-      org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
-      org.label-schema.vcs-ref="${VCS_REF}" \
-      org.label-schema.vcs-url="${ZBX_SOURCES}" \
-      org.label-schema.vendor="Zabbix SIA" \
-      org.label-schema.version="${ZBX_VERSION}"
-
-STOPSIGNAL SIGTERM
-
-COPY ["licenses", "/licenses"]
-COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/server/sbin/zabbix_server", "/usr/sbin/zabbix_server"]
-COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/general/bin/*", "/usr/bin/"]
-COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/server/conf/", "${ZABBIX_CONF_DIR}/"]
-COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/server/database/postgresql/", "/usr/share/doc/zabbix-server-postgresql/"]
-
-RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
-    --mount=type=tmpfs,target=/var/cache/yum/ \
-    --mount=type=bind,target=/run/secrets/,src=secrets/ \
-    set -eux && \
-    INSTALL_PKGS="bash \
-            traceroute \
-            nmap \
-            fping \
-            shadow-utils \
-            iputils \
-            hostname \
-            libssh \
-            libpsl \
-            libbrotli \
-            libevent \
-            openldap \
-            libssh \
-            libxml2 \
-            net-snmp-agent-libs \
-            OpenIPMI-libs \
-            pcre2 \
-            postgresql \
-            postgresql-private-libs \
-            gzip \
-            unixODBC \
-            zlib" && \
-    curl --tlsv1.2 -sSf -L https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm -o /tmp/epel-release-latest-9.noarch.rpm && \
-    rpm -ivh /tmp/epel-release-latest-9.noarch.rpm && \
-    rm -rf /tmp/epel-release-latest-9.noarch.rpm && \
-    ARCH_SUFFIX="$(arch)"; \
-    microdnf -y module enable \
-        --disablerepo "*" \
-        --enablerepo "rhel-9-for-$ARCH_SUFFIX-appstream-rpms" \
-        --setopt=install_weak_deps=0 \
-        --setopt=keepcache=0 \
-        postgresql:16 && \
-    microdnf -y install \
-            --disablerepo "*" \
-            --enablerepo "ubi-9-baseos-rpms" \
-            --enablerepo "ubi-9-appstream-rpms" \
-            --enablerepo "rhel-9-for-$ARCH_SUFFIX-baseos-rpms" \
-            --enablerepo "rhel-9-for-$ARCH_SUFFIX-appstream-rpms" \
-            --enablerepo "codeready-builder-for-rhel-9-$ARCH_SUFFIX-rpms" \
-            --enablerepo "epel" \
-            --setopt=install_weak_deps=0 \
-            --setopt=keepcache=0 \
-            --best \
-            --setopt=tsflags=nodocs \
-        ${INSTALL_PKGS} && \
-    microdnf -y update \
-            --disableplugin=subscription-manager \
-            --disablerepo "*" \
-            --enablerepo "ubi-9-baseos-rpms" \
-            --setopt=install_weak_deps=0 \
-            --best \
-            --setopt=tsflags=nodocs \
-        tzdata && \
-    microdnf -y reinstall \
-            --disableplugin=subscription-manager \
-            --disablerepo "*" \
-            --enablerepo "ubi-9-baseos-rpms" \
-            --setopt=install_weak_deps=0 \
-            --setopt=keepcache=0 \
-            --best \
-            --setopt=tsflags=nodocs \
-        tzdata && \
-    microdnf download libcurl && \
-    rpm -Uvh --nodeps --replacefiles "*curl*$( uname -i ).rpm" && \
-    microdnf remove -y libcurl-minimal && \
-    rm -rf "*curl*$( uname -i ).rpm" && \
-    groupadd \
-            --system \
-            --gid 1995 \
-        zabbix && \
-    useradd \
-            --system \
-            --comment "Zabbix monitoring system" \
-            -g zabbix \
-            -G dialout \
-            --uid 1997 \
-            --shell /sbin/nologin \
-            --home-dir ${ZABBIX_USER_HOME_DIR} \
-        zabbix && \
-    chgrp zabbix /usr/bin/nmap && \
-    setcap cap_net_raw+eip /usr/bin/nmap && \
-    mkdir -p ${ZABBIX_CONF_DIR} && \
-    mkdir -p ${ZABBIX_USER_HOME_DIR} && \
-    mkdir -p ${ZABBIX_USER_HOME_DIR}/dbscripts && \
-    mkdir -p ${ZABBIX_USER_HOME_DIR}/enc && \
-    mkdir -p ${ZABBIX_USER_HOME_DIR}/enc_internal && \
-    mkdir -p ${ZABBIX_USER_HOME_DIR}/export && \
-    mkdir -p ${ZABBIX_USER_HOME_DIR}/mibs && \
-    mkdir -p ${ZABBIX_USER_HOME_DIR}/modules && \
-    mkdir -p ${ZABBIX_USER_HOME_DIR}/snmptraps && \
-    mkdir -p ${ZABBIX_USER_HOME_DIR}/ssh_keys && \
-    mkdir -p ${ZABBIX_USER_HOME_DIR}/ssl && \
-    mkdir -p ${ZABBIX_USER_HOME_DIR}/ssl/certs && \
-    mkdir -p ${ZABBIX_USER_HOME_DIR}/ssl/keys && \
-    mkdir -p ${ZABBIX_USER_HOME_DIR}/ssl/ssl_ca && \
-    mkdir -p /usr/lib/zabbix/alertscripts && \
-    mkdir -p /usr/lib/zabbix/externalscripts && \
-    mkdir -p /usr/share/doc/zabbix-server-postgresql && \
-    chown --quiet -R zabbix:root ${ZABBIX_CONF_DIR}/ ${ZABBIX_USER_HOME_DIR}/ && \
-    chgrp -R 0 ${ZABBIX_CONF_DIR}/ ${ZABBIX_USER_HOME_DIR}/ && \
-    chmod -R g=u ${ZABBIX_CONF_DIR}/ ${ZABBIX_USER_HOME_DIR}/ && \
-    /usr/sbin/zabbix_server -V
-
-EXPOSE 10051/TCP
-
-WORKDIR ${ZABBIX_USER_HOME_DIR}
-
-VOLUME ["${ZABBIX_USER_HOME_DIR}/snmptraps", "${ZABBIX_USER_HOME_DIR}/export"]
-
-COPY ["docker-entrypoint.sh", "/usr/bin/"]
-
-ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"]
-
-USER 1997
-
-CMD ["/usr/sbin/zabbix_server", "--foreground", "-c", "/etc/zabbix/zabbix_server.conf"]