diff --git a/agent/ol/Dockerfile b/agent/ol/Dockerfile
index 4d821d38e..04d4edc16 100644
--- a/agent/ol/Dockerfile
+++ b/agent/ol/Dockerfile
@@ -25,9 +25,6 @@ RUN set -eux && \
     mkdir -p /var/lib/zabbix && \
     mkdir -p /var/lib/zabbix/enc && \
     mkdir -p /var/lib/zabbix/modules && \
-    mkdir -p /etc/yum/vars/ && \
-    echo "" > /etc/yum/vars/ociregion && \
-    echo "oracle.com" > /etc/yum/vars/ocidomain && \
     INSTALL_PKGS="bash \
             tini \
             tzdata \
diff --git a/agent2/ol/Dockerfile b/agent2/ol/Dockerfile
index 57c5b050c..5e156144f 100644
--- a/agent2/ol/Dockerfile
+++ b/agent2/ol/Dockerfile
@@ -26,9 +26,6 @@ RUN set -eux && \
     mkdir -p /var/lib/zabbix/enc && \
     mkdir -p /var/lib/zabbix/modules && \
     mkdir -p /var/lib/zabbix/buffer && \
-    mkdir -p /etc/yum/vars/ && \
-    echo "" > /etc/yum/vars/ociregion && \
-    echo "oracle.com" > /etc/yum/vars/ocidomain && \
     INSTALL_PKGS="bash \
             tini \
             tzdata \
diff --git a/java-gateway/ol/Dockerfile b/java-gateway/ol/Dockerfile
index f38169174..7f77bd32e 100644
--- a/java-gateway/ol/Dockerfile
+++ b/java-gateway/ol/Dockerfile
@@ -21,9 +21,6 @@ RUN set -eux && \
     mkdir -p /etc/zabbix/ && \
     mkdir -p /usr/sbin/zabbix_java/ && \
     mkdir -p /usr/sbin/zabbix_java/ext_lib/ && \
-    mkdir -p /etc/yum/vars/ && \
-    echo "" > /etc/yum/vars/ociregion && \
-    echo "oracle.com" > /etc/yum/vars/ocidomain && \
     INSTALL_PKGS="java-1.8.0-openjdk-headless \
             findutils" && \
     microdnf -y --disablerepo="*" --enablerepo="ol8_baseos_latest" \
diff --git a/proxy-mysql/ol/Dockerfile b/proxy-mysql/ol/Dockerfile
index 7fcaeccfb..1958dddfd 100644
--- a/proxy-mysql/ol/Dockerfile
+++ b/proxy-mysql/ol/Dockerfile
@@ -33,9 +33,6 @@ RUN set -eux && \
     mkdir -p /var/lib/zabbix/ssl/ssl_ca && \
     mkdir -p /usr/lib/zabbix/externalscripts && \
     mkdir -p /usr/share/doc/zabbix-proxy-mysql && \
-    mkdir -p /etc/yum/vars/ && \
-    echo "" > /etc/yum/vars/ociregion && \
-    echo "oracle.com" > /etc/yum/vars/ocidomain && \
     microdnf -y module enable mysql && \
     INSTALL_PKGS="libevent \
             tini \
diff --git a/proxy-sqlite3/ol/Dockerfile b/proxy-sqlite3/ol/Dockerfile
index e0229efda..9dd442145 100644
--- a/proxy-sqlite3/ol/Dockerfile
+++ b/proxy-sqlite3/ol/Dockerfile
@@ -34,9 +34,6 @@ RUN set -eux && \
     mkdir -p /var/lib/zabbix/ssl/ssl_ca && \
     mkdir -p /usr/lib/zabbix/externalscripts && \
     mkdir -p /usr/share/doc/zabbix-proxy-sqlite3 && \
-    mkdir -p /etc/yum/vars/ && \
-    echo "" > /etc/yum/vars/ociregion && \
-    echo "oracle.com" > /etc/yum/vars/ocidomain && \
     INSTALL_PKGS="libevent \
             tini \
             libssh \
diff --git a/server-mysql/ol/Dockerfile b/server-mysql/ol/Dockerfile
index 958872103..dfe8fb0f5 100644
--- a/server-mysql/ol/Dockerfile
+++ b/server-mysql/ol/Dockerfile
@@ -35,9 +35,6 @@ RUN set -eux && \
     mkdir -p /usr/lib/zabbix/alertscripts && \
     mkdir -p /usr/lib/zabbix/externalscripts && \
     mkdir -p /usr/share/doc/zabbix-server-mysql && \
