diff --git a/jjb/pipeline/voltha/bbsim-tests.groovy b/jjb/pipeline/voltha/bbsim-tests.groovy
index df4ad02..aa7712a 100644
--- a/jjb/pipeline/voltha/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/bbsim-tests.groovy
@@ -442,7 +442,7 @@
             script : """
 echo -e "\n** make testTarget=[${testTarget}]"
 mkdir -p ${logsDir}
-export ROBOT_MISC_ARGS="-d ${logsDir} ${params.extraRobotArgs} "
+export ROBOT_MISC_ARGS="-d ${logsDir} ${params.extraRobotArgs}"
 ROBOT_MISC_ARGS+="-v ONOS_SSH_PORT:30115 -v ONOS_REST_PORT:30120 -v NAMESPACE:${volthaNamespace} -v INFRA_NAMESPACE:${infraNamespace} -v container_log_dir:${logsDir} -v logging:${testLogging}"
 export KVSTOREPREFIX=voltha/voltha_voltha
 
diff --git a/jjb/verify/voltha-system-tests.yaml b/jjb/verify/voltha-system-tests.yaml
index a45c619..4a1e44e 100644
--- a/jjb/verify/voltha-system-tests.yaml
+++ b/jjb/verify/voltha-system-tests.yaml
@@ -7,10 +7,10 @@
 
     jobs:
       - 'verify-voltha-system-tests-jobs':
-          build-node: 'ubuntu18.04-basebuild-4c-8g'
+          build-node: 'ubuntu22.04-basebuild-4c-8g'
           branch-regexp: '{all-branches-regexp}'
       - 'verify-voltha-system-tests-jobs-master':
-          build-node: 'ubuntu18.04-basebuild-4c-8g'
+          build-node: 'ubuntu22.04-basebuild-4c-8g'
           branch-regexp: '^master$'
       - 'verify-voltha-system-tests-jobs-py312':
           build-node: 'ubuntu24.04-basebuild-4c-8g'
@@ -18,12 +18,12 @@
           override-branch: 'python312-update'
           branch-regexp: '^python312-update$'
       - 'verify-voltha-system-tests-jobs-voltha-2.13':
-          build-node: 'ubuntu18.04-basebuild-4c-8g'
+          build-node: 'ubuntu22.04-basebuild-4c-8g'
           name-extension: '-voltha-2.13'
           override-branch: 'voltha-2.13'
           branch-regexp: '^voltha-2.13$'
       - 'verify-voltha-system-tests-jobs-voltha-2.11':
-          build-node: 'ubuntu18.04-basebuild-4c-8g'
+          build-node: 'ubuntu22.04-basebuild-4c-8g'
           name-extension: '-voltha-2.11'
           override-branch: 'voltha-2.11'
           branch-regexp: '^voltha-2.11$'
diff --git a/vars/createKubernetesCluster.groovy b/vars/createKubernetesCluster.groovy
index ee05317..7ea398e 100644
--- a/vars/createKubernetesCluster.groovy
+++ b/vars/createKubernetesCluster.groovy
@@ -152,6 +152,8 @@
       echo "** Generate $HOME/.kube/config"
       mkdir -p "$HOME/.kube"
       chmod u=rwx "$HOME/.kube"
+      # Remove current config, if it exists
+      rm -f "$HOME/.kube/config"
       kind get kubeconfig --name ${cfg.name} > "$HOME/.kube/config"
       chmod -R u+w,go-rwx "$HOME/.kube"