diff --git a/cicd/pipelines/global/pbuilder_arm64.jenkins b/cicd/pipelines/global/pbuilder_arm64.jenkins
index 4703128..b013aea 100644
--- a/cicd/pipelines/global/pbuilder_arm64.jenkins
+++ b/cicd/pipelines/global/pbuilder_arm64.jenkins
@@ -2,7 +2,7 @@
 
 def label = "build-jenkins-operator-${UUID.randomUUID().toString()}"
 def home = "/home/jenkins"
-def workspace = "${home}/workspace/build-pbuilder-arm64"
+def workspace = "${home}/agent/workspace/build-pbuilder-arm64"
 def workdir = "${workspace}/src"
 
 podTemplate(label: label,
diff --git a/cicd/pipelines/global/pbuilder_armhf.jenkins b/cicd/pipelines/global/pbuilder_armhf.jenkins
index 172f2c6..f29b38d 100644
--- a/cicd/pipelines/global/pbuilder_armhf.jenkins
+++ b/cicd/pipelines/global/pbuilder_armhf.jenkins
@@ -2,7 +2,7 @@
 
 def label = "build-jenkins-operator-${UUID.randomUUID().toString()}"
 def home = "/home/jenkins"
-def workspace = "${home}/workspace/build-pbuilder-armhf"
+def workspace = "${home}/agent/workspace/build-pbuilder-armhf"
 def workdir = "${workspace}/src"
 
 podTemplate(label: label,
diff --git a/cicd/pipelines/global/pbuilder_cross.jenkins b/cicd/pipelines/global/pbuilder_cross.jenkins
index d928165..699b3d4 100644
--- a/cicd/pipelines/global/pbuilder_cross.jenkins
+++ b/cicd/pipelines/global/pbuilder_cross.jenkins
@@ -2,7 +2,7 @@
 
 def label = "build-jenkins-operator-${UUID.randomUUID().toString()}"
 def home = "/home/jenkins"
-def workspace = "${home}/workspace/build-pbuilder-cross"
+def workspace = "${home}/agent/workspace/build-pbuilder-cross"
 def workdir = "${workspace}/src"
 
 podTemplate(label: label,
diff --git a/vars/functions.groovy b/vars/functions.groovy
index be727da..ac9ba79 100644
--- a/vars/functions.groovy
+++ b/vars/functions.groovy
@@ -132,7 +132,7 @@
 }
 
 def buildPackagePipeline(boardName, repoType, targetName, packageNames, needsNative = false, includeSources = true) {
-    def workspacePath = "/home/jenkins/workspace"
+    def workspacePath = "/home/jenkins/agent/workspace"
     def buildLabel = "${targetName}-${UUID.randomUUID().toString()}"
     def sourcePath = "${workspacePath}/src"