diff --git a/Jenkinsfile b/Jenkinsfile
index 1fb7e692..24886a8f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,22 +1,22 @@
 pipeline {
-    agent {
-        dockerfile {
-            args '--group-add=20 --group-add=46 --device-cgroup-rule="c 189:* rmw" --device-cgroup-rule="c 166:* rmw" -v /dev/bus/usb:/dev/bus/usb -e TESTER=0000000000000000325866e629a25623 -e EUT=RunningFromRAM'
-        }
-    }
+    agent any
     stages {
-        stage('Build (Host)') {
+        stage('Build Docker Image') {
+            steps {
+                sh 'docker build -t hackrf $GIT_URL'
+            }
+        }
+        stage('Test Suite') {
+            agent {
+                docker {
+                    image 'hackrf'
+                    reuseNode true
+                    args '--group-add=20 --group-add=46 --device-cgroup-rule="c 189:* rmw" --device-cgroup-rule="c 166:* rmw" -v /dev/bus/usb:/dev/bus/usb -e TESTER=0000000000000000325866e629a25623 -e EUT=RunningFromRAM'
+                }
+            }
             steps {
                 sh './ci-scripts/install-host.sh'
-            }
-        }
-        stage('Build (Firmware)') {
-            steps {
                 sh './ci-scripts/install-firmware.sh'
-            }
-        }
-        stage('Test') {
-            steps {
                 sh 'hubs all off'
                 retry(3) {
                     sh './ci-scripts/test-host.sh'
@@ -34,12 +34,12 @@ pipeline {
                 }
                 sh 'hubs all off'
                 sh 'python3 ci-scripts/test-sgpio-debug.py'
+                sh 'hubs all reset'
             }
         }
     }
     post {
         always {
-            sh 'hubs all reset'
             cleanWs(cleanWhenNotBuilt: false,
                     deleteDirs: true,
                     disableDeferredWipeout: true,