diff --git a/agent2/ol/Dockerfile b/agent2/ol/Dockerfile
index 445d81fc9..f389a1f2b 100644
--- a/agent2/ol/Dockerfile
+++ b/agent2/ol/Dockerfile
@@ -84,6 +84,8 @@ RUN set -eux && REPOLIST="ol8_baseos_latest,ol8_appstream" && \
             gcc" && \
     microdnf -y install --setopt=install_weak_deps=0 --best \
         --nodocs dnf && \
+    mkdir -p /etc/yum/vars/ && \
+    echo "" > /etc/yum/vars/ociregion && \
     dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \
         --setopt=tsflags=nodocs ${INSTALL_PKGS} && \
     cd /tmp/ && \
@@ -118,6 +120,7 @@ RUN set -eux && REPOLIST="ol8_baseos_latest,ol8_appstream" && \
     dnf -y history undo last && \
     dnf -y clean all && \
     microdnf -y remove dnf && \
+    rm -rf /etc/yum/ && \
     chown --quiet -R zabbix:root /etc/zabbix/ /var/lib/zabbix/ && \
     chgrp -R 0 /etc/zabbix/ /var/lib/zabbix/ && \
     chmod -R g=u /etc/zabbix/ /var/lib/zabbix/ && \
diff --git a/java-gateway/ol/Dockerfile b/java-gateway/ol/Dockerfile
index 9d06765c6..d9dae2364 100644
--- a/java-gateway/ol/Dockerfile
+++ b/java-gateway/ol/Dockerfile
@@ -50,6 +50,8 @@ RUN set -eux && REPOLIST="ol8_baseos_latest,ol8_appstream" && \
             gcc" && \
     microdnf -y install --setopt=install_weak_deps=0 --best \
         --nodocs dnf && \
+    mkdir -p /etc/yum/vars/ && \
+    echo "" > /etc/yum/vars/ociregion && \
     dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \
         --setopt=tsflags=nodocs ${INSTALL_PKGS} && \
     cd /tmp/ && \
@@ -76,6 +78,7 @@ RUN set -eux && REPOLIST="ol8_baseos_latest,ol8_appstream" && \
     dnf -y history undo last && \
     dnf -y clean all && \
     microdnf -y remove dnf && \
+    rm -rf /etc/yum/ && \
     chown --quiet -R zabbix:root /etc/zabbix/ /usr/sbin/zabbix_java/ && \
     chgrp -R 0 /etc/zabbix/ /usr/sbin/zabbix_java/ && \
     chmod -R g=u /etc/zabbix/ /usr/sbin/zabbix_java/ && \
diff --git a/proxy-mysql/ol/Dockerfile b/proxy-mysql/ol/Dockerfile
index a11db6fd2..a58e5db1c 100644
--- a/proxy-mysql/ol/Dockerfile
+++ b/proxy-mysql/ol/Dockerfile
@@ -111,6 +111,8 @@ RUN set -eux && \
             unixODBC-devel" && \
     microdnf -y install --setopt=install_weak_deps=0 --best \
         --nodocs dnf && \
+    mkdir -p /etc/yum/vars/ && \
+    echo "" > /etc/yum/vars/ociregion && \
     dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \
         --setopt=tsflags=nodocs ${INSTALL_PKGS} && \
     cd /tmp/ && \
@@ -155,6 +157,7 @@ RUN set -eux && \
     dnf -y history undo last && \
     dnf -y clean all && \
     microdnf -y remove dnf && \
+    rm -rf /etc/yum/ && \
     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
 
diff --git a/proxy-sqlite3/ol/Dockerfile b/proxy-sqlite3/ol/Dockerfile
index 29b7ee5e9..1d68ead68 100644
--- a/proxy-sqlite3/ol/Dockerfile
+++ b/proxy-sqlite3/ol/Dockerfile
@@ -108,6 +108,8 @@ RUN set -eux && \
             unixODBC-devel" && \
     microdnf -y install --setopt=install_weak_deps=0 --best \
         --nodocs dnf && \
+    mkdir -p /etc/yum/vars/ && \
+    echo "" > /etc/yum/vars/ociregion && \
     dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \
         --setopt=tsflags=nodocs ${INSTALL_PKGS} && \
     cd /tmp/ && \
@@ -152,6 +154,7 @@ RUN set -eux && \
     dnf -y history undo last && \
     dnf -y clean all && \
     microdnf -y remove dnf && \
+    rm -rf /etc/yum/ && \
     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
 
diff --git a/server-mysql/ol/Dockerfile b/server-mysql/ol/Dockerfile
index 22c7770f3..786acc8da 100644
--- a/server-mysql/ol/Dockerfile
+++ b/server-mysql/ol/Dockerfile
@@ -116,6 +116,8 @@ RUN set -eux && \
             unixODBC-devel" && \
     microdnf -y install --setopt=install_weak_deps=0 --best \
         --nodocs dnf && \
+    mkdir -p /etc/yum/vars/ && \
+    echo "" > /etc/yum/vars/ociregion && \
     dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \
         --setopt=tsflags=nodocs ${INSTALL_PKGS} && \
     cd /tmp/ && \
@@ -162,6 +164,7 @@ RUN set -eux && \
     dnf -y history undo last && \
     dnf -y clean all && \
     microdnf -y remove dnf && \
+    rm -rf /etc/yum/ && \
     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
 
