From 90db7d213bea7affa581e1363b28609f7432bcaf Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Thu, 9 Apr 2026 16:04:27 +0900
Subject: [PATCH] Using built-in EPEL repo on OL

---
 Dockerfiles/agent/centos/Dockerfile           | 30 ++++++++-------
 Dockerfiles/agent/ol/Dockerfile               |  9 ++++-
 .../conf/etc/yum.repos.d/oracle-epel-ol9.repo |  6 ---
 Dockerfiles/agent2/ol/Dockerfile              |  9 ++++-
 .../conf/etc/yum.repos.d/oracle-epel-ol9.repo |  6 ---
 Dockerfiles/build-base/ol/Dockerfile          | 38 +++++++++++--------
 .../conf/etc/yum.repos.d/oracle-epel-ol9.repo |  6 ---
 Dockerfiles/proxy-mysql/ol/Dockerfile         | 27 ++++++++-----
 .../conf/etc/yum.repos.d/oracle-epel-ol9.repo |  6 ---
 Dockerfiles/proxy-sqlite3/ol/Dockerfile       | 10 ++++-
 .../conf/etc/yum.repos.d/oracle-epel-ol9.repo |  6 ---
 Dockerfiles/server-mysql/ol/Dockerfile        |  9 ++++-
 .../conf/etc/yum.repos.d/oracle-epel-ol9.repo |  6 ---
 Dockerfiles/server-pgsql/ol/Dockerfile        | 10 ++++-
 .../conf/etc/yum.repos.d/oracle-epel-ol9.repo |  6 ---
 Dockerfiles/web-apache-mysql/ol/Dockerfile    |  9 ++++-
 .../conf/etc/yum.repos.d/oracle-epel-ol9.repo |  6 ---
 Dockerfiles/web-apache-pgsql/ol/Dockerfile    |  9 ++++-
 .../conf/etc/yum.repos.d/oracle-epel-ol9.repo |  6 ---
 Dockerfiles/web-nginx-mysql/ol/Dockerfile     |  9 ++++-
 .../conf/etc/yum.repos.d/oracle-epel-ol9.repo |  6 ---
 Dockerfiles/web-nginx-pgsql/ol/Dockerfile     |  9 ++++-
 .../conf/etc/yum.repos.d/oracle-epel-ol9.repo |  6 ---
 Dockerfiles/web-service/ol/Dockerfile         |  9 ++++-
 .../conf/etc/yum.repos.d/oracle-epel-ol9.repo |  6 ---
 25 files changed, 138 insertions(+), 121 deletions(-)
 delete mode 100644 Dockerfiles/agent/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
 delete mode 100644 Dockerfiles/agent2/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
 delete mode 100644 Dockerfiles/build-base/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
 delete mode 100644 Dockerfiles/proxy-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
 delete mode 100644 Dockerfiles/proxy-sqlite3/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
 delete mode 100644 Dockerfiles/server-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
 delete mode 100644 Dockerfiles/server-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
 delete mode 100644 Dockerfiles/web-apache-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
 delete mode 100644 Dockerfiles/web-apache-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
 delete mode 100644 Dockerfiles/web-nginx-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
 delete mode 100644 Dockerfiles/web-nginx-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
 delete mode 100644 Dockerfiles/web-service/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo

