diff --git a/docker/Dockerfile.base.rhel9 b/docker/Dockerfile.base.rhel9
index c4c7742650..a48ae840eb 100644
--- a/docker/Dockerfile.base.rhel9
+++ b/docker/Dockerfile.base.rhel9
@@ -42,7 +42,6 @@ COPY ./rhsm-ca /etc/rhsm/ca
 ENV SMDEV_CONTAINER_OFF=1
 #install developers pkg/repo
 RUN rm -f /etc/rhsm-host && \
-    dnf repolist --disablerepo=* && \
     subscription-manager repos --enable codeready-builder-for-rhel-9-x86_64-rpms && \
     dnf update -y && \
     dnf install -y \
diff --git a/docker/Dockerfile.eNB.rhel9 b/docker/Dockerfile.eNB.rhel9
index 2a630d9669..d4c0f4bb57 100644
--- a/docker/Dockerfile.eNB.rhel9
+++ b/docker/Dockerfile.eNB.rhel9
@@ -37,7 +37,7 @@ FROM registry.access.redhat.com/ubi9/ubi:latest as oai-enb
 ENV TZ=Europe/Paris
 
 RUN dnf update -y && \
-    dnf install -y --enablerepo="ubi-9-codeready-builder" \
+    dnf install -y --enablerepo="codeready-builder-for-rhel-9-x86_64-rpms" \
         lksctp-tools \
         tzdata \
         procps-ng \
diff --git a/docker/Dockerfile.gNB.aw2s.rhel9 b/docker/Dockerfile.gNB.aw2s.rhel9
index ee76d6d707..8adec247d6 100644
--- a/docker/Dockerfile.gNB.aw2s.rhel9
+++ b/docker/Dockerfile.gNB.aw2s.rhel9
@@ -41,9 +41,8 @@ RUN /bin/sh oaienv && \
 FROM registry.access.redhat.com/ubi9/ubi:latest as oai-gnb-aw2s
 ENV TZ=Europe/Paris
 
-RUN dnf repolist --disablerepo=* && \
-    dnf update -y && \
-    dnf install -y --enablerepo="ubi-9-codeready-builder" \
+RUN dnf update -y && \
+    dnf install -y --enablerepo="codeready-builder-for-rhel-9-x86_64-rpms" \
         procps-ng \
         libXpm \
         libX11 \
diff --git a/docker/Dockerfile.gNB.rhel9 b/docker/Dockerfile.gNB.rhel9
index e99b9b3e95..dac7006306 100644
--- a/docker/Dockerfile.gNB.rhel9
+++ b/docker/Dockerfile.gNB.rhel9
@@ -36,9 +36,8 @@ RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/gnb_parameters
 FROM registry.access.redhat.com/ubi9/ubi:latest as oai-gnb
 ENV TZ=Europe/Paris
 
-RUN dnf repolist --disablerepo=* && \
-    dnf update -y && \
-    dnf install -y --enablerepo="ubi-9-codeready-builder" \
+RUN dnf update -y && \
+    dnf install -y --enablerepo="codeready-builder-for-rhel-9-x86_64-rpms" \
         procps-ng \
         libXpm \
         libX11 \
diff --git a/docker/Dockerfile.lteRU.rhel9 b/docker/Dockerfile.lteRU.rhel9
index fede7c62a3..e5a9f27b1d 100644
--- a/docker/Dockerfile.lteRU.rhel9
+++ b/docker/Dockerfile.lteRU.rhel9
@@ -37,7 +37,7 @@ FROM registry.access.redhat.com/ubi9/ubi:latest as oai-lte-ru
 ENV TZ=Europe/Paris
 
 RUN dnf update -y && \
-    dnf install -y --enablerepo="ubi-9-codeready-builder" \
+    dnf install -y --enablerepo="codeready-builder-for-rhel-9-x86_64-rpms" \
         tzdata \
         procps-ng \
         atlas \
diff --git a/docker/Dockerfile.lteUE.rhel9 b/docker/Dockerfile.lteUE.rhel9
index aa421f47a6..61fca43575 100644
--- a/docker/Dockerfile.lteUE.rhel9
+++ b/docker/Dockerfile.lteUE.rhel9
@@ -38,7 +38,7 @@ FROM registry.access.redhat.com/ubi9/ubi:latest as oai-lte-ue
 ENV TZ=Europe/Paris
 
 RUN dnf update -y && \
-    dnf install -y --enablerepo="ubi-9-codeready-builder" \
+    dnf install -y --enablerepo="codeready-builder-for-rhel-9-x86_64-rpms" \
         lksctp-tools \
         procps-ng \
         tzdata \
diff --git a/docker/Dockerfile.nrUE.rhel9 b/docker/Dockerfile.nrUE.rhel9
index 6c3976b2c8..a2cf4085fb 100644
--- a/docker/Dockerfile.nrUE.rhel9
+++ b/docker/Dockerfile.nrUE.rhel9
@@ -37,7 +37,7 @@ FROM registry.access.redhat.com/ubi9/ubi:latest as oai-nr-ue
 ENV TZ=Europe/Paris
 
 RUN dnf update -y && \
-    dnf install -y --enablerepo="ubi-9-codeready-builder" \
+    dnf install -y --enablerepo="codeready-builder-for-rhel-9-x86_64-rpms" \
         lksctp-tools \
         procps-ng \
         tzdata \
diff --git a/docker/Dockerfile.phySim.rhel9 b/docker/Dockerfile.phySim.rhel9
index db063e3a8d..2c4c688c6b 100644
--- a/docker/Dockerfile.phySim.rhel9
+++ b/docker/Dockerfile.phySim.rhel9
@@ -44,7 +44,7 @@ RUN /bin/sh oaienv && \
 FROM registry.access.redhat.com/ubi9/ubi:latest as oai-physim
 
 RUN dnf update -y && \
-    dnf install -y --enablerepo="ubi-9-codeready-builder" \
+    dnf install -y --enablerepo="codeready-builder-for-rhel-9-x86_64-rpms" \
         lksctp-tools \
         tzdata \
         atlas \