diff --git a/core/pythonAction/Dockerfile b/core/pythonAction/Dockerfile
index a7a0a043dc961c7c4aa6e03a7435140182058808..056084563406a508eca4336a625bf07f1dea59b8 100644
--- a/core/pythonAction/Dockerfile
+++ b/core/pythonAction/Dockerfile
@@ -1,19 +1,18 @@
 # Dockerfile for python action
-FROM ubuntu
+FROM ubuntu:14.04
 
 ENV DEBIAN_FRONTEND noninteractive
 
-# Upgrade and install python
-RUN apt-get -y purge
-RUN apt-get -y update 
-RUN apt-get -y install --fix-missing python2.7 
-RUN apt-get -y install --fix-missing python2.7-dev
-RUN apt-get clean
-
-# Install Python CGI helpers.
-RUN apt-get -y install --fix-missing python-distribute python-pip
-RUN pip install -U flask
-RUN pip install -U gevent
+# Upgrade and install Python and helpers
+RUN apt-get -y purge && \
+    apt-get -y update && \
+    apt-get -y install --fix-missing python2.7 && \
+    apt-get -y install --fix-missing python2.7-dev && \
+    apt-get -y install --fix-missing python-distribute && \
+    apt-get -y install --fix-missing python-pip && \
+    apt-get clean && \
+    pip install -U flask && \
+    pip install -U gevent
 
 ENV FLASK_PROXY_PORT 8080
 
diff --git a/docker.gradle b/docker.gradle
index 6981a07e1f668a6aabeaa8683102bb8804c87457..53e60a9ca26079680e5a7485ac4a62a8b0e7dbef 100644
--- a/docker.gradle
+++ b/docker.gradle
@@ -19,7 +19,7 @@
 ext {
     dockerRegistry = project.hasProperty('dockerRegistry') ? dockerRegistry + '/' : ''
     dockerImageTag = project.hasProperty('dockerImageTag') ? dockerImageTag : 'latest'
-    dockerTimeout = project.hasProperty('dockerTimeout') ? dockerTimeout.toInteger() : 240
+    dockerTimeout = project.hasProperty('dockerTimeout') ? dockerTimeout.toInteger() : 420
     dockerRetries = project.hasProperty('dockerRetries') ? dockerRetries.toInteger() : 3
     dockerBinary = project.hasProperty('dockerBinary') ? [dockerBinary] : ['docker']
 }
diff --git a/tests/src/system/basic/CLIPythonTests.scala b/tests/src/system/basic/CLIPythonTests.scala
index 4274fd4f6fc6653f7953362bfe648cc3d8bd16fe..911a247db9cb2a70e3b16ca5b95d5dc42b41758a 100644
--- a/tests/src/system/basic/CLIPythonTests.scala
+++ b/tests/src/system/basic/CLIPythonTests.scala
@@ -49,7 +49,6 @@ class CLIPythonTests
     implicit val wskprops = WskProps()
     val wsk = new Wsk()
 
-
     behavior of "Native Python Action"
 
     it should "invoke a blocking action and get the result" in withAssetCleaner(wskprops) {