diff --git a/Jenkinsfile b/Jenkinsfile
index 117749d..f40d65b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,24 +1,36 @@
-node {
-    stage("Checkout") {
-        checkout scm
+pipeline {
+    agent {
+        dockerfile true
     }
-    stage("Test") {
-        sh 'make test'
-    }
-    stage("Build") {
-        sh 'make package'
-        stash name: "deb-files", includes: "deb_dist/*.deb"
-    }
-    stage("Repo Component") {
-        releaseDir = "ReleaseTWO"
-        unstash "deb-files"
-        sh '''
-            mkdir -p pool/osmclient
-            mv deb_dist/*.deb pool/osmclient/
-            mkdir -p dists/${releaseDir}/unstable/osmclient/binary-amd64/
-            apt-ftparchive packages pool/osmclient > dists/${releaseDir}/unstable/osmclient/binary-amd64/Packages
-            gzip -9fk dists/${releaseDir}/unstable/osmclient/binary-amd64/Packages
-            '''
-        archiveArtifacts artifacts: "dists/**,pool/osmclient/*.deb"
+    stages {
+        stage("Checkout") {
+            steps {
+                checkout scm
+            }
+        }
+        stage("Test") {
+            steps {
+                sh 'make -j4 test'
+            }
+        }
+        stage("Build") {
+            steps {
+                sh 'make package'
+                stash name: "deb-files", includes: "deb_dist/*.deb"
+            }
+        }
+        stage("Repo Component") {
+            steps {
+                unstash "deb-files"
+                sh '''
+                    mkdir -p pool/osmclient
+                    mv deb_dist/*.deb pool/osmclient/
+                    mkdir -p dists/unstable/osmclient/binary-amd64/
+                    apt-ftparchive packages pool/osmclient > dists/unstable/osmclient/binary-amd64/Packages
+                    gzip -9fk dists/unstable/osmclient/binary-amd64/Packages
+                    '''
+                archiveArtifacts artifacts: "dists/**,pool/osmclient/*.deb"
+            }
+        }
     }
 }