diff --git a/Jenkinsfile b/Jenkinsfile
index 90d1920..763c0c7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -38,7 +38,13 @@
             }
           }
           stage('MacOSX Build') {
-            agent { docker 'macosx-build-agent:latest' }
+            agent { 
+              docker {
+                image 'macosx-build-agent:latest'
+                args '-u 0:0'
+              }
+            }
+            // agent { docker 'macosx-build-agent:latest' }
             steps {
               echo 'Building..'
               sh 'make build/hello-macosx.bin'
@@ -46,7 +52,13 @@
             }
           }
           stage('Linting') {
-            agent { docker 'lint-agent:latest' }
+            agent { 
+              docker {
+                image 'lint-agent:latest'
+                args '-u 0:0'
+              }
+            }
+            // agent { docker 'lint-agent:latest' }
             steps {
               echo 'Linting..'
               sh 'make tidy || true'
@@ -57,7 +69,13 @@
         }
       }
       stage('Test') {
-        agent { docker 'linux-build-agent:latest' }
+        agent { 
+          docker {
+            image 'linux-build-agent:latest'
+            args '-u 0:0'
+          }
+        }
+        // agent { docker 'linux-build-agent:latest' }
         steps {
           echo 'Testing..'
           sh 'make test || true'
@@ -65,7 +83,13 @@
         }
       }
       stage('Deploy') {
-        agent { docker 'linux-build-agent:latest' }
+        agent { 
+          docker {
+            image 'linux-build-agent:latest'
+            args '-u 0:0'
+          }
+        }
+        // agent { docker 'linux-build-agent:latest' }
         when {
           expression {
             currentBuild.result == null || currentBuild.result == 'SUCCESS'