diff --git a/tensorflow/tools/ci_build/Dockerfile.rbe.cuda10.0-cudnn7-ubuntu16.04-manylinux2010 b/tensorflow/tools/ci_build/Dockerfile.rbe.cuda10.0-cudnn7-ubuntu16.04-manylinux2010
index 586bd67237a..7795fa2d759 100644
--- a/tensorflow/tools/ci_build/Dockerfile.rbe.cuda10.0-cudnn7-ubuntu16.04-manylinux2010
+++ b/tensorflow/tools/ci_build/Dockerfile.rbe.cuda10.0-cudnn7-ubuntu16.04-manylinux2010
@@ -54,7 +54,8 @@ RUN /install/install_latest_clang.sh
 RUN /install/install_bazel.sh
 
 # Install python 3.6.
-RUN add-apt-repository ppa:jonathonf/python-3.6 && \
+RUN yes "" | add-apt-repository ppa:deadsnakes/ppa
+RUN apt-get update && apt-get install -y \
     apt-get update && apt-get install -y \
     python3.6 python3.6-dev python3-pip python3.6-venv && \
     rm -rf /var/lib/apt/lists/* && \
diff --git a/tensorflow/tools/ci_build/Dockerfile.rbe.cuda10.1-cudnn7-ubuntu16.04-manylinux2010 b/tensorflow/tools/ci_build/Dockerfile.rbe.cuda10.1-cudnn7-ubuntu16.04-manylinux2010
index f48f6595a7e..3f819c72842 100644
--- a/tensorflow/tools/ci_build/Dockerfile.rbe.cuda10.1-cudnn7-ubuntu16.04-manylinux2010
+++ b/tensorflow/tools/ci_build/Dockerfile.rbe.cuda10.1-cudnn7-ubuntu16.04-manylinux2010
@@ -56,7 +56,8 @@ RUN /install/install_latest_clang.sh
 RUN /install/install_bazel.sh
 
 # Install python 3.6.
-RUN add-apt-repository ppa:jonathonf/python-3.6 && \
+RUN yes "" | add-apt-repository ppa:deadsnakes/ppa
+RUN apt-get update && apt-get install -y \
     apt-get update && apt-get install -y \
     python3.6 python3.6-dev python3-pip python3.6-venv && \
     rm -rf /var/lib/apt/lists/* && \
diff --git a/tensorflow/tools/ci_build/Dockerfile.rbe.ubuntu16.04-manylinux2010 b/tensorflow/tools/ci_build/Dockerfile.rbe.ubuntu16.04-manylinux2010
index 93ad40dbb99..de6a766a7c4 100644
--- a/tensorflow/tools/ci_build/Dockerfile.rbe.ubuntu16.04-manylinux2010
+++ b/tensorflow/tools/ci_build/Dockerfile.rbe.ubuntu16.04-manylinux2010
@@ -55,8 +55,8 @@ env GOROOT=/usr/local/go
 env PATH=$GOROOT/bin:$PATH
 
 # Install python 3.6.
-RUN add-apt-repository ppa:jonathonf/python-3.6 && \
-    apt-get update && apt-get install -y \
+RUN yes "" | add-apt-repository ppa:deadsnakes/ppa
+RUN apt-get update && apt-get install -y \
     python3.6 python3.6-dev python3-pip python3.6-venv && \
     rm -rf /var/lib/apt/lists/* && \
     python3.6 -m pip install pip --upgrade && \