diff --git a/Jenkinsfile.d/core/package b/Jenkinsfile.d/core/package
index f9b36159..14ccbb50 100644
--- a/Jenkinsfile.d/core/package
+++ b/Jenkinsfile.d/core/package
@@ -3,6 +3,7 @@ pipeline {
     kubernetes {
       yamlFile 'PodTemplates.d/package-linux.yaml'
       workingDir '/home/jenkins/agent'
+      retries 2 // Retry in case of agent error caused by controller restart or pod deletion for instance
     }
   }
 
diff --git a/Jenkinsfile.d/core/release b/Jenkinsfile.d/core/release
index 2764a9fa..2eed3a66 100644
--- a/Jenkinsfile.d/core/release
+++ b/Jenkinsfile.d/core/release
@@ -4,6 +4,7 @@
   Jenkins Plugins:
     * Azure-Credentials
     * SSH-agent
+    * Kubernetes
 */
 
 pipeline {
diff --git a/Jenkinsfile.d/core/stable b/Jenkinsfile.d/core/stable
index 131e2eb5..0d60a5dd 100644
--- a/Jenkinsfile.d/core/stable
+++ b/Jenkinsfile.d/core/stable
@@ -1,9 +1,5 @@
 pipeline {
-
-  agent {
-    kubernetes {
-    }
-  }
+  agent none
 
   options {
     disableConcurrentBuilds()
diff --git a/Jenkinsfile.d/core/stable-rc b/Jenkinsfile.d/core/stable-rc
index 99c8d0b5..55b73c0d 100644
--- a/Jenkinsfile.d/core/stable-rc
+++ b/Jenkinsfile.d/core/stable-rc
@@ -1,9 +1,5 @@
 pipeline {
-
-  agent {
-    kubernetes {
-    }
-  }
+  agent none
 
   options {
     disableConcurrentBuilds()
diff --git a/Jenkinsfile.d/core/weekly b/Jenkinsfile.d/core/weekly
index a9aaa33d..2bb90ca3 100644
--- a/Jenkinsfile.d/core/weekly
+++ b/Jenkinsfile.d/core/weekly
@@ -1,9 +1,5 @@
 pipeline {
-
-  agent {
-    kubernetes {
-    }
-  }
+  agent none
 
   options {
     disableConcurrentBuilds()