diff --git a/Dockerfiles/agent/centos/Dockerfile b/Dockerfiles/agent/centos/Dockerfile
index 3de29ab43..09b7f6270 100644
--- a/Dockerfiles/agent/centos/Dockerfile
+++ b/Dockerfiles/agent/centos/Dockerfile
@@ -48,21 +48,23 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             shadow-utils \
             zlib" && \
     microdnf -y install \
-        --disablerepo "*" \
-        --enablerepo "extras-common" \
-        --setopt=install_weak_deps=0 \
-        --setopt=keepcache=0 \
-        --best \
-        --nodocs epel-release && \
+            --disablerepo "*" \
+            --enablerepo "extras-common" \
+            --setopt=install_weak_deps=0 \
+            --setopt=keepcache=0 \
+            --best \
+            --nodocs \
+        epel-release && \
     microdnf -y install \
-        --disablerepo "*" \
-        --enablerepo "baseos" \
-        --enablerepo "appstream" \
-        --enablerepo="epel" \
-        --setopt=install_weak_deps=0 \
-        --setopt=keepcache=0 \
-        --best \
-        --nodocs ${INSTALL_PKGS} && \
+            --disablerepo "*" \
+            --enablerepo "baseos" \
+            --enablerepo "appstream" \
+            --enablerepo="epel" \
+            --setopt=install_weak_deps=0 \
+            --setopt=keepcache=0 \
+            --best \
+            --nodocs \
+        ${INSTALL_PKGS} && \
     microdnf -y reinstall \
             --enablerepo "baseos" \
             --setopt=install_weak_deps=0 \
diff --git a/Dockerfiles/agent/ol/Dockerfile b/Dockerfiles/agent/ol/Dockerfile
index 9d7037ade..8c35e30cc 100644
--- a/Dockerfiles/agent/ol/Dockerfile
+++ b/Dockerfiles/agent/ol/Dockerfile
@@ -34,7 +34,6 @@ COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/agent/sbin/zabbix_agentd /
 COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_get /usr/bin/
 COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_sender /usr/bin/
 COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/agent/conf/ ${ZABBIX_CONF_DIR}/
-COPY conf/etc/yum.repos.d/oracle-epel-ol9.repo /etc/yum.repos.d/oracle-epel-ol9.repo
 
 RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
     --mount=type=tmpfs,target=/var/cache/yum/ \
@@ -47,6 +46,14 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             libmodbus \
             openssl-libs \
             zlib" && \
+    microdnf -y install \
+            --disablerepo "*" \
+            --enablerepo "ol9_baseos_latest" \
+            --setopt=install_weak_deps=0 \
+            --setopt=keepcache=0 \
+            --best \
+            --nodocs \
+        oracle-epel-release-el9 && \
     microdnf -y install \
             --disablerepo="*" \
             --enablerepo="ol9_baseos_latest" \
diff --git a/Dockerfiles/agent/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo b/Dockerfiles/agent/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
deleted file mode 100644
index 7fa64dc11..000000000
--- a/Dockerfiles/agent/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
+++ /dev/null
@@ -1,6 +0,0 @@
-[ol9_developer_EPEL]
-name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
-baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/developer/EPEL/$basearch/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
-gpgcheck=1
-enabled=0
diff --git a/Dockerfiles/agent2/ol/Dockerfile b/Dockerfiles/agent2/ol/Dockerfile
index c51df9a18..a5aabe3c4 100644
--- a/Dockerfiles/agent2/ol/Dockerfile
+++ b/Dockerfiles/agent2/ol/Dockerfile
@@ -35,7 +35,6 @@ COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/agent2/sbin/zabbix-agent2-
 COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_get /usr/bin/
 COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_sender /usr/bin/
 COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/agent2/conf/ ${ZABBIX_CONF_DIR}/
-COPY conf/etc/yum.repos.d/oracle-epel-ol9.repo /etc/yum.repos.d/oracle-epel-ol9.repo
 
 RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
     --mount=type=tmpfs,target=/var/cache/yum/ \
