diff --git a/Jenkinsfile b/Jenkinsfile
index 956ba807..0f4c9df4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,46 +1,51 @@
-properties([
-    [$class: 'BuildDiscarderProperty', strategy: [$class: 'LogRotator', numToKeepStr: '20']],
-    [$class: 'GithubProjectProperty', projectUrlStr: 'https://github.com/coreos/matchbox'],
-    [$class: 'PipelineTriggersJobProperty', triggers: [
-      [$class: 'GitHubPushTrigger'],
-    ]]
-])
-parallel (
-  etcd3: {
-    node('fedora && bare-metal') {
-      stage('etcd3') {
-        timeout(time:5, unit:'MINUTES') {
-          checkout scm
-          sh '''#!/bin/bash -e
-          export ASSETS_DIR=~/assets; ./tests/smoke/etcd3
-          '''
-        }
-      }
+pipeline {
+  agent none
+
+  options {
+    timeout(time:45, unit:'MINUTES')
+    buildDiscarder(logRotator(numToKeepStr:'20'))
+  }
+
+  stages {
+    stage('Cluster Tests') {
+      steps {
+        parallel (
+          etcd3: {
+            node('fedora && bare-metal') {
+              timeout(time:5, unit:'MINUTES') {
+                checkout scm
+                sh '''#!/bin/bash -e
+                export ASSETS_DIR=~/assets; ./tests/smoke/etcd3
+                '''
+                deleteDir()
+              }
+            }
+          },
+          bootkube: {
+            node('fedora && bare-metal') {
+              timeout(time:12, unit:'MINUTES') {
+                checkout scm          
+                sh '''#!/bin/bash -e
+                chmod 600 ./tests/smoke/fake_rsa
+                export ASSETS_DIR=~/assets; ./tests/smoke/bootkube
+                '''
+                deleteDir()
+              }
+            }
+          },
+          "etcd3-terraform": {
+            node('fedora && bare-metal') {
+              timeout(time:10, unit:'MINUTES') {
+                checkout scm
+                sh '''#!/bin/bash -e
+                export ASSETS_DIR=~/assets; export CONFIG_DIR=~/matchbox/examples/etc/matchbox; ./tests/smoke/etcd3-terraform
+                '''
+                deleteDir()
+              }
+            }
+          },
+        )
+      }      
     }
-  },
-  bootkube: {
-    node('fedora && bare-metal') {
-      stage('bootkube') {
-        timeout(time:12, unit:'MINUTES') {
-          checkout scm          
-          sh '''#!/bin/bash -e
-          chmod 600 ./tests/smoke/fake_rsa
-          export ASSETS_DIR=~/assets; ./tests/smoke/bootkube
-          '''
-        }
-      }
-    }
-  },
-  "etcd3-terraform": {
-    node('fedora && bare-metal') {
-      stage('etcd3-terraform') {
-        timeout(time:10, unit:'MINUTES') {
-          checkout scm
-          sh '''#!/bin/bash -e
-          export ASSETS_DIR=~/assets; export CONFIG_DIR=~/matchbox/examples/etc/matchbox; ./tests/smoke/etcd3-terraform
-          '''
-        }
-      }
-    }
-  },
-)
+  }
+}