diff --git a/agent/rhel/Dockerfile b/agent/rhel/Dockerfile
index cc1c6e91c..f60656bad 100644
--- a/agent/rhel/Dockerfile
+++ b/agent/rhel/Dockerfile
@@ -44,9 +44,9 @@ RUN set -eux && INSTALL_PKGS="bash \
             iputils \
             pcre \
             libcurl" && \
-    REPOLIST="rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstream-rpms" && \
-    dnf -y update-minimal --disablerepo "*" --enablerepo ubi-8-baseos --setopt=tsflags=nodocs \
-        --security --sec-severity=Important --sec-severity=Critical && \
+    REPOLIST="ubi-8-baseos,ubi-8-appstream" && \
+    dnf -y update-minimal --disablerepo "*" --enablerepo "ubi-8-baseos" --setopt=tsflags=nodocs \
+        --security --sec-severity=Important --setopt=install_weak_deps=False --sec-severity=Critical && \
     dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \
         --setopt=tsflags=nodocs ${INSTALL_PKGS} && \
     groupadd --system --gid 1995 zabbix && \
@@ -80,7 +80,7 @@ RUN set -eux && INSTALL_PKGS="bash \
     rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \
     rm -rf /var/cache/dnf /etc/udev/hwdb.bin /root/.pki
 
-RUN set -eux && REPOLIST="rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstream-rpms" && \
+RUN set -eux && REPOLIST="ubi-8-baseos,ubi-8-appstream" && \
     INSTALL_PKGS="autoconf \
             automake \
             libcurl-devel \
diff --git a/agent2/rhel/Dockerfile b/agent2/rhel/Dockerfile
index 2753fc5c9..93827180e 100644
--- a/agent2/rhel/Dockerfile
+++ b/agent2/rhel/Dockerfile
@@ -44,9 +44,9 @@ RUN set -eux && INSTALL_PKGS="bash \
             iputils \
             pcre \
             libcurl" && \
-    REPOLIST="rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstream-rpms" && \
-    dnf -y update-minimal --disablerepo "*" --enablerepo ubi-8-baseos --setopt=tsflags=nodocs \
-        --security --sec-severity=Important --sec-severity=Critical && \
+    REPOLIST="ubi-8-baseos,ubi-8-appstream" && \
+    dnf -y update-minimal --disablerepo "*" --enablerepo "ubi-8-baseos" --setopt=tsflags=nodocs \
+        --security --sec-severity=Important --setopt=install_weak_deps=False --sec-severity=Critical && \
     dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \
         --setopt=tsflags=nodocs ${INSTALL_PKGS} && \
     groupadd --system --gid 1995 zabbix && \
@@ -81,7 +81,7 @@ RUN set -eux && INSTALL_PKGS="bash \
     rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \
     rm -rf /var/cache/dnf /etc/udev/hwdb.bin /root/.pki
 
-RUN set -eux && REPOLIST="rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstream-rpms" && \
+RUN set -eux && REPOLIST="ubi-8-baseos,ubi-8-appstream" && \
     INSTALL_PKGS="autoconf \
             automake \
             libcurl-devel \
diff --git a/java-gateway/rhel/Dockerfile b/java-gateway/rhel/Dockerfile
index 1ec5ca3cf..59d6b4aab 100644
--- a/java-gateway/rhel/Dockerfile
+++ b/java-gateway/rhel/Dockerfile
@@ -40,9 +40,9 @@ COPY ["licenses", "/licenses"]
 
 RUN set -eux && INSTALL_PKGS="bash \
             java-1.8.0-openjdk-headless" && \
-    REPOLIST="rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstream-rpms" && \
-    dnf -y update-minimal --disablerepo "*" --enablerepo ubi-8-baseos --setopt=tsflags=nodocs \
-        --security --sec-severity=Important --sec-severity=Critical && \
+    REPOLIST="ubi-8-baseos,ubi-8-appstream" && \
+    dnf -y update-minimal --disablerepo "*" --enablerepo "ubi-8-baseos" --setopt=tsflags=nodocs \
+        --security --sec-severity=Important --setopt=install_weak_deps=False --sec-severity=Critical && \
     dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \
         --setopt=tsflags=nodocs ${INSTALL_PKGS} && \
     groupadd --system --gid 1995 zabbix && \
@@ -69,7 +69,7 @@ RUN set -eux && INSTALL_PKGS="autoconf \
             gcc \
             make \
             java-1.8.0-openjdk-devel" && \
-    REPOLIST="rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstream-rpms" && \
+    REPOLIST="ubi-8-baseos,ubi-8-appstream" && \
     dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \
         --setopt=tsflags=nodocs ${INSTALL_PKGS} && \
     cd /tmp/ && \
diff --git a/proxy-mysql/rhel/Dockerfile b/proxy-mysql/rhel/Dockerfile
index 25296b0d7..83a84167d 100644
--- a/proxy-mysql/rhel/Dockerfile
+++ b/proxy-mysql/rhel/Dockerfile
@@ -54,9 +54,9 @@ RUN set -eux && INSTALL_PKGS="bash \
             OpenIPMI-libs \
             pcre \
             unixODBC" && \
-    REPOLIST="rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstream-rpms,epel" && \
-    dnf -y update-minimal --disablerepo "*" --enablerepo ubi-8-baseos --setopt=tsflags=nodocs \
-        --security --sec-severity=Important --sec-severity=Critical && \
+    REPOLIST="ubi-8-baseos,ubi-8-appstream,rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstream-rpms,epel" && \
+    dnf -y update-minimal --disablerepo "*" --enablerepo "ubi-8-baseos" --setopt=tsflags=nodocs \
+        --security --sec-severity=Important --setopt=install_weak_deps=False --sec-severity=Critical && \
     dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \
     dnf -y module enable mysql && \
     dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \
