diff --git a/Jenkinsfile b/Jenkinsfile
index db3989b..3ecb2f2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,5 +1,7 @@
 pipeline {
-   agent any
+   agent {
+      label 'jdk8'
+   }
 
    options {
       buildDiscarder(logRotator(numToKeepStr:'10'))
@@ -8,19 +10,20 @@ pipeline {
    stages {
       stage('Build') {
          steps {
-            sh 'mvn clean package'
+            container('maven8') {
+               sh 'mvn clean package'
+            }
          }
       }
-
       stage('Development Tests') {
          when {
+            beforeAgent true
             branch 'development'
          }
          steps {
             echo "Run the development tests!"
          }
       }
-      
       stage('Masters Tests') {
          when {
             branch 'master'
@@ -29,6 +32,5 @@ pipeline {
             echo "Run the master tests!"
          }
       }
-
    }
 }