@@ -47,6 +46,14 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             smartmontools \
             sudo \
             openssl-libs" && \
+    microdnf -y install \
+            --disablerepo "*" \
+            --enablerepo "ol10_baseos_latest" \
+            --setopt=install_weak_deps=0 \
+            --setopt=keepcache=0 \
+            --best \
+            --nodocs \
+        oracle-epel-release-el9 && \
     microdnf -y install \
             --disablerepo="*" \
             --enablerepo="ol9_baseos_latest" \
diff --git a/Dockerfiles/agent2/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo b/Dockerfiles/agent2/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
deleted file mode 100644
index 7fa64dc11..000000000
--- a/Dockerfiles/agent2/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
+++ /dev/null
@@ -1,6 +0,0 @@
-[ol9_developer_EPEL]
-name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
-baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/developer/EPEL/$basearch/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
-gpgcheck=1
-enabled=0
diff --git a/Dockerfiles/build-base/ol/Dockerfile b/Dockerfiles/build-base/ol/Dockerfile
index 811261adf..33621e97a 100644
--- a/Dockerfiles/build-base/ol/Dockerfile
+++ b/Dockerfiles/build-base/ol/Dockerfile
@@ -22,8 +22,6 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab
       org.opencontainers.image.vendor="Zabbix SIA" \
       org.opencontainers.image.version="${ZBX_VERSION}"
 
-COPY ["conf/etc/yum.repos.d/oracle-epel-ol9.repo", "/etc/yum.repos.d/oracle-epel-ol9.repo"]
-
 RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
     --mount=type=tmpfs,target=/var/cache/yum/ \
     set -eux && \
@@ -55,18 +53,28 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             unixODBC-devel \
             zlib-devel" && \
     microdnf -y module enable \
-        --disablerepo "*" \
-        --enablerepo "ol9_appstream" \
-        --setopt=install_weak_deps=0 \
-        --setopt=keepcache=0 \
+            --disablerepo "*" \
+            --enablerepo "ol9_appstream" \
+            --setopt=install_weak_deps=0 \
+            --setopt=keepcache=0 \
         postgresql:16 && \
     microdnf -y install \
-        --disablerepo "*" \
-        --enablerepo "ol9_baseos_latest" \
-        --enablerepo "ol9_appstream" \
-        --enablerepo "ol9_codeready_builder" \
-        --enablerepo="ol9_developer_EPEL" \
-        --setopt=install_weak_deps=0 \
-        --setopt=keepcache=0 \
-        --best \
-        --nodocs ${INSTALL_PKGS}
+            --disablerepo "*" \
+            --enablerepo "ol9_baseos_latest" \
+            --setopt=install_weak_deps=0 \
+            --setopt=keepcache=0 \
+            --best \
+            --nodocs \
+        oracle-epel-release-el9 && \
+    microdnf -y install \
+            --disablerepo "*" \
+            --enablerepo "ol9_baseos_latest" \
+            --enablerepo "ol9_appstream" \
+            --enablerepo "ol9_codeready_builder" \
+            --enablerepo="ol9_developer_EPEL" \
+            --setopt=install_weak_deps=0 \
+            --setopt=keepcache=0 \
+            --best \
+            --nodocs \
+        ${INSTALL_PKGS} && \
+    go telemetry off
diff --git a/Dockerfiles/build-base/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo b/Dockerfiles/build-base/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
deleted file mode 100644
index 7fa64dc11..000000000
--- a/Dockerfiles/build-base/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
+++ /dev/null
@@ -1,6 +0,0 @@
-[ol9_developer_EPEL]
-name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
-baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/developer/EPEL/$basearch/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
-gpgcheck=1
-enabled=0
diff --git a/Dockerfiles/proxy-mysql/ol/Dockerfile b/Dockerfiles/proxy-mysql/ol/Dockerfile
index 219ab440b..f7067c05b 100644
--- a/Dockerfiles/proxy-mysql/ol/Dockerfile
+++ b/Dockerfiles/proxy-mysql/ol/Dockerfile
@@ -39,7 +39,6 @@ COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_get /us
 COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_sender /usr/bin/
 COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/proxy/conf/ ${ZABBIX_CONF_DIR}/
 COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/proxy/database/mysql/ /usr/share/doc/zabbix-proxy-mysql/
-COPY conf/etc/yum.repos.d/oracle-epel-ol9.repo /etc/yum.repos.d/oracle-epel-ol9.repo
 
 RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
     --mount=type=tmpfs,target=/var/cache/yum/ \
