diff --git a/clients/Dockerfile b/clients/Dockerfile
index 2644364..a162d4c 100644
--- a/clients/Dockerfile
+++ b/clients/Dockerfile
@@ -1,3 +1,9 @@
+# Copyright European Organization for Nuclear Research (CERN) 2025
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# You may not use this file except in compliance with the License.
+# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+
 FROM almalinux:9
 
 ARG TAG
@@ -41,7 +47,7 @@ WORKDIR /home/user
 # Add the default rucio configuration
 ADD --chown=user:user rucio.default.cfg /opt/user/rucio.default.cfg
 ADD init_rucio.sh /etc/profile.d/rucio_init.sh
-ADD --chown=user;user ./entrypoint.sh /opt/user/entrypoint.sh
+ADD --chown=user:user ./entrypoint.sh /opt/user/entrypoint.sh
 
 ENV PATH $PATH:/opt/rucio/bin
 
diff --git a/daemons/Dockerfile b/daemons/Dockerfile
index 8c45d85..23a531f 100644
--- a/daemons/Dockerfile
+++ b/daemons/Dockerfile
@@ -19,13 +19,11 @@ RUN dnf install -y epel-release.noarch && \
         gfal2-plugin-http \
         gfal2-plugin-srm \
         gfal2-plugin-xrootd \
-        libnsl \
-        libaio \
         patch \
         python-gfal2 \
         procps-ng \
-        python-pip \
-        python-mod_wsgi \
+        python3-pip \
+        python3-mod_wsgi \
         sendmail \
         sendmail-cf \
         memcached \
@@ -34,18 +32,6 @@ RUN dnf install -y epel-release.noarch && \
     dnf clean all && \
     rm -rf /var/cache/dnf
 
-# cx_oracle requires `gcc` and Python headers, not present by default on arm64
-ARG TARGETARCH
-RUN if [ $TARGETARCH = "arm64" ]; then \
-        dnf install -y \
-            gcc \
-            python3-devel \
-    ; fi
-
-RUN rpm -i https://download.oracle.com/otn_software/linux/instantclient/1912000/oracle-instantclient19.12-basiclite-19.12.0.0.0-1.x86_64.rpm; \
-    echo "/usr/lib/oracle/19/client64/lib" >/etc/ld.so.conf.d/oracle.conf; \
-    ldconfig
-
 RUN python3 -m pip install --no-cache-dir --upgrade pip && \
     python3 -m pip install --no-cache-dir --upgrade setuptools
 RUN python3 -m pip install --no-cache-dir --pre rucio[oracle,mysql,postgresql,globus]==$TAG
diff --git a/dev/Dockerfile b/dev/Dockerfile
index 51ad585..2a8ee19 100644
--- a/dev/Dockerfile
+++ b/dev/Dockerfile
@@ -30,7 +30,6 @@ RUN dnf -y install yum-utils epel-release.noarch && \
         gridsite \
         httpd \
         krb5-devel \
-        libaio \
         libtool-ltdl-devel \
         libxml2-devel \
         mariadb-connector-c \
diff --git a/fts-cron/Dockerfile_cpp b/fts-cron/Dockerfile_cpp
index fd75e71..5b56a33 100644
--- a/fts-cron/Dockerfile_cpp
+++ b/fts-cron/Dockerfile_cpp
@@ -15,7 +15,7 @@ RUN dnf update -y && \
     dnf clean all && \
     rm -rf /var/cache/dnf
 
-    RUN dnf -y install -y httpd python-pip python-mod_wsgi libaio gcc python-devel mod_ssl openssl-devel python3-m2crypto libnsl patch xrootd-client && \
+    RUN dnf -y install -y httpd python3-pip python3-mod_wsgi python3-devel mod_ssl openssl-devel python3-m2crypto patch xrootd-client && \
     dnf clean all && \
     rm -rf /var/cache/dnf
 