@@ -115,7 +115,7 @@ RUN set -eux && INSTALL_PKGS="autoconf \
             gcc \
             make \
             unixODBC-devel" && \
-    REPOLIST="rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstream-rpms,codeready-builder-for-rhel-8-x86_64-rpms" && \
+    REPOLIST="ubi-8-baseos,ubi-8-appstream,rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstream-rpms,codeready-builder-for-rhel-8-x86_64-rpms" && \
     dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \
         --setopt=tsflags=nodocs ${INSTALL_PKGS} && \
     cd /tmp/ && \
diff --git a/proxy-sqlite3/rhel/Dockerfile b/proxy-sqlite3/rhel/Dockerfile
index 63952f13e..b51f2e4dc 100644
--- a/proxy-sqlite3/rhel/Dockerfile
+++ b/proxy-sqlite3/rhel/Dockerfile
@@ -53,9 +53,9 @@ RUN set -eux && INSTALL_PKGS="bash \
             pcre \
             sqlite-libs \
             unixODBC" && \
-    REPOLIST="rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstream-rpms,epel" && \
-    dnf -y update-minimal --disablerepo "*" --enablerepo ubi-8-baseos --setopt=tsflags=nodocs \
-        --security --sec-severity=Important --sec-severity=Critical && \
+    REPOLIST="ubi-8-baseos,ubi-8-appstream,rhel-8-for-x86_64-baseos-rpms,epel" && \
+    dnf -y update-minimal --disablerepo "*" --enablerepo "ubi-8-baseos" --setopt=tsflags=nodocs \
+        --security --sec-severity=Important --setopt=install_weak_deps=False --sec-severity=Critical && \
     dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \
     dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \
         --setopt=tsflags=nodocs ${INSTALL_PKGS} && \
@@ -113,7 +113,7 @@ RUN set -eux && INSTALL_PKGS="autoconf \
             gcc \
             make \
             unixODBC-devel" && \
-    REPOLIST="rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstream-rpms,codeready-builder-for-rhel-8-x86_64-rpms" && \
+    REPOLIST="ubi-8-baseos,ubi-8-appstream,rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstream-rpms,codeready-builder-for-rhel-8-x86_64-rpms" && \
     dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \
         --setopt=tsflags=nodocs ${INSTALL_PKGS} && \
     cd /tmp/ && \
diff --git a/server-mysql/rhel/Dockerfile b/server-mysql/rhel/Dockerfile
index 91091e414..ce7a4aabc 100644
--- a/server-mysql/rhel/Dockerfile
+++ b/server-mysql/rhel/Dockerfile
@@ -55,9 +55,9 @@ RUN set -eux && INSTALL_PKGS="bash \
             OpenIPMI-libs \
             pcre \
             unixODBC" && \
-    REPOLIST="rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstream-rpms,epel" && \
-    dnf -y update-minimal --disablerepo "*" --enablerepo ubi-8-baseos --setopt=tsflags=nodocs \
-        --security --sec-severity=Important --sec-severity=Critical && \
+    REPOLIST="ubi-8-baseos,ubi-8-appstream,rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstream-rpms,epel" && \
+    dnf -y update-minimal --disablerepo "*" --enablerepo "ubi-8-baseos" --setopt=tsflags=nodocs \
+        --security --sec-severity=Important --setopt=install_weak_deps=False --sec-severity=Critical && \
     dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \
     dnf -y module enable mysql && \
     dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \
@@ -117,7 +117,7 @@ RUN set -eux && INSTALL_PKGS="autoconf \
             gcc \
             make \
             unixODBC-devel" && \
-    REPOLIST="rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstream-rpms,codeready-builder-for-rhel-8-x86_64-rpms" && \
+    REPOLIST="ubi-8-baseos,ubi-8-appstream,rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstream-rpms,codeready-builder-for-rhel-8-x86_64-rpms" && \
     dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \
         --setopt=tsflags=nodocs ${INSTALL_PKGS} && \
     cd /tmp/ && \
diff --git a/web-nginx-mysql/rhel/Dockerfile b/web-nginx-mysql/rhel/Dockerfile
index ff4522d5d..0a69187b7 100644
--- a/web-nginx-mysql/rhel/Dockerfile
+++ b/web-nginx-mysql/rhel/Dockerfile
@@ -53,9 +53,9 @@ RUN set -eux && INSTALL_PKGS="bash \
             php-mbstring \
             php-mysqlnd \
             php-xml" && \
-    REPOLIST="rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstream-rpms,epel" && \
-    dnf -y update-minimal --disablerepo "*" --enablerepo ubi-8-baseos --setopt=tsflags=nodocs \
-        --security --sec-severity=Important --sec-severity=Critical && \
+    REPOLIST="ubi-8-baseos,ubi-8-appstream,rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstream-rpms,epel" && \
+    dnf -y update-minimal --disablerepo "*" --enablerepo "ubi-8-baseos" --setopt=tsflags=nodocs \
+        --security --sec-severity=Important --setopt=install_weak_deps=False --sec-severity=Critical && \
     dnf -y module enable mysql && \
     dnf -y module enable php:7.4 nginx:1.18 && \
     dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \
@@ -81,7 +81,7 @@ RUN set -eux && INSTALL_PKGS="bash \
 
 COPY ["conf/etc/", "/etc/"]
 
-RUN set -eux && REPOLIST="rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstream-rpms" && \
+RUN set -eux && REPOLIST="ubi-8-baseos,ubi-8-appstream,rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstream-rpms" && \
     INSTALL_PKGS="glibc-locale-source gettext \
             git" && \
     dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \