diff --git a/dockerfiles/base/Dockerfile.rhel9.4 b/dockerfiles/base/Dockerfile.rhel9.4
index 6089b44..2606831 100644
--- a/dockerfiles/base/Dockerfile.rhel9.4
+++ b/dockerfiles/base/Dockerfile.rhel9.4
@@ -70,6 +70,7 @@ RUN dnf update -y && dnf install -y \
         python3.11 \
         python3.11-devel \
         python3.11-rpm \
+        python3.11-pip \
         unzip \
         wget \
         zlib-devel && \
@@ -87,16 +88,26 @@ RUN alternatives --install /usr/bin/python3 python3 /usr/bin/python3.11 2 && \
 ENV PIP_DISABLE_PIP_VERSION_CHECK=1
 ENV PIP_NO_CACHE_DIR=on
 
-RUN wget https://bootstrap.pypa.io/get-pip.py && \
-    python3 get-pip.py && \
-    rm -f get-pip.py && \
-    python3 -m pip install setuptools==79.0.1 wheel && \
+RUN python3 -m pip install setuptools==79.0.1 wheel && \
     python3 -m pip install --upgrade Jinja2 protobuf urllib3 requests
 
-COPY install_efa.sh .
-RUN ./install_efa.sh && rm install_efa.sh && rm -rf /etc/ld.so.conf.d/efa.conf /etc/profile.d/efa.sh
+RUN dnf install -y \
+        libnl3 \
+        pciutils \
+        pciutils-libs \
+        ibacm \
+        infiniband-diags \
+        libibumad \
+        libibverbs \
+        libibverbs-utils \
+        librdmacm \
+        librdmacm-utils \
+        python3-pyverbs \
+        rdma-core rdma-core-devel
 
 ENV OPENMPI_VERSION=4.1.6
+# Get hash from: https://www.open-mpi.org/software/ompi/
+ENV OPENMPI_SHA256=44da277b8cdc234e71c62473305a09d63f4dcca292ca40335aab7c4bf0e6a566
 ENV MPI_ROOT=/opt/habanalabs/openmpi
 ENV LD_LIBRARY_PATH=${MPI_ROOT}/lib:/usr/lib/habanalabs:$LD_LIBRARY_PATH
 ENV PATH=${MPI_ROOT}/bin:$PATH
@@ -132,6 +143,7 @@ ENV RDMA_CORE_ROOT=/opt/habanalabs/rdma-core/src
 ENV RDMA_CORE_LIB=${RDMA_CORE_ROOT}/build/lib
 
 RUN wget -q -O /tmp/openmpi-${OPENMPI_VERSION}.tar.gz https://download.open-mpi.org/release/open-mpi/v4.1/openmpi-${OPENMPI_VERSION}.tar.gz && \
+    echo "${OPENMPI_SHA256}  /tmp/openmpi-${OPENMPI_VERSION}.tar.gz" | sha256sum -c -  && \
     tar -xzf /tmp/openmpi-${OPENMPI_VERSION}.tar.gz -C /tmp && \
     cd /tmp/openmpi-${OPENMPI_VERSION} && \
     ./configure --prefix=${MPI_ROOT} --with-verbs && \
@@ -152,4 +164,4 @@ RUN mkdir -p /var/run/sshd && \
 ENV GC_KERNEL_PATH=/usr/lib/habanalabs/libtpc_kernels.so
 ENV HABANA_LOGS=/var/log/habana_logs/
 ENV HABANA_SCAL_BIN_PATH=/opt/habanalabs/engines_fw
-ENV HABANA_PLUGINS_LIB_PATH=/opt/habanalabs/habana_plugins
\ No newline at end of file
+ENV HABANA_PLUGINS_LIB_PATH=/opt/habanalabs/habana_plugins
diff --git a/dockerfiles/base/Dockerfile.rhel9.4-py312 b/dockerfiles/base/Dockerfile.rhel9.4-py312
index fff3b4c..4bd31b2 100644
--- a/dockerfiles/base/Dockerfile.rhel9.4-py312
+++ b/dockerfiles/base/Dockerfile.rhel9.4-py312
@@ -70,6 +70,7 @@ RUN dnf update -y && dnf install -y \
         python3.12-devel \
         python3.12-libs \
         python3.12-rpm \
+        python3.12-pip \
         unzip \
         wget \
         zlib-devel && \
@@ -85,14 +86,23 @@ RUN alternatives --install /usr/bin/python3 python3 /usr/bin/python3.12 2 && \
 ENV PIP_DISABLE_PIP_VERSION_CHECK=1
 ENV PIP_NO_CACHE_DIR=on
 
-RUN wget https://bootstrap.pypa.io/get-pip.py && \
-    python3 get-pip.py && \
-    rm -f get-pip.py && \
-    python3 -m pip install setuptools==79.0.1 wheel && \
+RUN python3 -m pip install setuptools==79.0.1 wheel && \
     python3 -m pip install --upgrade Jinja2 protobuf urllib3 requests
 
