diff --git a/Dockerfiles/agent/rhel/Dockerfile b/Dockerfiles/agent/rhel/Dockerfile
index 3c188d14..5eccf394 100644
--- a/Dockerfiles/agent/rhel/Dockerfile
+++ b/Dockerfiles/agent/rhel/Dockerfile
@@ -62,6 +62,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
     set -eux && \
     INSTALL_PKGS="bash \
             shadow-utils \
+            tzdata \
             c-ares \
             libcurl-minimal \
             libmodbus \
@@ -83,23 +84,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             --best \
             --setopt=tsflags=nodocs \
         ${INSTALL_PKGS} && \
-    microdnf -y update \
-            --disableplugin=subscription-manager \
-            --disablerepo="*" \
-            --enablerepo="ubi-10-baseos-rpms" \
-            --setopt=install_weak_deps=0 \
-            --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/rhel/Dockerfile b/Dockerfiles/agent2/rhel/Dockerfile
index da473d11..4f25dfff 100644
--- a/Dockerfiles/agent2/rhel/Dockerfile
+++ b/Dockerfiles/agent2/rhel/Dockerfile
@@ -63,6 +63,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
     set -eux && \
     INSTALL_PKGS="bash \
             shadow-utils \
+            tzdata \
             libcurl-minimal \
             pcre2 \
             iputils \
@@ -77,14 +78,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             --best \
             --setopt=tsflags=nodocs \
         ${INSTALL_PKGS} && \
-    microdnf -y update \
-            --disableplugin=subscription-manager \
-            --disablerepo="*" \
-            --enablerepo="ubi-10-baseos-rpms" \
-            --setopt=install_weak_deps=0 \
-            --best \
-            --setopt=tsflags=nodocs \
-        tzdata && \
     groupadd \
             --system \
             --gid 1995 \
diff --git a/Dockerfiles/java-gateway/ubuntu/Dockerfile b/Dockerfiles/java-gateway/ubuntu/Dockerfile
index 32c5b926..0bba5594 100644
--- a/Dockerfiles/java-gateway/ubuntu/Dockerfile
+++ b/Dockerfiles/java-gateway/ubuntu/Dockerfile
@@ -39,7 +39,7 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \
             openjdk-21-jre-headless" && \
     apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y \
-            --no-install-recommends install \
+            --no-install-recommends \
         ${INSTALL_PKGS} && \
     groupadd \
             --system \
diff --git a/Dockerfiles/proxy-mysql/rhel/Dockerfile b/Dockerfiles/proxy-mysql/rhel/Dockerfile
index 7d3a7a90..0d4e66b3 100644
--- a/Dockerfiles/proxy-mysql/rhel/Dockerfile
+++ b/Dockerfiles/proxy-mysql/rhel/Dockerfile
@@ -72,6 +72,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
     INSTALL_PKGS="bash \
             gzip \
             shadow-utils \
+            tzdata \
             c-ares \
             libcurl-minimal \
             libevent \
@@ -108,15 +109,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             --best \
             --setopt=tsflags=nodocs \
         ${INSTALL_PKGS} && \
-    microdnf -y update \
-            --disableplugin=subscription-manager \
-            --disablerepo="*" \
-            --enablerepo="ubi-10-baseos-rpms" \
-            --setopt=install_weak_deps=0 \
-            --setopt=keepcache=0 \
-            --best \
-            --setopt=tsflags=nodocs \
-        tzdata && \
     groupadd \
             --system \
             --gid 1995 \
diff --git a/Dockerfiles/proxy-sqlite3/rhel/Dockerfile b/Dockerfiles/proxy-sqlite3/rhel/Dockerfile
index 449134b7..2e478136 100644
--- a/Dockerfiles/proxy-sqlite3/rhel/Dockerfile
+++ b/Dockerfiles/proxy-sqlite3/rhel/Dockerfile
@@ -71,6 +71,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
     INSTALL_PKGS="bash \
             gzip \
             shadow-utils \
+            tzdata \
             c-ares \
             libcurl-minimal \
             libevent \
@@ -106,14 +107,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             --best \
             --setopt=tsflags=nodocs \
         ${INSTALL_PKGS} && \
-    microdnf -y update \
-            --disableplugin=subscription-manager \
-            --disablerepo="*" \
-            --enablerepo="ubi-10-baseos-rpms" \
-            --setopt=install_weak_deps=0 \
-            --best \
-            --setopt=tsflags=nodocs \
-        tzdata && \
     groupadd \
             --system \
             --gid 1995 \
diff --git a/Dockerfiles/server-mysql/rhel/Dockerfile b/Dockerfiles/server-mysql/rhel/Dockerfile
index acae3075..dd51e4f6 100644
--- a/Dockerfiles/server-mysql/rhel/Dockerfile
+++ b/Dockerfiles/server-mysql/rhel/Dockerfile
@@ -74,6 +74,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             gzip \
             hostname \
             shadow-utils \