@@ -68,15 +67,23 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             gzip \
             unixODBC" && \
     microdnf -y install \
-        --disablerepo="*" \
-        --enablerepo="ol9_baseos_latest" \
-        --enablerepo="ol9_appstream" \
-        --enablerepo="ol9_codeready_builder" \
-        --enablerepo="ol9_developer_EPEL" \
-        --setopt=install_weak_deps=0 \
-        --setopt=keepcache=0 \
-        --best \
-        --nodocs \
+            --disablerepo "*" \
+            --enablerepo "ol9_baseos_latest" \
+            --setopt=install_weak_deps=0 \
+            --setopt=keepcache=0 \
+            --best \
+            --nodocs \
+        oracle-epel-release-el9 && \
+    microdnf -y install \
+            --disablerepo="*" \
+            --enablerepo="ol9_baseos_latest" \
+            --enablerepo="ol9_appstream" \
+            --enablerepo="ol9_codeready_builder" \
+            --enablerepo="ol9_developer_EPEL" \
+            --setopt=install_weak_deps=0 \
+            --setopt=keepcache=0 \
+            --best \
+            --nodocs \
         ${INSTALL_PKGS} && \
     groupadd \
             --system \
diff --git a/Dockerfiles/proxy-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo b/Dockerfiles/proxy-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
deleted file mode 100644
index 7fa64dc11..000000000
--- a/Dockerfiles/proxy-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
+++ /dev/null
@@ -1,6 +0,0 @@
-[ol9_developer_EPEL]
-name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
-baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/developer/EPEL/$basearch/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
-gpgcheck=1
-enabled=0
diff --git a/Dockerfiles/proxy-sqlite3/ol/Dockerfile b/Dockerfiles/proxy-sqlite3/ol/Dockerfile
index 913e702a0..21ca41cc7 100644
--- a/Dockerfiles/proxy-sqlite3/ol/Dockerfile
+++ b/Dockerfiles/proxy-sqlite3/ol/Dockerfile
@@ -37,7 +37,6 @@ COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/proxy/sbin/zabbix_proxy /u
 COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_get /usr/bin/
 COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_sender /usr/bin/
 COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/proxy/conf/ ${ZABBIX_CONF_DIR}/
-COPY conf/etc/yum.repos.d/oracle-epel-ol9.repo /etc/yum.repos.d/oracle-epel-ol9.repo
 
 RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
     --mount=type=tmpfs,target=/var/cache/yum/ \
@@ -61,10 +60,19 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             pcre2 \
             zlib \
             unixODBC" && \
+    microdnf -y install \
+            --disablerepo "*" \
+            --enablerepo "ol9_baseos_latest" \
+            --setopt=install_weak_deps=0 \
+            --setopt=keepcache=0 \
+            --best \
+            --nodocs \
+        oracle-epel-release-el9 && \
     microdnf -y install \
             --disablerepo="*" \
             --enablerepo="ol9_baseos_latest" \
             --enablerepo="ol9_appstream" \
+            --enablerepo="ol9_codeready_builder" \
             --enablerepo="ol9_developer_EPEL" \
             --setopt=install_weak_deps=0 \
             --setopt=keepcache=0 \
diff --git a/Dockerfiles/proxy-sqlite3/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo b/Dockerfiles/proxy-sqlite3/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
deleted file mode 100644
index 7fa64dc11..000000000
--- a/Dockerfiles/proxy-sqlite3/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
+++ /dev/null
@@ -1,6 +0,0 @@
-[ol9_developer_EPEL]
-name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
-baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/developer/EPEL/$basearch/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
-gpgcheck=1
-enabled=0
diff --git a/Dockerfiles/server-mysql/ol/Dockerfile b/Dockerfiles/server-mysql/ol/Dockerfile
index 65af7dcd1..153307cb1 100644
--- a/Dockerfiles/server-mysql/ol/Dockerfile
+++ b/Dockerfiles/server-mysql/ol/Dockerfile
@@ -39,7 +39,6 @@ COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_get /us
 COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_sender /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/mysql/create.sql.gz /usr/share/doc/zabbix-server-mysql/create.sql.gz