-COPY install_efa.sh .
-RUN ./install_efa.sh && rm install_efa.sh && rm -rf /etc/ld.so.conf.d/efa.conf /etc/profile.d/efa.sh
+
+RUN dnf install -y \
+        libnl3 \
+        pciutils \
+        pciutils-libs \
+        ibacm \
+        infiniband-diags \
+        libibumad \
+        libibverbs \
+        libibverbs-utils \
+        librdmacm \
+        librdmacm-utils \
+        python3-pyverbs \
+        rdma-core rdma-core-devel
 
 ENV OPENMPI_VERSION=4.1.6
 ENV MPI_ROOT=/opt/habanalabs/openmpi
@@ -150,4 +160,4 @@ RUN mkdir -p /var/run/sshd && \
 ENV GC_KERNEL_PATH=/usr/lib/habanalabs/libtpc_kernels.so
 ENV HABANA_LOGS=/var/log/habana_logs/
 ENV HABANA_SCAL_BIN_PATH=/opt/habanalabs/engines_fw
-ENV HABANA_PLUGINS_LIB_PATH=/opt/habanalabs/habana_plugins
\ No newline at end of file
+ENV HABANA_PLUGINS_LIB_PATH=/opt/habanalabs/habana_plugins
diff --git a/dockerfiles/base/Dockerfile.rhel9.6 b/dockerfiles/base/Dockerfile.rhel9.6
index f969811..9f1e7f9 100644
--- a/dockerfiles/base/Dockerfile.rhel9.6
+++ b/dockerfiles/base/Dockerfile.rhel9.6
@@ -73,6 +73,7 @@ RUN dnf update -y && dnf install -y \
         python3-devel \
         python3.12 \
         python3.12-devel \
+        python3.12-pip \
         unzip \
         wget \
         zlib-devel && \
@@ -86,16 +87,26 @@ RUN alternatives --install /usr/bin/python3 python3 /usr/bin/python3.12 2 && \
 ENV PIP_DISABLE_PIP_VERSION_CHECK=1
 ENV PIP_NO_CACHE_DIR=on
 
-RUN wget https://bootstrap.pypa.io/get-pip.py && \
-    python3 get-pip.py && \
-    rm -f get-pip.py && \
-    python3 -m pip install setuptools==79.0.1 wheel && \
+RUN python3 -m pip install setuptools==79.0.1 wheel && \
     python3 -m pip install --upgrade Jinja2 protobuf urllib3 requests
 
-COPY install_efa.sh .
-RUN ./install_efa.sh && rm install_efa.sh && rm -rf /etc/ld.so.conf.d/efa.conf /etc/profile.d/efa.sh
+RUN dnf install -y \
+        libnl3 \
+        pciutils \
+        pciutils-libs \
+        ibacm \
+        infiniband-diags \
+        libibumad \
+        libibverbs \
+        libibverbs-utils \
+        librdmacm \
+        librdmacm-utils \
+        python3-pyverbs \
+        rdma-core rdma-core-devel
 
 ENV OPENMPI_VERSION=4.1.6
+# Get hash from: https://www.open-mpi.org/software/ompi/
+ENV OPENMPI_SHA256=44da277b8cdc234e71c62473305a09d63f4dcca292ca40335aab7c4bf0e6a566
 ENV MPI_ROOT=/opt/habanalabs/openmpi
 ENV LD_LIBRARY_PATH=${MPI_ROOT}/lib:/usr/lib/habanalabs:$LD_LIBRARY_PATH
 ENV PATH=${MPI_ROOT}/bin:$PATH
@@ -127,7 +138,10 @@ RUN dnf install -y \
 ENV RDMA_CORE_ROOT=/opt/habanalabs/rdma-core/src
 ENV RDMA_CORE_LIB=${RDMA_CORE_ROOT}/build/lib
 
+
+
 RUN wget -q -O /tmp/openmpi-${OPENMPI_VERSION}.tar.gz https://download.open-mpi.org/release/open-mpi/v4.1/openmpi-${OPENMPI_VERSION}.tar.gz && \
+    echo "${OPENMPI_SHA256}  /tmp/openmpi-${OPENMPI_VERSION}.tar.gz" | sha256sum -c -  && \
     tar -xzf /tmp/openmpi-${OPENMPI_VERSION}.tar.gz -C /tmp && \
     cd /tmp/openmpi-${OPENMPI_VERSION} && \
     ./configure --prefix=${MPI_ROOT} --with-verbs && \
@@ -148,4 +162,4 @@ RUN mkdir -p /var/run/sshd && \
 ENV GC_KERNEL_PATH=/usr/lib/habanalabs/libtpc_kernels.so
 ENV HABANA_LOGS=/var/log/habana_logs/
 ENV HABANA_SCAL_BIN_PATH=/opt/habanalabs/engines_fw
-ENV HABANA_PLUGINS_LIB_PATH=/opt/habanalabs/habana_plugins
\ No newline at end of file
+ENV HABANA_PLUGINS_LIB_PATH=/opt/habanalabs/habana_plugins