diff --git a/cicd/pipelines/global/pbuilder_native.jenkins b/cicd/pipelines/global/pbuilder_arm64.jenkins
similarity index 90%
rename from cicd/pipelines/global/pbuilder_native.jenkins
rename to cicd/pipelines/global/pbuilder_arm64.jenkins
index 57834ca..0057146 100644
--- a/cicd/pipelines/global/pbuilder_native.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-native"
+def workspace = "${home}/workspace/build-pbuilder-arm64"
 def workdir = "${workspace}/src"
 
 podTemplate(label: label,
@@ -41,13 +41,13 @@
             stage('Build') {
                 container('debian') {
                     sh """
-                       bash -c 'source build/setup.sh; m prereqs \$ROOTDIR/cache/native-base.tgz; exit \$?'
+                       bash -c 'source build/setup.sh; m prereqs \$ROOTDIR/cache/arm64-base.tgz; exit \$?'
                        """
                 }
             }
 
             stage('Deploy') {
-                archiveArtifacts artifacts: "cache/native-base.tgz", fingerprint: true
+                archiveArtifacts artifacts: "cache/arm64-base.tgz", fingerprint: true
             }
         }
     }
diff --git a/cicd/pipelines/global/pbuilder_native.jenkins b/cicd/pipelines/global/pbuilder_armhf.jenkins
similarity index 87%
copy from cicd/pipelines/global/pbuilder_native.jenkins
copy to cicd/pipelines/global/pbuilder_armhf.jenkins
index 57834ca..d9cfde0 100644
--- a/cicd/pipelines/global/pbuilder_native.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-native"
+def workspace = "${home}/workspace/build-pbuilder-arm64"
 def workdir = "${workspace}/src"
 
 podTemplate(label: label,
@@ -20,7 +20,7 @@
                 container('debian') {
                     sh """
                        apt-get update
-                       apt-get -y install build-essential python curl git qemu-user-static sudo
+                :      apt-get -y install build-essential python curl git qemu-user-static sudo
                        curl https://storage.googleapis.com/git-repo-downloads/repo > /usr/local/bin/repo
                        chmod a+x /usr/local/bin/repo
                        mkdir -p ${workdir}/.repo/local_manifests
@@ -41,13 +41,13 @@
             stage('Build') {
                 container('debian') {
                     sh """
-                       bash -c 'source build/setup.sh; m prereqs \$ROOTDIR/cache/native-base.tgz; exit \$?'
+                       bash -c 'source build/setup.sh; m prereqs \$ROOTDIR/cache/armhf-base.tgz; exit \$?'
                        """
                 }
             }
 
             stage('Deploy') {
-                archiveArtifacts artifacts: "cache/native-base.tgz", fingerprint: true
+                archiveArtifacts artifacts: "cache/armhf-base.tgz", fingerprint: true
             }
         }
     }
diff --git a/vars/functions.groovy b/vars/functions.groovy
index 3274c96..1ca07bb 100644
--- a/vars/functions.groovy
+++ b/vars/functions.groovy
@@ -37,7 +37,8 @@
     if (needsNative) {
         copyArtifacts(projectName: 'global.pbuilder.native', filter: '**/*.tgz')
     } else {
-        copyArtifacts(projectName: 'global.pbuilder.cross', filter: '**/*.tgz')
+        copyArtifacts(projectName: 'global.pbuilder.arm64', filter: '**/*.tgz')
+        copyArtifacts(projectName: 'global.pbuilder.armhf', filter: '**/*.tgz')
     }
 }