-COPY conf/etc/yum.repos.d/oracle-epel-ol9.repo /etc/yum.repos.d/oracle-epel-ol9.repo
 
 RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
     --mount=type=tmpfs,target=/var/cache/yum/ \
@@ -68,6 +67,14 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             zlib \
             gzip \
             unixODBC" && \
+    microdnf -y install \
+            --disablerepo "*" \
+            --enablerepo "ol9_baseos_latest" \
+            --setopt=install_weak_deps=0 \
+            --setopt=keepcache=0 \
+            --best \
+            --nodocs \
+        oracle-epel-release-el9 && \
     microdnf -y install \
             --disablerepo="*" \
             --enablerepo="ol9_baseos_latest" \
diff --git a/Dockerfiles/server-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo b/Dockerfiles/server-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
deleted file mode 100644
index 7fa64dc11..000000000
--- a/Dockerfiles/server-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
+++ /dev/null
@@ -1,6 +0,0 @@
-[ol9_developer_EPEL]
-name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
-baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/developer/EPEL/$basearch/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
-gpgcheck=1
-enabled=0
diff --git a/Dockerfiles/server-pgsql/ol/Dockerfile b/Dockerfiles/server-pgsql/ol/Dockerfile
index 9fc2052fd..0d7bbc3af 100644
--- a/Dockerfiles/server-pgsql/ol/Dockerfile
+++ b/Dockerfiles/server-pgsql/ol/Dockerfile
@@ -38,7 +38,6 @@ COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_get /us
 COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_sender /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/
-COPY conf/etc/yum.repos.d/oracle-epel-ol9.repo /etc/yum.repos.d/oracle-epel-ol9.repo
 
 RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
     --mount=type=tmpfs,target=/var/cache/yum/ \
@@ -73,10 +72,19 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             --setopt=install_weak_deps=0 \
             --setopt=keepcache=0 \
         postgresql:16 && \
+    microdnf -y install \
+            --disablerepo "*" \
+            --enablerepo "ol9_baseos_latest" \
+            --setopt=install_weak_deps=0 \
+            --setopt=keepcache=0 \
+            --best \
+            --nodocs \
+        oracle-epel-release-el9 && \
     microdnf -y install \
             --disablerepo="*" \
             --enablerepo="ol9_baseos_latest" \
             --enablerepo="ol9_appstream" \
+            --enablerepo="ol9_codeready_builder" \
             --enablerepo="ol9_developer_EPEL" \
             --setopt=install_weak_deps=0 \
             --setopt=keepcache=0 \
diff --git a/Dockerfiles/server-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo b/Dockerfiles/server-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
deleted file mode 100644
index 7fa64dc11..000000000
--- a/Dockerfiles/server-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
+++ /dev/null
@@ -1,6 +0,0 @@
-[ol9_developer_EPEL]
-name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
-baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/developer/EPEL/$basearch/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
-gpgcheck=1
-enabled=0
diff --git a/Dockerfiles/web-apache-mysql/ol/Dockerfile b/Dockerfiles/web-apache-mysql/ol/Dockerfile
index 4a1254d9a..a1a44118a 100644
--- a/Dockerfiles/web-apache-mysql/ol/Dockerfile
+++ b/Dockerfiles/web-apache-mysql/ol/Dockerfile
@@ -51,7 +51,6 @@ STOPSIGNAL SIGTERM
 
 COPY --from=clean_builder /tmp/zabbix-${ZBX_VERSION}/ui ${ZABBIX_WWW_ROOT}/
 COPY conf/etc/ /etc/
-COPY conf/etc/yum.repos.d/oracle-epel-ol9.repo /etc/yum.repos.d/oracle-epel-ol9.repo
 
 RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
     --mount=type=tmpfs,target=/var/cache/yum/ \