-    mkdir -p /etc/yum/vars/ && \
-    echo "" > /etc/yum/vars/ociregion && \
-    echo "oracle.com" > /etc/yum/vars/ocidomain && \
     microdnf -y module enable mysql && \
     INSTALL_PKGS="fping \
             tini \
diff --git a/server-pgsql/ol/Dockerfile b/server-pgsql/ol/Dockerfile
index d3492a643..68caf6b72 100644
--- a/server-pgsql/ol/Dockerfile
+++ b/server-pgsql/ol/Dockerfile
@@ -35,9 +35,6 @@ RUN set -eux && \
     mkdir -p /usr/lib/zabbix/alertscripts && \
     mkdir -p /usr/lib/zabbix/externalscripts && \
     mkdir -p /usr/share/doc/zabbix-server-postgresql && \
-    mkdir -p /etc/yum/vars/ && \
-    echo "" > /etc/yum/vars/ociregion && \
-    echo "oracle.com" > /etc/yum/vars/ocidomain && \
     INSTALL_PKGS="fping \
             file-libs \
             tini \
diff --git a/web-apache-mysql/ol/Dockerfile b/web-apache-mysql/ol/Dockerfile
index 657ad840b..4b71ca40d 100644
--- a/web-apache-mysql/ol/Dockerfile
+++ b/web-apache-mysql/ol/Dockerfile
@@ -23,9 +23,6 @@ RUN set -eux && \
     mkdir -p /etc/zabbix && \
     mkdir -p /etc/zabbix/web && \
     mkdir -p /etc/zabbix/web/certs && \
-    mkdir -p /etc/yum/vars/ && \
-    echo "" > /etc/yum/vars/ociregion && \
-    echo "oracle.com" > /etc/yum/vars/ocidomain && \
     microdnf -y module enable mysql && \
     microdnf -y module enable php:7.4 && \
     INSTALL_PKGS="curl \
diff --git a/web-apache-pgsql/ol/Dockerfile b/web-apache-pgsql/ol/Dockerfile
index d93058896..59d2030e0 100644
--- a/web-apache-pgsql/ol/Dockerfile
+++ b/web-apache-pgsql/ol/Dockerfile
@@ -23,9 +23,6 @@ RUN set -eux && \
     mkdir -p /etc/zabbix && \
     mkdir -p /etc/zabbix/web && \
     mkdir -p /etc/zabbix/web/certs && \
-    mkdir -p /etc/yum/vars/ && \
-    echo "" > /etc/yum/vars/ociregion && \
-    echo "oracle.com" > /etc/yum/vars/ocidomain && \
     microdnf -y module enable php:7.4 && \
     INSTALL_PKGS="curl \
             httpd \
diff --git a/web-nginx-mysql/ol/Dockerfile b/web-nginx-mysql/ol/Dockerfile
index c9eabebbf..bf8557347 100644
--- a/web-nginx-mysql/ol/Dockerfile
+++ b/web-nginx-mysql/ol/Dockerfile
@@ -24,9 +24,6 @@ RUN set -eux && \
     mkdir -p /etc/zabbix/web && \
     mkdir -p /etc/zabbix/web/certs && \
     mkdir -p /var/lib/php/session && \
-    mkdir -p /etc/yum/vars/ && \
-    echo "" > /etc/yum/vars/ociregion && \
-    echo "oracle.com" > /etc/yum/vars/ocidomain && \
     microdnf -y module enable mysql && \
     microdnf -y module enable php:7.4 && \
     INSTALL_PKGS="curl \
diff --git a/web-nginx-pgsql/ol/Dockerfile b/web-nginx-pgsql/ol/Dockerfile
index 1358279ab..ae9bc5c7a 100644
--- a/web-nginx-pgsql/ol/Dockerfile
+++ b/web-nginx-pgsql/ol/Dockerfile
@@ -24,9 +24,6 @@ RUN set -eux && \
     mkdir -p /etc/zabbix/web && \
     mkdir -p /etc/zabbix/web/certs && \
     mkdir -p /var/lib/php/session && \
-    mkdir -p /etc/yum/vars/ && \
-    echo "" > /etc/yum/vars/ociregion && \
-    echo "oracle.com" > /etc/yum/vars/ocidomain && \
     microdnf -y module enable php:7.4 && \
     INSTALL_PKGS="supervisor \
             curl \