+            tzdata \
             c-ares \
             libbrotli \
             libevent \
@@ -111,14 +112,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             --best \
             --setopt=tsflags=nodocs \
         ${INSTALL_PKGS} && \
-    microdnf -y update \
-            --disableplugin=subscription-manager \
-            --disablerepo="*" \
-            --enablerepo="ubi-10-baseos-rpms" \
-            --setopt=install_weak_deps=0 \
-            --best \
-            --setopt=tsflags=nodocs \
-        tzdata && \
     microdnf swap -y libcurl-minimal libcurl && \
     groupadd \
             --system \
diff --git a/Dockerfiles/server-pgsql/rhel/Dockerfile b/Dockerfiles/server-pgsql/rhel/Dockerfile
index c96786ba..7307e818 100644
--- a/Dockerfiles/server-pgsql/rhel/Dockerfile
+++ b/Dockerfiles/server-pgsql/rhel/Dockerfile
@@ -73,6 +73,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             gzip \
             hostname \
             shadow-utils \
+            tzdata \
             c-ares \
             libbrotli \
             libevent \
@@ -110,15 +111,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             --best \
             --setopt=tsflags=nodocs \
         ${INSTALL_PKGS} && \
-    microdnf -y update \
-            --disableplugin=subscription-manager \
-            --disablerepo="*" \
-            --enablerepo="ubi-10-baseos-rpms" \
-            --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/snmptraps/rhel/Dockerfile b/Dockerfiles/snmptraps/rhel/Dockerfile
index 5ccd3a33..e6411df6 100644
--- a/Dockerfiles/snmptraps/rhel/Dockerfile
+++ b/Dockerfiles/snmptraps/rhel/Dockerfile
@@ -55,6 +55,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
     set -eux && \
     INSTALL_PKGS="bash \
             shadow-utils \
+            tzdata \
             net-snmp" && \
     microdnf -y install \
             --disableplugin=subscription-manager \
@@ -66,14 +67,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             --best \
             --setopt=tsflags=nodocs \
         ${INSTALL_PKGS} && \
-    microdnf -y update \
-            --disableplugin=subscription-manager \
-            --disablerepo="*" \
-            --enablerepo="ubi-10-baseos-rpms" \
-            --setopt=install_weak_deps=0 \
-            --best \
-            --setopt=tsflags=nodocs \
-        tzdata && \
     groupadd \
             --system \
             --gid 1995 \
diff --git a/Dockerfiles/web-nginx-mysql/rhel/Dockerfile b/Dockerfiles/web-nginx-mysql/rhel/Dockerfile
index be1bfb1b..6b37ad5e 100644
--- a/Dockerfiles/web-nginx-mysql/rhel/Dockerfile
+++ b/Dockerfiles/web-nginx-mysql/rhel/Dockerfile
@@ -83,6 +83,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             gzip \
             jq \
             shadow-utils \
+            tzdata \
             nginx \
             php-fpm \
             php-bcmath \
@@ -106,14 +107,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             --best \
             --setopt=tsflags=nodocs \
         ${INSTALL_PKGS} && \
-    microdnf -y update \
-            --disableplugin=subscription-manager \
-            --disablerepo="*" \
-            --enablerepo="ubi-10-baseos-rpms" \
-            --setopt=install_weak_deps=0 \
-            --best \
-            --setopt=tsflags=nodocs \
-        tzdata && \
     groupadd \
             --system \
             --gid 1995 \
diff --git a/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile b/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile
index bcae369a..25da37a0 100644
--- a/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile
+++ b/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile
@@ -82,6 +82,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             gzip \
             jq \
             shadow-utils \
+            tzdata \
             nginx \
             php-fpm \
             php-bcmath \
@@ -105,14 +106,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             --best \
             --setopt=tsflags=nodocs \
         ${INSTALL_PKGS} && \
-    microdnf -y update \
-            --disableplugin=subscription-manager \
-            --disablerepo="*" \
-            --enablerepo="ubi-10-baseos-rpms" \
-            --setopt=install_weak_deps=0 \
-            --best \
-            --setopt=tsflags=nodocs \
-        tzdata && \
     groupadd \
             --system \
             --gid 1995 \
diff --git a/Dockerfiles/web-service/ubuntu/Dockerfile b/Dockerfiles/web-service/ubuntu/Dockerfile
index 245c8dbc..8161b400 100644
--- a/Dockerfiles/web-service/ubuntu/Dockerfile
+++ b/Dockerfiles/web-service/ubuntu/Dockerfile
@@ -52,7 +52,7 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \
     echo "deb [signed-by=/etc/apt/keyrings/debian.gpg] http://deb.debian.org/debian trixie-updates main" >> /etc/apt/sources.list.d/debian.list && \
     apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y \
-            --no-install-recommends install \
+            --no-install-recommends \
         ${INSTALL_PKGS} && \
     groupadd \
             --system \