diff --git a/fts-cron/Dockerfile_java b/fts-cron/Dockerfile_java
index 53f09b7..94028bc 100644
--- a/fts-cron/Dockerfile_java
+++ b/fts-cron/Dockerfile_java
@@ -14,7 +14,7 @@ RUN dnf update -y && \
     dnf clean all && \
     rm -rf /var/cache/dnf
 
-RUN dnf -y install httpd python-pip python-mod_wsgi libaio gcc python-devel mod_ssl openssl-devel python3-m2crypto libnsl patch xrootd-client && \
+RUN dnf -y install httpd python3-pip python3-mod_wsgi python3-devel mod_ssl openssl-devel python3-m2crypto patch xrootd-client && \
     dnf clean all && \
     rm -rf /var/cache/dnf
 
@@ -25,7 +25,7 @@ RUN chmod +x /usr/bin/kubectl
 # Install VOMS and FTS clients for delegating proxies
 RUN dnf -y install ca-certificates.noarch ca-policy-lcg fetch-crl voms-clients-java fts-rest-cli \
     wlcg-iam-lsc-atlas wlcg-iam-vomses-atlas wlcg-iam-lsc-cms wlcg-iam-vomses-cms \
-    python-pip python-setuptools python-requests && \
+    python3-pip python-setuptools python-requests && \
     dnf clean all && \
     rm -rf /var/cache/dnf
 
diff --git a/init/Dockerfile b/init/Dockerfile
index d4f3d82..dd67bb5 100644
--- a/init/Dockerfile
+++ b/init/Dockerfile
@@ -1,3 +1,9 @@
+# Copyright European Organization for Nuclear Research (CERN) 2025
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# You may not use this file except in compliance with the License.
+# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+
 FROM almalinux:9
 
 ARG TAG
@@ -7,21 +13,15 @@ WORKDIR /tmp
 RUN dnf install -y epel-release.noarch && \
     dnf upgrade -y && \
     dnf install -y \
-        gcc \
-        libnsl \
-        libaio \
         openssl-devel \
         mod_ssl \
         procps-ng \
-        python-devel \
+        python3-devel \
         python3-m2crypto \
-        python-pip && \
+        python3-pip && \
     dnf clean all && \
     rm -rf /var/cache/dnf
 
-RUN rpm -i https://download.oracle.com/otn_software/linux/instantclient/1912000/oracle-instantclient19.12-basiclite-19.12.0.0.0-1.x86_64.rpm; \
-    echo "/usr/lib/oracle/19/client64/lib" >/etc/ld.so.conf.d/oracle.conf; \
-    ldconfig
 RUN python3 -m pip install --no-cache-dir --upgrade pip
 RUN python3 -m pip install --no-cache-dir --upgrade setuptools
 RUN python3 -m pip install --pre rucio[oracle,mysql,postgresql]==$TAG
diff --git a/probes/Dockerfile b/probes/Dockerfile
index f6809c6..6cd9ed5 100644
--- a/probes/Dockerfile
+++ b/probes/Dockerfile
@@ -16,20 +16,13 @@ RUN dnf install -y epel-release.noarch && \
     dnf upgrade -y && \
     dnf install -y \
         git \
-        gcc \
-        libnsl \
-        libaio \
         openssl-devel \
         procps-ng \
-        python-devel \
-        python-pip && \
+        python3-devel \
+        python3-pip && \
     dnf clean all && \
     rm -rf /var/cache/dnf
 
-RUN rpm -i https://download.oracle.com/otn_software/linux/instantclient/1912000/oracle-instantclient19.12-basiclite-19.12.0.0.0-1.x86_64.rpm; \
-    echo "/usr/lib/oracle/19/client64/lib" >/etc/ld.so.conf.d/oracle.conf; \
-    ldconfig
-
 RUN rpm -i https://github.com/dshearer/jobber/releases/download/v1.4.0/jobber-1.4.0-1.el7.x86_64.rpm
 
 RUN python3 -m pip install --no-cache-dir --upgrade pip