@@ -81,6 +80,14 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             --setopt=install_weak_deps=0 \
             --setopt=keepcache=0 \
         php:8.3 && \
+    microdnf -y install \
+            --disablerepo "*" \
+            --enablerepo "ol9_baseos_latest" \
+            --setopt=install_weak_deps=0 \
+            --setopt=keepcache=0 \
+            --best \
+            --nodocs \
+        oracle-epel-release-el9 && \
     microdnf -y install \
             --disablerepo="*" \
             --enablerepo="ol9_baseos_latest" \
diff --git a/Dockerfiles/web-apache-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo b/Dockerfiles/web-apache-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
deleted file mode 100644
index 7fa64dc11..000000000
--- a/Dockerfiles/web-apache-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
+++ /dev/null
@@ -1,6 +0,0 @@
-[ol9_developer_EPEL]
-name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
-baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/developer/EPEL/$basearch/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
-gpgcheck=1
-enabled=0
diff --git a/Dockerfiles/web-apache-pgsql/ol/Dockerfile b/Dockerfiles/web-apache-pgsql/ol/Dockerfile
index ef3294b7b..629e7d6a1 100644
--- a/Dockerfiles/web-apache-pgsql/ol/Dockerfile
+++ b/Dockerfiles/web-apache-pgsql/ol/Dockerfile
@@ -50,7 +50,6 @@ STOPSIGNAL SIGTERM
 
 COPY --from=clean_builder /tmp/zabbix-${ZBX_VERSION}/ui ${ZABBIX_WWW_ROOT}/
 COPY conf/etc/ /etc/
-COPY conf/etc/yum.repos.d/oracle-epel-ol9.repo /etc/yum.repos.d/oracle-epel-ol9.repo
 
 RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
     --mount=type=tmpfs,target=/var/cache/yum/ \
@@ -81,6 +80,14 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             --setopt=keepcache=0 \
         php:8.3 \
         postgresql:16 && \
+    microdnf -y install \
+            --disablerepo "*" \
+            --enablerepo "ol9_baseos_latest" \
+            --setopt=install_weak_deps=0 \
+            --setopt=keepcache=0 \
+            --best \
+            --nodocs \
+        oracle-epel-release-el9 && \
     microdnf -y install \
             --disablerepo="*" \
             --enablerepo="ol9_baseos_latest" \
diff --git a/Dockerfiles/web-apache-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo b/Dockerfiles/web-apache-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
deleted file mode 100644
index 7fa64dc11..000000000
--- a/Dockerfiles/web-apache-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
+++ /dev/null
@@ -1,6 +0,0 @@
-[ol9_developer_EPEL]
-name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
-baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/developer/EPEL/$basearch/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
-gpgcheck=1
-enabled=0
diff --git a/Dockerfiles/web-nginx-mysql/ol/Dockerfile b/Dockerfiles/web-nginx-mysql/ol/Dockerfile
index f039d7f6e..2546ee9ee 100644
--- a/Dockerfiles/web-nginx-mysql/ol/Dockerfile
+++ b/Dockerfiles/web-nginx-mysql/ol/Dockerfile
@@ -49,7 +49,6 @@ STOPSIGNAL SIGTERM
 
 COPY --from=clean_builder /tmp/zabbix-${ZBX_VERSION}/ui ${ZABBIX_WWW_ROOT}/
 COPY conf/etc/ /etc/
-COPY conf/etc/yum.repos.d/oracle-epel-ol9.repo /etc/yum.repos.d/oracle-epel-ol9.repo
 
 RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
     --mount=type=tmpfs,target=/var/cache/yum/ \
@@ -78,6 +77,14 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             --setopt=keepcache=0 \
         php:8.3 \
         nginx:1.26 && \
+    microdnf -y install \
+            --disablerepo "*" \
+            --enablerepo "ol9_baseos_latest" \
+            --setopt=install_weak_deps=0 \
+            --setopt=keepcache=0 \
+            --best \
+            --nodocs \
+        oracle-epel-release-el9 && \
     microdnf -y install \
             --disablerepo="*" \
             --enablerepo="ol9_baseos_latest" \
