diff --git a/tensorflow/tools/docker/Dockerfile b/tensorflow/tools/docker/Dockerfile
index 69ae860e23b..d8a78395420 100644
--- a/tensorflow/tools/docker/Dockerfile
+++ b/tensorflow/tools/docker/Dockerfile
@@ -13,6 +13,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         python \
         python-dev \
         rsync \
+        software-properties-common \
         unzip \
         && \
     apt-get clean && \
diff --git a/tensorflow/tools/docker/Dockerfile.devel-gpu b/tensorflow/tools/docker/Dockerfile.devel-gpu
index 226af11bcc6..2008ccd75af 100644
--- a/tensorflow/tools/docker/Dockerfile.devel-gpu
+++ b/tensorflow/tools/docker/Dockerfile.devel-gpu
@@ -85,8 +85,10 @@ RUN git clone -b r0.10 --recursive --recurse-submodules https://github.com/tenso
 WORKDIR /tensorflow
 
 # Configure the build for our CUDA configuration.
+ENV CUDA_PATH /usr/local/cuda
 ENV CUDA_TOOLKIT_PATH /usr/local/cuda
-ENV CUDNN_INSTALL_PATH /usr/local/cuda
+ENV CUDNN_INSTALL_PATH /usr/lib/x86_64-linux-gnu
+ENV LD_LIBRARY_PATH /usr/local/cuda/lib64:/usr/local/cuda/extras/CUPTI/lib64
 ENV TF_NEED_CUDA 1
 
 RUN ./configure && \
@@ -96,9 +98,6 @@ RUN ./configure && \
 
 WORKDIR /root
 
-# Set up CUDA variables
-ENV CUDA_PATH /usr/local/cuda
-
 # TensorBoard
 EXPOSE 6006
 # IPython
diff --git a/tensorflow/tools/docker/Dockerfile.gpu b/tensorflow/tools/docker/Dockerfile.gpu
index ed1b79c1359..428f450d92d 100644
--- a/tensorflow/tools/docker/Dockerfile.gpu
+++ b/tensorflow/tools/docker/Dockerfile.gpu
@@ -13,6 +13,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         python \
         python-dev \
         rsync \
+        software-properties-common \
         unzip \
         && \
     apt-get clean && \