diff --git a/server/Dockerfile b/server/Dockerfile
index c727ee1..06995ed 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -14,30 +14,15 @@ RUN dnf install -y epel-release.noarch && \
     dnf upgrade -y && \
     dnf install -y \
         gridsite \
-        libnsl \
-        libaio \
         patch \
         procps-ng \
-        python-pip \
-        python-mod_wsgi \
+        python3-pip \
+        python3-mod_wsgi \
         memcached \
         patchutils && \
     dnf clean all && \
     rm -rf /var/cache/dnf
 
-# cx_oracle requires `gcc` and Python headers, not present by default on arm64
-ARG TARGETARCH
-RUN if [ $TARGETARCH = "arm64" ]; then \
-        dnf install -y \
-            gcc \
-            python3-devel \
-    ; fi
-
-
-RUN rpm -i https://download.oracle.com/otn_software/linux/instantclient/1912000/oracle-instantclient19.12-basiclite-19.12.0.0.0-1.x86_64.rpm; \
-    echo "/usr/lib/oracle/19/client64/lib" >/etc/ld.so.conf.d/oracle.conf; \
-    ldconfig
-
 RUN python3 -m pip install --no-cache-dir --upgrade pip && \
     python3 -m pip install --no-cache-dir --upgrade setuptools
 RUN python3 -m pip install --no-cache-dir --pre rucio[oracle,mysql,postgresql]==$TAG
diff --git a/test-ssh/Dockerfile b/test-ssh/Dockerfile
index ec45c30..07b4303 100644
--- a/test-ssh/Dockerfile
+++ b/test-ssh/Dockerfile
@@ -3,10 +3,9 @@ FROM almalinux:9
 RUN dnf install -y epel-release.noarch && \
     dnf upgrade -y && \
     dnf install -y \
-        gcc \
         openssh-server \
         openssh-clients \
-        python-pip \
+        python3-pip \
         rsync \
         sudo \
         unzip && \
diff --git a/ui/Dockerfile b/ui/Dockerfile
index 43d8d23..1dc80b5 100644
--- a/ui/Dockerfile
+++ b/ui/Dockerfile
@@ -16,25 +16,19 @@ WORKDIR /tmp
 RUN dnf install -y epel-release.noarch && \
     dnf upgrade -y && \
     dnf install -y \
-        gcc \
         httpd \
-        libnsl \
-        libaio \
         openssl-devel \
         mod_ssl \
         procps-ng \
         python3-mod_wsgi \
         python3-m2crypto \
-        python-devel \
+        python3-devel \
         patch \
         patchutils \
-        python-pip && \
+        python3-pip && \
     dnf clean all && \
     rm -rf /var/cache/dnf
 
-RUN rpm -i https://download.oracle.com/otn_software/linux/instantclient/1912000/oracle-instantclient19.12-basiclite-19.12.0.0.0-1.x86_64.rpm; \
-    echo "/usr/lib/oracle/19/client64/lib" >/etc/ld.so.conf.d/oracle.conf; \
-    ldconfig
 RUN python3 -m pip install --no-cache-dir --upgrade pip
 RUN python3 -m pip install --no-cache-dir --upgrade setuptools
 RUN python3 -m pip install --no-cache-dir --pre rucio[oracle,mysql,postgresql]==$TAG
diff --git a/webui/Dockerfile b/webui/Dockerfile
index 63576c8..fed80f3 100644
--- a/webui/Dockerfile
+++ b/webui/Dockerfile
@@ -17,7 +17,7 @@ RUN dnf -y update && \
     dnf -y module reset nodejs && \
     dnf -y module enable nodejs:20 && \
     dnf -y module install nodejs:20/common && \
-    dnf -y install httpd mod_ssl python39 python-pip git procps patch patchutils && \
+    dnf -y install httpd mod_ssl python39 python3-pip git procps patch patchutils && \
     dnf -y install wget && \
     dnf clean all && \
     rm -rf /var/cache/dnf