diff --git a/Dockerfiles/agent/centos/Dockerfile b/Dockerfiles/agent/centos/Dockerfile
index 2af74ebb..8c893311 100644
--- a/Dockerfiles/agent/centos/Dockerfile
+++ b/Dockerfiles/agent/centos/Dockerfile
@@ -69,13 +69,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             --best \
             --nodocs \
         ${INSTALL_PKGS} && \
-    microdnf -y reinstall \
-            --enablerepo="baseos" \
-            --setopt=install_weak_deps=0 \
-            --setopt=keepcache=0 \
-            --best \
-            --setopt=tsflags=nodocs \
-        tzdata && \
     groupadd \
             --system \
             --gid 1995 \
diff --git a/Dockerfiles/agent/rhel/Dockerfile b/Dockerfiles/agent/rhel/Dockerfile
index 1547a452..3c188d14 100644
--- a/Dockerfiles/agent/rhel/Dockerfile
+++ b/Dockerfiles/agent/rhel/Dockerfile
@@ -91,6 +91,15 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             --best \
             --setopt=tsflags=nodocs \
         tzdata && \
+    microdnf -y reinstall \
+            --disableplugin=subscription-manager \
+            --disablerepo="*" \
+            --enablerepo="ubi-9-baseos-rpms" \
+            --setopt=install_weak_deps=0 \
+            --setopt=keepcache=0 \
+            --best \
+            --setopt=tsflags=nodocs \
+        tzdata && \
     groupadd \
             --system \
             --gid 1995 \
diff --git a/Dockerfiles/agent2/centos/Dockerfile b/Dockerfiles/agent2/centos/Dockerfile
index aca10679..37fb4a17 100644
--- a/Dockerfiles/agent2/centos/Dockerfile
+++ b/Dockerfiles/agent2/centos/Dockerfile
@@ -68,13 +68,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             --best \
             --nodocs \
         ${INSTALL_PKGS} && \
-    microdnf -y reinstall \
-            --enablerepo="baseos" \
-            --setopt=install_weak_deps=0 \
-            --setopt=keepcache=0 \
-            --best \
-            --setopt=tsflags=nodocs \
-        tzdata && \
     groupadd \
             --system \
             --gid 1995 \
diff --git a/Dockerfiles/proxy-mysql/centos/Dockerfile b/Dockerfiles/proxy-mysql/centos/Dockerfile
index 968bace2..7e2a4196 100644
--- a/Dockerfiles/proxy-mysql/centos/Dockerfile
+++ b/Dockerfiles/proxy-mysql/centos/Dockerfile
@@ -93,13 +93,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             --best \
             --nodocs \
         ${INSTALL_PKGS} && \
-    microdnf -y reinstall \
-            --enablerepo="baseos" \
-            --setopt=install_weak_deps=0 \
-            --setopt=keepcache=0 \
-            --best \
-            --setopt=tsflags=nodocs \
-        tzdata && \
     groupadd \
             --system \
             --gid 1995 \
diff --git a/Dockerfiles/proxy-sqlite3/centos/Dockerfile b/Dockerfiles/proxy-sqlite3/centos/Dockerfile
index f8cf11f1..fb626290 100644
--- a/Dockerfiles/proxy-sqlite3/centos/Dockerfile
+++ b/Dockerfiles/proxy-sqlite3/centos/Dockerfile
@@ -90,13 +90,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             --best \
             --nodocs \
         ${INSTALL_PKGS} && \
-    microdnf -y reinstall \
-            --enablerepo="baseos" \
-            --setopt=install_weak_deps=0 \
-            --setopt=keepcache=0 \
-            --best \
-            --setopt=tsflags=nodocs \
-        tzdata && \
     groupadd \
             --system \
             --gid 1995 \
diff --git a/Dockerfiles/server-mysql/centos/Dockerfile b/Dockerfiles/server-mysql/centos/Dockerfile
index 0a0191da..89646a73 100644
--- a/Dockerfiles/server-mysql/centos/Dockerfile
+++ b/Dockerfiles/server-mysql/centos/Dockerfile
@@ -96,13 +96,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             --best \
             --nodocs \
         ${INSTALL_PKGS} && \
