diff --git a/Dockerfile.lint b/Dockerfile.lint
new file mode 100644
index 0000000..ebe5235
--- /dev/null
+++ b/Dockerfile.lint
@@ -0,0 +1,6 @@
+FROM ubuntu:16.04
+RUN apt-get update
+
+# Install Linting Tools
+RUN apt-get install -y clang clang-tidy clang-format make git python3
+

diff --git a/Dockerfile.lint b/Dockerfile.lint
new file mode 100644
index 0000000..ebe5235
--- /dev/null
+++ b/Dockerfile.lint
@@ -0,0 +1,6 @@
+FROM ubuntu:16.04
+RUN apt-get update
+
+# Install Linting Tools
+RUN apt-get install -y clang clang-tidy clang-format make git python3
+
diff --git a/Jenkinsfile b/Jenkinsfile
index d6ccbf4..3e62577 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -15,10 +15,14 @@
 		archiveArtifacts artifacts: 'build/hello*', fingerprint: true
             }
         }
-        stage('Tidy') {
-            agent { docker 'jenkins-build-agent:latest' }
+        stage('Linting') {
+            agent {
+		dockerfile {
+			filename 'Dockerfile.lint'
+		}
+	    }
             steps {
-                echo 'Tidy..'
+                echo 'Linting..'
 		sh 'make tidy || true'
 		junit 'build/*.xml'
             }