diff --git a/upgrade-mcp-release.groovy b/upgrade-mcp-release.groovy
index 7eb39b1..2770a07 100644
--- a/upgrade-mcp-release.groovy
+++ b/upgrade-mcp-release.groovy
@@ -356,10 +356,7 @@
                 error('Pillar data is broken for Salt master node! Please check it manually and re-run pipeline.')
             }
             if (!batchSize) {
-                def workerThreads = salt.getReturnValues(salt.getPillar(venvPepper, "I@salt:master", "salt:master:worker_threads", null)).toString()
-                if (workerThreads.isInteger() && workerThreads.toInteger() > 0) {
-                   batchSize = workerThreads
-                }
+                batchSize = salt.getWorkerThreads(venvPepper)
             }
 
             stage('Update Reclass and Salt-Formulas') {