diff --git a/Jenkinsfile b/Jenkinsfile
index b77891bb7..0fd2b00a4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -29,75 +29,102 @@ def phone_steps(String device_type, steps) {
 }
 
 pipeline {
-  agent {
-    docker {
-      image 'python:3.7.3'
-      args '--user=root'
-    }
-  }
+  agent none
   environment {
     COMMA_JWT = credentials('athena-test-jwt')
     TEST_DIR = "/data/openpilot"
   }
 
   stages {
-
-    stage('Release Build') {
-      when {
-        branch 'devel-staging'
-      }
-      steps {
-        phone_steps("eon-build", [
-          ["build release2-staging and dashcam-staging", "cd release && PUSH=1 ./build_release2.sh"],
-        ])
-      }
-    }
-
-    stage('On-device Tests') {
+    stage('openpilot tests') {
       when {
         not {
           anyOf {
-            branch 'master-ci'; branch 'devel'; branch 'devel-staging'; branch 'release2'; branch 'release2-staging'; branch 'dashcam'; branch 'dashcam-staging'
+            branch 'master-ci'; branch 'devel'; branch 'release2'; branch 'release2-staging'; branch 'dashcam'; branch 'dashcam-staging'
           }
         }
       }
-
       parallel {
 
-        stage('Build') {
-          environment {
-            CI_PUSH = "${env.BRANCH_NAME == 'master' ? 'master-ci' : ' '}"
+        stage('PC tests') {
+          agent {
+            dockerfile {
+              filename 'Dockerfile.openpilot'
+              args '--privileged --shm-size=1G --user=root'
+            }
           }
-          steps {
-            phone_steps("eon", [
-              ["build devel", "cd release && CI_PUSH=${env.CI_PUSH} ./build_devel.sh"],
-              ["test openpilot", "nosetests -s selfdrive/test/test_openpilot.py"],
-              //["test cpu usage", "cd selfdrive/test/ && ./test_cpu_usage.py"],
-              ["test car interfaces", "cd selfdrive/car/tests/ && ./test_car_interfaces.py"],
-            ])
+          stages {
+            stage('Build') {
+              steps {
+                sh 'scons -j$(nproc)'
+              }
+            }
+          }
+          post {
+            always {
+              // fix permissions since docker runs as another user
+              sh "chmod -R 777 ."
+            }
           }
         }
 
-        stage('Replay Tests') {
-          steps {
-            phone_steps("eon2", [
-              ["camerad/modeld replay", "cd selfdrive/test/process_replay && ./camera_replay.py"],
-            ])
+        stage('On-device Tests') {
+          agent {
+            docker {
+              image 'python:3.7.3'
+              args '--user=root'
+            }
           }
-        }
+          stages {
+
+            stage('Release Build') {
+              when {
+                branch 'devel-staging'
+              }
+              steps {
+                phone_steps("eon-build", [
+                  ["build release2-staging and dashcam-staging", "cd release && PUSH=1 ./build_release2.sh"],
+                ])
+              }
+            }
+
+            stage('Devel Build') {
+              environment {
+                CI_PUSH = "${env.BRANCH_NAME == 'master' ? 'master-ci' : ' '}"
+              }
+              steps {
+                phone_steps("eon", [
+                  ["build devel", "cd release && CI_PUSH=${env.CI_PUSH} ./build_devel.sh"],
+                  ["test openpilot", "nosetests -s selfdrive/test/test_openpilot.py"],
+                  //["test cpu usage", "cd selfdrive/test/ && ./test_cpu_usage.py"],
+                  ["test car interfaces", "cd selfdrive/car/tests/ && ./test_car_interfaces.py"],
+                ])
+              }
+            }
+
+            stage('Replay Tests') {
+              steps {
+                phone_steps("eon2", [
+                  ["camerad/modeld replay", "cd selfdrive/test/process_replay && ./camera_replay.py"],
+                ])
+              }
+            }
+
+            stage('HW Tests') {
+              steps {
+                phone_steps("eon", [
+                  ["build cereal", "SCONS_CACHE=1 scons -j4 cereal/"],
+                  ["test sounds", "nosetests -s selfdrive/test/test_sounds.py"],
+                  ["test boardd loopback", "nosetests -s selfdrive/boardd/tests/test_boardd_loopback.py"],
+                ])
+              }
+            }
 
-        stage('HW Tests') {
-          steps {
-            phone_steps("eon", [
-              ["build cereal", "SCONS_CACHE=1 scons -j4 cereal/"],
-              ["test sounds", "nosetests -s selfdrive/test/test_sounds.py"],
-              ["test boardd loopback", "nosetests -s selfdrive/boardd/tests/test_boardd_loopback.py"],
-            ])
           }
+
         }
 
       }
     }
-
   }
 }