diff --git a/server-pgsql/ol/Dockerfile b/server-pgsql/ol/Dockerfile
index 4fed52e08..ed5957ad1 100644
--- a/server-pgsql/ol/Dockerfile
+++ b/server-pgsql/ol/Dockerfile
@@ -114,6 +114,8 @@ RUN set -eux && \
             unixODBC-devel" && \
     microdnf -y install --setopt=install_weak_deps=0 --best \
         --nodocs dnf && \
+    mkdir -p /etc/yum/vars/ && \
+    echo "" > /etc/yum/vars/ociregion && \
     dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \
         --setopt=tsflags=nodocs ${INSTALL_PKGS} && \
     cd /tmp/ && \
@@ -161,6 +163,7 @@ RUN set -eux && \
     dnf -y history undo last && \
     dnf -y clean all && \
     microdnf -y remove dnf && \
+    rm -rf /etc/yum/ && \
     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
 
diff --git a/web-apache-mysql/ol/Dockerfile b/web-apache-mysql/ol/Dockerfile
index 966b8ad00..052da052d 100644
--- a/web-apache-mysql/ol/Dockerfile
+++ b/web-apache-mysql/ol/Dockerfile
@@ -74,6 +74,8 @@ RUN set -eux && \
             git" && \
     microdnf -y install --setopt=install_weak_deps=0 --best \
         --nodocs dnf && \
+    mkdir -p /etc/yum/vars/ && \
+    echo "" > /etc/yum/vars/ociregion && \
     dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \
         --setopt=tsflags=nodocs ${INSTALL_PKGS} && \
     cd /usr/share/ && \
@@ -106,6 +108,7 @@ RUN set -eux && \
     dnf -y history undo last && \
     dnf -y clean all && \
     microdnf -y remove dnf && \
+    rm -rf /etc/yum/ && \
     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
 
diff --git a/web-apache-pgsql/ol/Dockerfile b/web-apache-pgsql/ol/Dockerfile
index b92071974..939c53f82 100644
--- a/web-apache-pgsql/ol/Dockerfile
+++ b/web-apache-pgsql/ol/Dockerfile
@@ -73,6 +73,8 @@ RUN set -eux && \
             git" && \
     microdnf -y install --setopt=install_weak_deps=0 --best \
         --nodocs dnf && \
+    mkdir -p /etc/yum/vars/ && \
+    echo "" > /etc/yum/vars/ociregion && \
     dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \
         --setopt=tsflags=nodocs ${INSTALL_PKGS} && \
     cd /usr/share/ && \
@@ -105,6 +107,7 @@ RUN set -eux && \
     dnf -y history undo last && \
     dnf -y clean all && \
     microdnf -y remove dnf && \
+    rm -rf /etc/yum/ && \
     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
 
diff --git a/web-nginx-mysql/ol/Dockerfile b/web-nginx-mysql/ol/Dockerfile
index ae33f2a8c..a9d1f1f16 100644
--- a/web-nginx-mysql/ol/Dockerfile
+++ b/web-nginx-mysql/ol/Dockerfile
@@ -66,6 +66,8 @@ RUN set -eux && \
             git" && \
     microdnf -y install --setopt=install_weak_deps=0 --best \
         --nodocs dnf && \
+    mkdir -p /etc/yum/vars/ && \
+    echo "" > /etc/yum/vars/ociregion && \
     dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \
         --setopt=tsflags=nodocs ${INSTALL_PKGS} && \
     cd /usr/share/ && \
@@ -98,6 +100,7 @@ RUN set -eux && \
     dnf -y history undo last && \
     dnf -y clean all && \
     microdnf -y remove dnf && \
+    rm -rf /etc/yum/ && \
     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
 
diff --git a/web-nginx-pgsql/ol/Dockerfile b/web-nginx-pgsql/ol/Dockerfile
index 3e8022d6f..c7531bc75 100644
--- a/web-nginx-pgsql/ol/Dockerfile
+++ b/web-nginx-pgsql/ol/Dockerfile
@@ -65,6 +65,8 @@ RUN set -eux && \
             git" && \
     microdnf -y install --setopt=install_weak_deps=0 --best \
         --nodocs dnf && \
+    mkdir -p /etc/yum/vars/ && \
+    echo "" > /etc/yum/vars/ociregion && \
     dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \
         --setopt=tsflags=nodocs ${INSTALL_PKGS} && \
     cd /usr/share/ && \
@@ -97,6 +99,7 @@ RUN set -eux && \
     dnf -y history undo last && \
     dnf -y clean all && \
     microdnf -y remove dnf && \
+    rm -rf /etc/yum/ && \
     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