diff --git a/Dockerfiles/web-nginx-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo b/Dockerfiles/web-nginx-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
deleted file mode 100644
index 7fa64dc11..000000000
--- a/Dockerfiles/web-nginx-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
+++ /dev/null
@@ -1,6 +0,0 @@
-[ol9_developer_EPEL]
-name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
-baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/developer/EPEL/$basearch/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
-gpgcheck=1
-enabled=0
diff --git a/Dockerfiles/web-nginx-pgsql/ol/Dockerfile b/Dockerfiles/web-nginx-pgsql/ol/Dockerfile
index 750d75d4d..38a8a59c2 100644
--- a/Dockerfiles/web-nginx-pgsql/ol/Dockerfile
+++ b/Dockerfiles/web-nginx-pgsql/ol/Dockerfile
@@ -48,7 +48,6 @@ STOPSIGNAL SIGTERM
 
 COPY --from=clean_builder /tmp/zabbix-${ZBX_VERSION}/ui ${ZABBIX_WWW_ROOT}/
 COPY conf/etc/ /etc/
-COPY conf/etc/yum.repos.d/oracle-epel-ol9.repo /etc/yum.repos.d/oracle-epel-ol9.repo
 
 RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
     --mount=type=tmpfs,target=/var/cache/yum/ \
@@ -79,6 +78,14 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
         php:8.3 \
         postgresql:16 \
         nginx:1.26 && \
+    microdnf -y install \
+            --disablerepo "*" \
+            --enablerepo "ol9_baseos_latest" \
+            --setopt=install_weak_deps=0 \
+            --setopt=keepcache=0 \
+            --best \
+            --nodocs \
+        oracle-epel-release-el9 && \
     microdnf -y install \
             --disablerepo="*" \
             --enablerepo="ol9_baseos_latest" \
diff --git a/Dockerfiles/web-nginx-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
deleted file mode 100644
index 7fa64dc11..000000000
--- a/Dockerfiles/web-nginx-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
+++ /dev/null
@@ -1,6 +0,0 @@
-[ol9_developer_EPEL]
-name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
-baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/developer/EPEL/$basearch/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
-gpgcheck=1
-enabled=0
diff --git a/Dockerfiles/web-service/ol/Dockerfile b/Dockerfiles/web-service/ol/Dockerfile
index 2908b8974..64bb3e2e6 100644
--- a/Dockerfiles/web-service/ol/Dockerfile
+++ b/Dockerfiles/web-service/ol/Dockerfile
@@ -33,13 +33,20 @@ STOPSIGNAL SIGTERM
 
 COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/web_service/sbin/zabbix_web_service /usr/sbin/zabbix_web_service
 COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/web_service/conf/ ${ZABBIX_CONF_DIR}/
-COPY conf/etc/yum.repos.d/oracle-epel-ol9.repo /etc/yum.repos.d/oracle-epel-ol9.repo
 
 RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
     --mount=type=tmpfs,target=/var/cache/yum/ \
     set -eux && \
     INSTALL_PKGS="bash \
             chromium-headless" && \
+    microdnf -y install \
+            --disablerepo "*" \
+            --enablerepo "ol9_baseos_latest" \
+            --setopt=install_weak_deps=0 \
+            --setopt=keepcache=0 \
+            --best \
+            --nodocs \
+        oracle-epel-release-el9 && \
     microdnf -y install \
             --disablerepo="*" \
             --enablerepo="ol9_baseos_latest" \
diff --git a/Dockerfiles/web-service/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo b/Dockerfiles/web-service/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
deleted file mode 100644
index 7fa64dc11..000000000
--- a/Dockerfiles/web-service/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
+++ /dev/null
@@ -1,6 +0,0 @@
-[ol9_developer_EPEL]
-name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
-baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/developer/EPEL/$basearch/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
-gpgcheck=1
-enabled=0