-    microdnf -y reinstall \
-            --enablerepo="baseos" \
-            --setopt=install_weak_deps=0 \
-            --setopt=keepcache=0 \
-            --best \
-            --setopt=tsflags=nodocs \
-        tzdata && \
     microdnf swap -y libcurl-minimal libcurl && \
     groupadd \
             --system \
diff --git a/Dockerfiles/server-pgsql/centos/Dockerfile b/Dockerfiles/server-pgsql/centos/Dockerfile
index 457a667f..c4de47a4 100644
--- a/Dockerfiles/server-pgsql/centos/Dockerfile
+++ b/Dockerfiles/server-pgsql/centos/Dockerfile
@@ -94,13 +94,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             --best \
             --nodocs \
         ${INSTALL_PKGS} && \
-    microdnf -y reinstall \
-            --enablerepo="baseos" \
-            --setopt=install_weak_deps=0 \
-            --setopt=keepcache=0 \
-            --best \
-            --setopt=tsflags=nodocs \
-        tzdata && \
     microdnf swap -y libcurl-minimal libcurl && \
     groupadd \
             --system \
diff --git a/Dockerfiles/web-apache-mysql/centos/Dockerfile b/Dockerfiles/web-apache-mysql/centos/Dockerfile
index 5b1c3dfb..e1ffb094 100644
--- a/Dockerfiles/web-apache-mysql/centos/Dockerfile
+++ b/Dockerfiles/web-apache-mysql/centos/Dockerfile
@@ -88,13 +88,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             --best \
             --nodocs \
         ${INSTALL_PKGS} && \
-    microdnf -y reinstall \
-            --enablerepo="baseos" \
-            --setopt=install_weak_deps=0 \
-            --setopt=keepcache=0 \
-            --best \
-            --setopt=tsflags=nodocs \
-        tzdata && \
     groupadd \
             --system \
             --gid 1995 \
diff --git a/Dockerfiles/web-apache-pgsql/centos/Dockerfile b/Dockerfiles/web-apache-pgsql/centos/Dockerfile
index 4605bdb2..ed0b7422 100644
--- a/Dockerfiles/web-apache-pgsql/centos/Dockerfile
+++ b/Dockerfiles/web-apache-pgsql/centos/Dockerfile
@@ -87,13 +87,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             --best \
           --nodocs \
         ${INSTALL_PKGS} && \
-    microdnf -y reinstall \
-            --enablerepo="baseos" \
-            --setopt=install_weak_deps=0 \
-            --setopt=keepcache=0 \
-            --best \
-            --setopt=tsflags=nodocs \
-        tzdata && \
     groupadd \
             --system \
             --gid 1995 \
diff --git a/Dockerfiles/web-nginx-mysql/centos/Dockerfile b/Dockerfiles/web-nginx-mysql/centos/Dockerfile
index b7e0f678..57288fc2 100644
--- a/Dockerfiles/web-nginx-mysql/centos/Dockerfile
+++ b/Dockerfiles/web-nginx-mysql/centos/Dockerfile
@@ -84,13 +84,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             --best \
             --nodocs \
         ${INSTALL_PKGS} && \
-    microdnf -y reinstall \
-            --enablerepo="baseos" \
-            --setopt=install_weak_deps=0 \
-            --setopt=keepcache=0 \
-            --best \
-            --setopt=tsflags=nodocs \
-        tzdata && \
     groupadd \
             --system \
             --gid 1995 \
diff --git a/Dockerfiles/web-nginx-pgsql/centos/Dockerfile b/Dockerfiles/web-nginx-pgsql/centos/Dockerfile
index b3c3fe63..c0283776 100644
--- a/Dockerfiles/web-nginx-pgsql/centos/Dockerfile
+++ b/Dockerfiles/web-nginx-pgsql/centos/Dockerfile
@@ -83,13 +83,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             --best \
             --nodocs \
         ${INSTALL_PKGS} && \
-    microdnf -y reinstall \
-            --enablerepo="baseos" \
-            --setopt=install_weak_deps=0 \
-            --setopt=keepcache=0 \
-            --best \
-            --setopt=tsflags=nodocs \
-        tzdata && \
     groupadd \
             --system \
             --gid 1995 \