diff --git a/tensorflow/tools/tf_sig_build_dockerfiles/devel.requirements.txt b/tensorflow/tools/tf_sig_build_dockerfiles/devel.requirements.txt
index ec3ba90b38ac15..ecfd9c22ffe1cf 100644
--- a/tensorflow/tools/tf_sig_build_dockerfiles/devel.requirements.txt
+++ b/tensorflow/tools/tf_sig_build_dockerfiles/devel.requirements.txt
@@ -34,7 +34,6 @@ gast == 0.4.0
 # be the latest version.
 keras-nightly >= 3.2.0.dev
 tb-nightly ~= 2.17.0.a
-tf-keras-nightly ~= 2.17.0.dev
 # Test dependencies
 grpcio ~= 1.59.0 # Earliest version for Python 3.12
 portpicker ~= 1.6.0
diff --git a/tensorflow/tools/tf_sig_build_dockerfiles/setup.python.sh b/tensorflow/tools/tf_sig_build_dockerfiles/setup.python.sh
index e61aa5780935fc..b1aa6be97f963b 100755
--- a/tensorflow/tools/tf_sig_build_dockerfiles/setup.python.sh
+++ b/tensorflow/tools/tf_sig_build_dockerfiles/setup.python.sh
@@ -90,9 +90,10 @@ python3 -m pip install -U setuptools
 
 if [[ $3 ]]; then
     echo "Runtime mode"
-    python3 -m pip install --no-cache-dir --no-deps tf-keras-nightly~=2.17.0.dev
+    python3 -m pip install --no-cache-dir --no-deps tf-keras-nightly
 else
     echo "Install Requirements"
     # Disable the cache dir to save image space, and install packages
     python3 -m pip install --no-cache-dir -r $REQUIREMENTS -U
+    python3 -m pip install --no-cache-dir --no-deps tf-keras-nightly
 fi
diff --git a/tensorflow/tools/tf_sig_build_dockerfiles/setup.rocm.cs7.sh b/tensorflow/tools/tf_sig_build_dockerfiles/setup.rocm.cs7.sh
index 30fd112d758b64..2b9de69b3d8537 100755
--- a/tensorflow/tools/tf_sig_build_dockerfiles/setup.rocm.cs7.sh
+++ b/tensorflow/tools/tf_sig_build_dockerfiles/setup.rocm.cs7.sh
@@ -35,7 +35,7 @@ fi
 if [ ! -f "/${CUSTOM_INSTALL}" ]; then
 RPM_ROCM_REPO=http://repo.radeon.com/rocm/yum/${ROCM_VERSION_REPO}/main
 echo -e "[ROCm]\nname=ROCm\nbaseurl=$RPM_ROCM_REPO\nenabled=1\ngpgcheck=0" >>/etc/yum.repos.d/rocm.repo
-echo -e "[amdgpu]\nname=amdgpu\nbaseurl=https://repo.radeon.com/amdgpu/latest/rhel/7.9/main/x86_64/\nenabled=1\ngpgcheck=0" >>/etc/yum.repos.d/amdgpu.repo
+echo -e "[amdgpu]\nname=amdgpu\nbaseurl=https://repo.radeon.com/amdgpu/latest/rhel/7/main/x86_64/\nenabled=1\ngpgcheck=0" >>/etc/yum.repos.d/amdgpu.repo
 else
     bash "/${CUSTOM_INSTALL}"
 fi