diff --git a/Makefile b/Makefile
index 05fc1c0..39cffe6 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ setup-venv:
 test: test-style test-functional
 
 test-style:
-	cd rootfs && flake8 --show-pep8 --show-source --config=setup.cfg .
+	cd rootfs && flake8 --show-source --config=setup.cfg .
 
 test-functional:
 	@echo "Implement functional tests in _tests directory"
diff --git a/rootfs/deploy.py b/rootfs/deploy.py
index 8313b70..ff2e9ee 100755
--- a/rootfs/deploy.py
+++ b/rootfs/deploy.py
@@ -58,7 +58,8 @@ def get_registry_name():
     elif registryLocation == "gcr":
         return hostname + "/" + os.getenv('DEIS_REGISTRY_GCS_PROJ_ID')
     else:
-        return os.getenv("DEIS_REGISTRY_SERVICE_HOST") + ":" + os.getenv("DEIS_REGISTRY_SERVICE_PORT")  # noqa: E501
+        return "{}:{}".format(os.getenv("DEIS_REGISTRY_SERVICE_HOST"),
+                              os.getenv("DEIS_REGISTRY_SERVICE_PORT"))
 
 
 def download_file(tar_path):
@@ -80,6 +81,7 @@ def download_file(tar_path):
     ]
     subprocess.check_call(command)
 
+
 tar_path = os.getenv('TAR_PATH')
 if tar_path:
     if os.path.exists("/var/run/secrets/deis/objectstore/creds/"):
diff --git a/rootfs/dev_requirements.txt b/rootfs/dev_requirements.txt
index 4eea563..5868d09 100644
--- a/rootfs/dev_requirements.txt
+++ b/rootfs/dev_requirements.txt
@@ -1,2 +1 @@
-flake8==2.5.4
-
+flake8==3.2.1