From aff82c4c82666707b0a521a5a85970196aad90b5 Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Tue, 31 Jan 2023 18:12:38 +0900
Subject: [PATCH] Updated OL from 8 to 9 version

---
 .env                                          |  2 +-
 Dockerfiles/agent/ol/Dockerfile               | 10 ++++-----
 ...cle-epel-ol8.repo => oracle-epel-ol9.repo} |  4 ++--
 Dockerfiles/agent2/ol/Dockerfile              | 10 ++++-----
 ...cle-epel-ol8.repo => oracle-epel-ol9.repo} |  4 ++--
 Dockerfiles/build-base/ol/Dockerfile          | 18 ++++++++--------
 ...cle-epel-ol8.repo => oracle-epel-ol9.repo} |  4 ++--
 Dockerfiles/java-gateway/ol/Dockerfile        |  6 +++---
 Dockerfiles/proxy-mysql/ol/Dockerfile         | 12 +++++------
 ...cle-epel-ol8.repo => oracle-epel-ol9.repo} |  4 ++--
 Dockerfiles/proxy-sqlite3/ol/Dockerfile       | 10 ++++-----
 .../conf/etc/yum.repos.d/oracle-epel-ol8.repo |  6 ------
 .../conf/etc/yum.repos.d/oracle-epel-ol9.repo |  6 ++++++
 Dockerfiles/server-mysql/ol/Dockerfile        | 18 ++++++----------
 .../conf/etc/yum.repos.d/oracle-epel-ol8.repo |  6 ------
 .../conf/etc/yum.repos.d/oracle-epel-ol9.repo |  6 ++++++
 Dockerfiles/server-pgsql/ol/Dockerfile        | 15 ++++++-------
 .../conf/etc/yum.repos.d/oracle-epel-ol8.repo |  6 ------
 .../conf/etc/yum.repos.d/oracle-epel-ol9.repo |  6 ++++++
 Dockerfiles/snmptraps/ol/Dockerfile           |  6 +++---
 Dockerfiles/web-apache-mysql/ol/Dockerfile    | 21 +++++++++----------
 .../conf/etc/yum.repos.d/oracle-epel-ol8.repo |  6 ------
 .../conf/etc/yum.repos.d/oracle-epel-ol9.repo |  6 ++++++
 Dockerfiles/web-apache-pgsql/ol/Dockerfile    | 16 +++++++-------
 .../conf/etc/yum.repos.d/oracle-epel-ol8.repo |  6 ------
 .../conf/etc/yum.repos.d/oracle-epel-ol9.repo |  6 ++++++
 Dockerfiles/web-nginx-mysql/ol/Dockerfile     | 21 +++++++++----------
 .../conf/etc/yum.repos.d/oracle-epel-ol8.repo |  6 ------
 .../conf/etc/yum.repos.d/oracle-epel-ol9.repo |  6 ++++++
 Dockerfiles/web-nginx-pgsql/ol/Dockerfile     | 18 +++++++++-------
 .../conf/etc/yum.repos.d/oracle-epel-ol8.repo |  6 ------
 .../conf/etc/yum.repos.d/oracle-epel-ol9.repo |  6 ++++++
 Dockerfiles/web-service/ol/Dockerfile         | 10 ++++-----
 .../conf/etc/yum.repos.d/oracle-epel-ol8.repo |  6 ------
 .../conf/etc/yum.repos.d/oracle-epel-ol9.repo |  6 ++++++
 35 files changed, 150 insertions(+), 155 deletions(-)
 rename Dockerfiles/agent/ol/conf/etc/yum.repos.d/{oracle-epel-ol8.repo => oracle-epel-ol9.repo} (66%)
 rename Dockerfiles/agent2/ol/conf/etc/yum.repos.d/{oracle-epel-ol8.repo => oracle-epel-ol9.repo} (66%)
 rename Dockerfiles/build-base/ol/conf/etc/yum.repos.d/{oracle-epel-ol8.repo => oracle-epel-ol9.repo} (66%)
 rename Dockerfiles/proxy-mysql/ol/conf/etc/yum.repos.d/{oracle-epel-ol8.repo => oracle-epel-ol9.repo} (66%)
 delete mode 100644 Dockerfiles/proxy-sqlite3/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo
 create 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-ol8.repo
 create 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-ol8.repo
 create 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-ol8.repo
 create 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-ol8.repo
 create 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-ol8.repo
 create 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-ol8.repo
 create 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-ol8.repo
 create mode 100644 Dockerfiles/web-service/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo

