diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index b7ff5ef..a3e128a 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -484,7 +484,7 @@
       - 'voltha-periodic-test':
           <<: *voltha_214_common
           name: 'periodic-voltha-etcd-test-2.14'
-          build-node: 'ubuntu18.04-basebuild-4c-8g'
+          build-node: 'ubuntu22.04-basebuild-4c-8g'
           extraHelmFlags: '--set onu=2,pon=2'
           testTargets: |
             - target: sanity-multi-kind
@@ -519,7 +519,7 @@
       - 'voltha-periodic-test':
           <<: *voltha_214_common
           name: 'periodic-voltha-memory-leak-test-bbsim-2.14'
-          build-node: 'ubuntu18.04-basebuild-4c-8g'
+          build-node: 'ubuntu22.04-basebuild-4c-8g'
           withMonitoring: true
           logLevel: 'DEBUG'
           testTargets: |
@@ -1046,7 +1046,7 @@
       # -----------------------------------------------------------------------
       - 'voltha-periodic-test':
           name: 'periodic-voltha-etcd-test'
-          build-node: 'ubuntu18.04-basebuild-4c-8g'
+          build-node: 'ubuntu22.04-basebuild-4c-8g'
           code-branch: 'master'
           extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set onu=2,pon=2'
           time-trigger: "H H * * 6"
@@ -1102,7 +1102,7 @@
       # Attention: Due VOL-4703 is not corrected memory leak tests will run in pipeline for DT workflow only!
       - 'voltha-periodic-test':
           name: 'periodic-voltha-memory-leak-test-bbsim'
-          build-node: 'ubuntu18.04-basebuild-4c-8g'
+          build-node: 'ubuntu22.04-basebuild-4c-8g'
           code-branch: 'master'
           time-trigger: "H H * * 6"
           extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set onu=2,controlledActivation=only-onu'
@@ -1134,7 +1134,7 @@
     name: '{name}'
     pipeline-script: 'voltha/bbsim-tests.groovy'
     pipeline-branch: 'master'
-    build-node: 'ubuntu18.04-basebuild-8c-15g'
+    build-node: 'ubuntu22.04-basebuild-8c-15g'
     robot-args: ''
     gerritProject: ''
     gerritRefspec: ''
@@ -1291,8 +1291,7 @@
 - job-template:
     id: 'voltha-patch-test'
     name: 'verify_{project}_sanity-test{name-extension}'
-    #build-node: 'ubuntu18.04-basebuild-4c-8g'
-    build-node: 'ubuntu18.04-basebuild-8c-15g'
+    build-node: 'ubuntu22.04-basebuild-8c-15g'
     pipeline-script: 'voltha/bbsim-tests.groovy'
     pipeline-branch: 'master'
     override-branch: '$GERRIT_BRANCH'
@@ -1466,8 +1465,7 @@
 - job-template:
     id: 'voltha-make-test'
     name: '{name}'
-    #build-node: 'ubuntu18.04-basebuild-4c-8g'
-    build-node: 'ubuntu18.04-basebuild-8c-15g'
+    build-node: 'ubuntu22.04-basebuild-8c-15g'
     pipeline-script: 'voltha/bbsim-tests.groovy'
     pipeline-branch: 'master'
     override-branch: '$GERRIT_BRANCH'
diff --git a/jjb/voltha-e2e/master.yaml b/jjb/voltha-e2e/master.yaml
index 395edb4..a1933bb 100644
--- a/jjb/voltha-e2e/master.yaml
+++ b/jjb/voltha-e2e/master.yaml
@@ -201,8 +201,7 @@
       # -----------------------------------------------------------------------
       - 'voltha-periodic-test':
           name: 'periodic-voltha-dt-test-bbsim-master'
-          # build-node: 'ubuntu18.04-basebuild-4c-8g'
-          build-node: 'ubuntu18.04-basebuild-8c-15g'
+          build-node: 'ubuntu22.04-basebuild-8c-15g'
           pipeline-script: 'voltha/bbsim-tests.groovy'
           pipeline-branch: 'master'
           code-branch: 'master'
@@ -224,8 +223,7 @@
       # -----------------------------------------------------------------------
       - 'voltha-periodic-test':
           name: 'periodic-voltha-dt-fttb-test-bbsim-master'
-          # build-node: 'ubuntu18.04-basebuild-4c-8g'
-          build-node: 'ubuntu18.04-basebuild-8c-15g'
+          build-node: 'ubuntu22.04-basebuild-8c-15g'
           code-branch: 'master'
           time-trigger: "H H * * 6"
           extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF --set onu=2'
diff --git a/requirements.txt b/requirements.txt
index e4e07fd..830865f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,3 @@
-# -*- makefile -*-
-## -----------------------------------------------------------------------
-## -----------------------------------------------------------------------
-
 jenkins-job-builder==6.4.1
 pipdeptree
 jenkins-jobs
@@ -12,5 +8,3 @@
 # Installed on-demand by makefiles/lint/python/{flake8,pylint,tox}.mk
 # pylint
 # tox
-
-# [EOF]