diff --git a/Jenkinsfile b/Jenkinsfile
index a9b23d2..e289ee1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -3,6 +3,7 @@ pipeline {
         docker {
             image 'mcr.microsoft.com/dotnet/sdk:9.0'
             args '-u root:root'
+            label "${params.AGENT_LABEL ?: 'docker'}"
         }
     }
 
@@ -17,6 +18,7 @@ pipeline {
     parameters {
         string(name: 'GIT_URL', defaultValue: 'file:///SourceCode/repos/AS400API.git', description: 'Git repository URL to clone')
         string(name: 'GIT_BRANCH', defaultValue: 'main', description: 'Branch or ref to build')
+        string(name: 'AGENT_LABEL', defaultValue: 'docker', description: 'Label of Jenkins agent with Docker CLI access')
     }
 
     environment {
@@ -70,7 +72,9 @@ pipeline {
                 dotnet tool install --global dotnet-sonarscanner || dotnet tool update --global dotnet-sonarscanner
                 '''
                 script {
-                    env.PATH = "${env.PATH}:/root/.dotnet/tools"
+                    if (!env.PATH.contains('/root/.dotnet/tools')) {
+                        env.PATH = "${env.PATH}:/root/.dotnet/tools"
+                    }
                 }
             }
         }
@@ -181,7 +185,7 @@ pipeline {
 
     post {
         always {
-            cleanWs()
+            deleteDir()
         }
     }
 }