diff --git a/.env b/.env
index 58bd453cb..00bc52da2 100644
--- a/.env
+++ b/.env
@@ -71,7 +71,7 @@ RESTART_POLICY=unless-stopped
 # Cache base images
 ALPINE_CACHE_FROM=alpine:3.21
 CENTOS_CACHE_FROM=quay.io/centos/centos:stream9-slim
-OL_CACHE_FROM=oraclelinux:8-slim
+OL_CACHE_FROM=oraclelinux:9-slim
 UBUNTU_CACHE_FROM=ubuntu:jammy
 RHEL_CACHE_FROM=registry.access.redhat.com/ubi8/ubi-minimal:8.10
 
diff --git a/Dockerfiles/agent/ol/Dockerfile b/Dockerfiles/agent/ol/Dockerfile
index d667c971f..2f9419af3 100644
--- a/Dockerfiles/agent/ol/Dockerfile
+++ b/Dockerfiles/agent/ol/Dockerfile
@@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM oraclelinux:8-slim
+FROM oraclelinux:9-slim
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION
@@ -29,7 +29,7 @@ STOPSIGNAL SIGTERM
 COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/agent/sbin/zabbix_agentd", "/usr/sbin/zabbix_agentd"]
 COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/general/bin/*", "/usr/bin/"]
 COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/agent/conf/", "/etc/zabbix/"]
-COPY ["conf/etc/yum.repos.d/oracle-epel-ol8.repo", "/etc/yum.repos.d/oracle-epel-ol8.repo"]
+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/ \
     set -eux && \
@@ -44,9 +44,9 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             zlib" && \
     microdnf -y install \
             --disablerepo="*" \
-            --enablerepo="ol8_baseos_latest" \
-            --enablerepo="ol8_appstream" \
-            --enablerepo="ol8_developer_EPEL" \
+            --enablerepo="ol9_baseos_latest" \
+            --enablerepo="ol9_appstream" \
+            --enablerepo="ol9_developer_EPEL" \
             --setopt=install_weak_deps=0 \
             --setopt=keepcache=0 \
             --best \
diff --git a/Dockerfiles/agent/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo b/Dockerfiles/agent/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
similarity index 66%
rename from Dockerfiles/agent/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo
rename to Dockerfiles/agent/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
index 6c99308a6..7fa64dc11 100644
--- a/Dockerfiles/agent/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo
+++ b/Dockerfiles/agent/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
@@ -1,6 +1,6 @@
-[ol8_developer_EPEL]
+[ol9_developer_EPEL]
 name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
-baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/developer/EPEL/$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 ba05ec737..9f0a05265 100644
--- a/Dockerfiles/agent2/ol/Dockerfile
+++ b/Dockerfiles/agent2/ol/Dockerfile
@@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM oraclelinux:8-slim
+FROM oraclelinux:9-slim
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION
@@ -29,7 +29,7 @@ STOPSIGNAL SIGTERM
 COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/agent2/sbin/", "/usr/sbin/"]
 COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/general/bin/*", "/usr/bin/"]
 COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/agent2/conf/", "/etc/zabbix/"]
-COPY ["conf/etc/yum.repos.d/oracle-epel-ol8.repo", "/etc/yum.repos.d/oracle-epel-ol8.repo"]
+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/ \
     set -eux && \
@@ -44,9 +44,9 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             openssl-libs" && \
     microdnf -y install \
             --disablerepo="*" \
-            --enablerepo="ol8_baseos_latest" \
-            --enablerepo="ol8_appstream" \
-            --enablerepo="ol8_developer_EPEL" \
+            --enablerepo="ol9_baseos_latest" \
+            --enablerepo="ol9_appstream" \
+            --enablerepo="ol9_developer_EPEL" \
             --setopt=install_weak_deps=0 \
             --setopt=keepcache=0 \
             --best \
diff --git a/Dockerfiles/agent2/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo b/Dockerfiles/agent2/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
similarity index 66%
rename from Dockerfiles/agent2/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo
rename to Dockerfiles/agent2/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
index 6c99308a6..7fa64dc11 100644
--- a/Dockerfiles/agent2/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo
+++ b/Dockerfiles/agent2/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
@@ -1,6 +1,6 @@
-[ol8_developer_EPEL]
+[ol9_developer_EPEL]
 name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
-baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/developer/EPEL/$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 fca8506df..37eaa8c15 100644
--- a/Dockerfiles/build-base/ol/Dockerfile
+++ b/Dockerfiles/build-base/ol/Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM oraclelinux:8-slim
+FROM oraclelinux:9-slim
 
 ARG MAJOR_VERSION=6.0
 ARG ZBX_VERSION=${MAJOR_VERSION}.36
@@ -17,7 +17,7 @@ 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-ol8.repo", "/etc/yum.repos.d/oracle-epel-ol8.repo"]
+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/ \
     set -eux && \
@@ -43,23 +43,23 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             sqlite-devel \
             postgresql-private-devel \
             postgresql-server-devel \
-            java-17-openjdk-devel \
+            java-1.8.0-openjdk-devel \
             git \
             gettext \
             unixODBC-devel \
             zlib-devel" && \
     microdnf -y module enable \
         --disablerepo "*" \
-        --enablerepo "ol8_appstream" \
+        --enablerepo "ol9_appstream" \
         --setopt=install_weak_deps=0 \
         --setopt=keepcache=0 \
-        postgresql:16 mysql && \
+        postgresql:16 && \
     microdnf -y install \
         --disablerepo "*" \
-        --enablerepo "ol8_baseos_latest" \
-        --enablerepo "ol8_appstream" \
-        --enablerepo "ol8_codeready_builder" \
-        --enablerepo="ol8_developer_EPEL" \
+        --enablerepo "ol9_baseos_latest" \
+        --enablerepo "ol9_appstream" \
+        --enablerepo "ol9_codeready_builder" \
+        --enablerepo="ol9_developer_EPEL" \
         --setopt=install_weak_deps=0 \
         --setopt=keepcache=0 \
         --best \
diff --git a/Dockerfiles/build-base/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo b/Dockerfiles/build-base/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
similarity index 66%
rename from Dockerfiles/build-base/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo
rename to Dockerfiles/build-base/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
index 6c99308a6..7fa64dc11 100644
--- a/Dockerfiles/build-base/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo
+++ b/Dockerfiles/build-base/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
@@ -1,6 +1,6 @@
-[ol8_developer_EPEL]
+[ol9_developer_EPEL]
 name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
-baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/developer/EPEL/$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/java-gateway/ol/Dockerfile b/Dockerfiles/java-gateway/ol/Dockerfile
index 4ab6fff95..503a55bf1 100644
--- a/Dockerfiles/java-gateway/ol/Dockerfile
+++ b/Dockerfiles/java-gateway/ol/Dockerfile
@@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM oraclelinux:8-slim
+FROM oraclelinux:9-slim
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION
@@ -35,8 +35,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             findutils" && \
     microdnf -y install \
             --disablerepo="*" \
-            --enablerepo="ol8_baseos_latest" \
-            --enablerepo="ol8_appstream" \
+            --enablerepo="ol9_baseos_latest" \
+            --enablerepo="ol9_appstream" \
             --setopt=install_weak_deps=0 \
             --setopt=keepcache=0 \
             --best \
diff --git a/Dockerfiles/proxy-mysql/ol/Dockerfile b/Dockerfiles/proxy-mysql/ol/Dockerfile
index 9716cd6ca..729e67be2 100644
--- a/Dockerfiles/proxy-mysql/ol/Dockerfile
+++ b/Dockerfiles/proxy-mysql/ol/Dockerfile
@@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM oraclelinux:8-slim
+FROM oraclelinux:9-slim
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION
@@ -32,7 +32,7 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/proxy/sbin/zabbix_proxy"
 COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/general/bin/*", "/usr/bin/"]
 COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/proxy/conf/", "/etc/zabbix/"]
 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-ol8.repo", "/etc/yum.repos.d/oracle-epel-ol8.repo"]
+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/ \
     set -eux && \
@@ -53,12 +53,12 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             pcre2 \
             zlib \
             unixODBC" && \
-    microdnf -y module enable mysql && \
     microdnf -y install \
             --disablerepo="*" \
-            --enablerepo="ol8_baseos_latest" \
-            --enablerepo="ol8_appstream" \
-            --enablerepo="ol8_developer_EPEL" \
+            --enablerepo="ol9_baseos_latest" \
+            --enablerepo="ol9_appstream" \
+            --enablerepo="ol9_codeready_builder" \
+            --enablerepo="ol9_developer_EPEL" \
             --setopt=install_weak_deps=0 \
             --setopt=keepcache=0 \
             --best \
diff --git a/Dockerfiles/proxy-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo b/Dockerfiles/proxy-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
similarity index 66%
rename from Dockerfiles/proxy-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo
rename to Dockerfiles/proxy-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
index 6c99308a6..7fa64dc11 100644
--- a/Dockerfiles/proxy-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo
+++ b/Dockerfiles/proxy-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
@@ -1,6 +1,6 @@
-[ol8_developer_EPEL]
+[ol9_developer_EPEL]
 name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
-baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/developer/EPEL/$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 58386d5b8..aa8533c33 100644
--- a/Dockerfiles/proxy-sqlite3/ol/Dockerfile
+++ b/Dockerfiles/proxy-sqlite3/ol/Dockerfile
@@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:ol-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM oraclelinux:8-slim
+FROM oraclelinux:9-slim
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION
@@ -31,7 +31,7 @@ STOPSIGNAL SIGTERM
 COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/proxy/sbin/zabbix_proxy", "/usr/sbin/zabbix_proxy"]
 COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/proxy/conf/", "/etc/zabbix/"]
 COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/general/bin/", "/usr/bin/"]
-COPY ["conf/etc/yum.repos.d/oracle-epel-ol8.repo", "/etc/yum.repos.d/oracle-epel-ol8.repo"]
+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/ \
     set -eux && \
@@ -52,9 +52,9 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             unixODBC" && \
     microdnf -y install \
             --disablerepo="*" \
-            --enablerepo="ol8_baseos_latest" \
-            --enablerepo="ol8_appstream" \
-            --enablerepo="ol8_developer_EPEL" \
+            --enablerepo="ol9_baseos_latest" \
+            --enablerepo="ol9_appstream" \
+            --enablerepo="ol9_developer_EPEL" \
             --setopt=install_weak_deps=0 \
             --setopt=keepcache=0 \
             --best \
diff --git a/Dockerfiles/proxy-sqlite3/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo b/Dockerfiles/proxy-sqlite3/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo
deleted file mode 100644
index 6c99308a6..000000000
--- a/Dockerfiles/proxy-sqlite3/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo
+++ /dev/null
@@ -1,6 +0,0 @@
-[ol8_developer_EPEL]
-name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
-baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/developer/EPEL/$basearch/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
-gpgcheck=1
-enabled=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
new file mode 100644
index 000000000..7fa64dc11
--- /dev/null
+++ b/Dockerfiles/proxy-sqlite3/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
@@ -0,0 +1,6 @@
+[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 85c2f7c30..da4b902a6 100644
--- a/Dockerfiles/server-mysql/ol/Dockerfile
+++ b/Dockerfiles/server-mysql/ol/Dockerfile
@@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM oraclelinux:8-slim
+FROM oraclelinux:9-slim
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION
@@ -32,7 +32,7 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/server/sbin/zabbix_serve
 COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/general/bin/*", "/usr/bin/"]
 COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/server/conf/", "/etc/zabbix/"]
 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-ol8.repo", "/etc/yum.repos.d/oracle-epel-ol8.repo"]
+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/ \
     set -eux && \
@@ -58,18 +58,12 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             pcre2 \
             zlib \
             unixODBC" && \
-    microdnf -y module enable \
-            --disablerepo "*" \
-            --enablerepo "ol8_appstream" \
-            --setopt=install_weak_deps=0 \
-            --setopt=keepcache=0 \
-            --best \
-            --nodocs mysql && \
     microdnf -y install \
             --disablerepo="*" \
-            --enablerepo="ol8_baseos_latest" \
-            --enablerepo="ol8_appstream" \
-            --enablerepo="ol8_developer_EPEL" \
+            --enablerepo="ol9_baseos_latest" \
+            --enablerepo="ol9_appstream" \
+            --enablerepo="ol9_codeready_builder" \
+            --enablerepo="ol9_developer_EPEL" \
             --setopt=install_weak_deps=0 \
             --setopt=keepcache=0 \
             --best \
diff --git a/Dockerfiles/server-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo b/Dockerfiles/server-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo
deleted file mode 100644
index 6c99308a6..000000000
--- a/Dockerfiles/server-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo
+++ /dev/null
@@ -1,6 +0,0 @@
-[ol8_developer_EPEL]
-name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
-baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/developer/EPEL/$basearch/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
-gpgcheck=1
-enabled=0
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
new file mode 100644
index 000000000..7fa64dc11
--- /dev/null
+++ b/Dockerfiles/server-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
@@ -0,0 +1,6 @@
+[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 9539bcffb..4cad14488 100644
--- a/Dockerfiles/server-pgsql/ol/Dockerfile
+++ b/Dockerfiles/server-pgsql/ol/Dockerfile
@@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ol-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM oraclelinux:8-slim
+FROM oraclelinux:9-slim
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION
@@ -32,7 +32,7 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/server/sbin/zabbix_serve
 COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/general/bin/*", "/usr/bin/"]
 COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/server/conf/", "/etc/zabbix/"]
 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-ol8.repo", "/etc/yum.repos.d/oracle-epel-ol8.repo"]
+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/ \
     set -eux && \
@@ -56,19 +56,20 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             postgresql \
             postgresql-private-libs \
             zlib \
+            gzip \
             unixODBC" && \
     microdnf -y module enable \
         --disablerepo "*" \
-        --enablerepo "ol8_baseos_latest" \
-        --enablerepo "ol8_appstream" \
+        --enablerepo "ol9_baseos_latest" \
+        --enablerepo "ol9_appstream" \
         --setopt=install_weak_deps=0 \
         --setopt=keepcache=0 \
         postgresql:16 && \
     microdnf -y install \
             --disablerepo="*" \
-            --enablerepo="ol8_baseos_latest" \
-            --enablerepo="ol8_appstream" \
-            --enablerepo="ol8_developer_EPEL" \
+            --enablerepo="ol9_baseos_latest" \
+            --enablerepo="ol9_appstream" \
+            --enablerepo="ol9_developer_EPEL" \
             --setopt=install_weak_deps=0 \
             --setopt=keepcache=0 \
             --best \
diff --git a/Dockerfiles/server-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo b/Dockerfiles/server-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo
deleted file mode 100644
index 6c99308a6..000000000
--- a/Dockerfiles/server-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo
+++ /dev/null
@@ -1,6 +0,0 @@
-[ol8_developer_EPEL]
-name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
-baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/developer/EPEL/$basearch/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
-gpgcheck=1
-enabled=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
new file mode 100644
index 000000000..7fa64dc11
--- /dev/null
+++ b/Dockerfiles/server-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
@@ -0,0 +1,6 @@
+[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/snmptraps/ol/Dockerfile b/Dockerfiles/snmptraps/ol/Dockerfile
index 004e360ce..17bd8d84d 100644
--- a/Dockerfiles/snmptraps/ol/Dockerfile
+++ b/Dockerfiles/snmptraps/ol/Dockerfile
@@ -1,4 +1,4 @@
-FROM oraclelinux:8-slim
+FROM oraclelinux:9-slim
 
 ARG MAJOR_VERSION=6.0
 ARG ZBX_VERSION=${MAJOR_VERSION}.36
@@ -28,8 +28,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             net-snmp" && \
     microdnf -y install \
             --disablerepo="*" \
-            --enablerepo="ol8_baseos_latest" \
-            --enablerepo="ol8_appstream" \
+            --enablerepo="ol9_baseos_latest" \
+            --enablerepo="ol9_appstream" \
             --setopt=install_weak_deps=0 \
             --setopt=keepcache=0 \
             --best \
diff --git a/Dockerfiles/web-apache-mysql/ol/Dockerfile b/Dockerfiles/web-apache-mysql/ol/Dockerfile
index 301844c80..58589a116 100644
--- a/Dockerfiles/web-apache-mysql/ol/Dockerfile
+++ b/Dockerfiles/web-apache-mysql/ol/Dockerfile
@@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM oraclelinux:8-slim
+FROM oraclelinux:9-slim
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION
@@ -28,7 +28,7 @@ STOPSIGNAL SIGTERM
 
 COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/ui", "/usr/share/zabbix"]
 COPY ["conf/etc/", "/etc/"]
-COPY ["conf/etc/yum.repos.d/oracle-epel-ol8.repo", "/etc/yum.repos.d/oracle-epel-ol8.repo"]
+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/ \
     set -eux && \
@@ -50,17 +50,16 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             glibc-locale-source \
             supervisor" && \
     microdnf -y module enable \
-            --disablerepo "*" \
-            --enablerepo "ol8_appstream" \
-            --setopt=install_weak_deps=0 \
-            --setopt=keepcache=0 \
-            --best \
-            --nodocs mysql php:8.2 && \
+        --disablerepo "*" \
+        --enablerepo "ol9_appstream" \
+        --setopt=install_weak_deps=0 \
+        --setopt=keepcache=0 \
+        php:8.2 && \
     microdnf -y install \
             --disablerepo="*" \
-            --enablerepo="ol8_baseos_latest" \
-            --enablerepo="ol8_appstream" \
-            --enablerepo="ol8_developer_EPEL" \
+            --enablerepo="ol9_baseos_latest" \
+            --enablerepo="ol9_appstream" \
+            --enablerepo="ol9_developer_EPEL" \
             --setopt=install_weak_deps=0 \
             --setopt=keepcache=0 \
             --best \
diff --git a/Dockerfiles/web-apache-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo b/Dockerfiles/web-apache-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo
deleted file mode 100644
index 6c99308a6..000000000
--- a/Dockerfiles/web-apache-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo
+++ /dev/null
@@ -1,6 +0,0 @@
-[ol8_developer_EPEL]
-name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
-baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/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/conf/etc/yum.repos.d/oracle-epel-ol9.repo b/Dockerfiles/web-apache-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
new file mode 100644
index 000000000..7fa64dc11
--- /dev/null
+++ b/Dockerfiles/web-apache-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
@@ -0,0 +1,6 @@
+[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 4a3e9d3f0..37bc54f65 100644
--- a/Dockerfiles/web-apache-pgsql/ol/Dockerfile
+++ b/Dockerfiles/web-apache-pgsql/ol/Dockerfile
@@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM oraclelinux:8-slim
+FROM oraclelinux:9-slim
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION
@@ -28,7 +28,7 @@ STOPSIGNAL SIGTERM
 
 COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/ui", "/usr/share/zabbix"]
 COPY ["conf/etc/", "/etc/"]
-COPY ["conf/etc/yum.repos.d/oracle-epel-ol8.repo", "/etc/yum.repos.d/oracle-epel-ol8.repo"]
+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/ \
     set -eux && \
@@ -51,16 +51,16 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             supervisor" && \
     microdnf -y module enable \
         --disablerepo "*" \
-        --enablerepo "ol8_baseos_latest" \
-        --enablerepo "ol8_appstream" \
+        --enablerepo "ol9_appstream" \
         --setopt=install_weak_deps=0 \
         --setopt=keepcache=0 \
-        postgresql:16 php:8.2 && \
+        php:8.2 \
+        postgresql:16 && \
     microdnf -y install \
             --disablerepo="*" \
-            --enablerepo="ol8_baseos_latest" \
-            --enablerepo="ol8_appstream" \
-            --enablerepo="ol8_developer_EPEL" \
+            --enablerepo="ol9_baseos_latest" \
+            --enablerepo="ol9_appstream" \
+            --enablerepo="ol9_developer_EPEL" \
             --setopt=install_weak_deps=0 \
             --setopt=keepcache=0 \
             --best \
diff --git a/Dockerfiles/web-apache-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo b/Dockerfiles/web-apache-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo
deleted file mode 100644
index 6c99308a6..000000000
--- a/Dockerfiles/web-apache-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo
+++ /dev/null
@@ -1,6 +0,0 @@
-[ol8_developer_EPEL]
-name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
-baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/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/conf/etc/yum.repos.d/oracle-epel-ol9.repo b/Dockerfiles/web-apache-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
new file mode 100644
index 000000000..7fa64dc11
--- /dev/null
+++ b/Dockerfiles/web-apache-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
@@ -0,0 +1,6 @@
+[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 d9cd4bbe5..3a79a389d 100644
--- a/Dockerfiles/web-nginx-mysql/ol/Dockerfile
+++ b/Dockerfiles/web-nginx-mysql/ol/Dockerfile
@@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM oraclelinux:8-slim
+FROM oraclelinux:9-slim
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION
@@ -28,7 +28,7 @@ STOPSIGNAL SIGTERM
 
 COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/ui", "/usr/share/zabbix"]
 COPY ["conf/etc/", "/etc/"]
-COPY ["conf/etc/yum.repos.d/oracle-epel-ol8.repo", "/etc/yum.repos.d/oracle-epel-ol8.repo"]
+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/ \
     set -eux && \
@@ -48,17 +48,16 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             glibc-locale-source \
             supervisor" && \
     microdnf -y module enable \
-            --disablerepo "*" \
-            --enablerepo "ol8_appstream" \
-            --setopt=install_weak_deps=0 \
-            --setopt=keepcache=0 \
-            --best \
-            --nodocs mysql php:8.2 nginx:1.24 && \
+        --disablerepo "*" \
+        --enablerepo "ol9_appstream" \
+        --setopt=install_weak_deps=0 \
+        --setopt=keepcache=0 \
+        php:8.2 && \
     microdnf -y install \
             --disablerepo="*" \
-            --enablerepo="ol8_baseos_latest" \
-            --enablerepo="ol8_appstream" \
-            --enablerepo="ol8_developer_EPEL" \
+            --enablerepo="ol9_baseos_latest" \
+            --enablerepo="ol9_appstream" \
+            --enablerepo="ol9_developer_EPEL" \
             --setopt=install_weak_deps=0 \
             --setopt=keepcache=0 \
             --best \
diff --git a/Dockerfiles/web-nginx-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo b/Dockerfiles/web-nginx-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo
deleted file mode 100644
index 6c99308a6..000000000
--- a/Dockerfiles/web-nginx-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo
+++ /dev/null
@@ -1,6 +0,0 @@
-[ol8_developer_EPEL]
-name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
-baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/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/conf/etc/yum.repos.d/oracle-epel-ol9.repo b/Dockerfiles/web-nginx-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
new file mode 100644
index 000000000..7fa64dc11
--- /dev/null
+++ b/Dockerfiles/web-nginx-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
@@ -0,0 +1,6 @@
+[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 dbd17865c..64a98c9e1 100644
--- a/Dockerfiles/web-nginx-pgsql/ol/Dockerfile
+++ b/Dockerfiles/web-nginx-pgsql/ol/Dockerfile
@@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ol-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM oraclelinux:8-slim
+FROM oraclelinux:9-slim
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION
@@ -28,7 +28,7 @@ STOPSIGNAL SIGTERM
 
 COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/ui", "/usr/share/zabbix"]
 COPY ["conf/etc/", "/etc/"]
-COPY ["conf/etc/yum.repos.d/oracle-epel-ol8.repo", "/etc/yum.repos.d/oracle-epel-ol8.repo"]
+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/ \
     set -eux && \
@@ -46,19 +46,21 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             php-pgsql \
             php-xml \
             postgresql \
+            findutils \
+            glibc-locale-source \
             supervisor" && \
     microdnf -y module enable \
         --disablerepo "*" \
-        --enablerepo "ol8_baseos_latest" \
-        --enablerepo "ol8_appstream" \
+        --enablerepo "ol9_appstream" \
         --setopt=install_weak_deps=0 \
         --setopt=keepcache=0 \
-        postgresql:16 php:8.2 nginx:1.24 && \
+        php:8.2 \
+        postgresql:16 && \
     microdnf -y install \
             --disablerepo="*" \
-            --enablerepo="ol8_baseos_latest" \
-            --enablerepo="ol8_appstream" \
-            --enablerepo="ol8_developer_EPEL" \
+            --enablerepo="ol9_baseos_latest" \
+            --enablerepo="ol9_appstream" \
+            --enablerepo="ol9_developer_EPEL" \
             --setopt=install_weak_deps=0 \
             --setopt=keepcache=0 \
             --best \
diff --git a/Dockerfiles/web-nginx-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo
deleted file mode 100644
index 6c99308a6..000000000
--- a/Dockerfiles/web-nginx-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo
+++ /dev/null
@@ -1,6 +0,0 @@
-[ol8_developer_EPEL]
-name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
-baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/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/conf/etc/yum.repos.d/oracle-epel-ol9.repo b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
new file mode 100644
index 000000000..7fa64dc11
--- /dev/null
+++ b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
@@ -0,0 +1,6 @@
+[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 0f8e7cb9c..87aabae2b 100644
--- a/Dockerfiles/web-service/ol/Dockerfile
+++ b/Dockerfiles/web-service/ol/Dockerfile
@@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
-FROM oraclelinux:8-slim
+FROM oraclelinux:9-slim
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION
@@ -29,7 +29,7 @@ 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/", "/etc/zabbix/"]
-COPY ["conf/etc/yum.repos.d/oracle-epel-ol8.repo", "/etc/yum.repos.d/oracle-epel-ol8.repo"]
+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/ \
     set -eux && \
@@ -37,9 +37,9 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             chromium-headless" && \
     microdnf -y install \
             --disablerepo="*" \
-            --enablerepo="ol8_baseos_latest" \
-            --enablerepo="ol8_appstream" \
-            --enablerepo="ol8_developer_EPEL" \
+            --enablerepo="ol9_baseos_latest" \
+            --enablerepo="ol9_appstream" \
+            --enablerepo="ol9_developer_EPEL" \
             --setopt=install_weak_deps=0 \
             --setopt=keepcache=0 \
             --best \
diff --git a/Dockerfiles/web-service/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo b/Dockerfiles/web-service/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo
deleted file mode 100644
index 6c99308a6..000000000
--- a/Dockerfiles/web-service/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo
+++ /dev/null
@@ -1,6 +0,0 @@
-[ol8_developer_EPEL]
-name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
-baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/developer/EPEL/$basearch/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
-gpgcheck=1
-enabled=0
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
new file mode 100644
index 000000000..7fa64dc11
--- /dev/null
+++ b/Dockerfiles/web-service/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
@@ -0,0 +1,6 @@
+[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