diff --git a/jjb/api-test.yaml b/jjb/api-test.yaml
index 5bccda3..40ab874 100644
--- a/jjb/api-test.yaml
+++ b/jjb/api-test.yaml
@@ -29,7 +29,8 @@
     parameters:
       - string:
           name: buildNode
-          default: 'ubuntu18.04-basebuild-4c-8g'
+          # default: 'ubuntu18.04-basebuild-4c-8g'
+          default: 'voltha-1804-micro'
           description: 'Name of the Jenkins node to run the job on'
 
       - string:
diff --git a/jjb/bbr.yaml b/jjb/bbr.yaml
index 8db59c0..d8467cc 100644
--- a/jjb/bbr.yaml
+++ b/jjb/bbr.yaml
@@ -48,7 +48,8 @@
     parameters:
       - string:
           name: buildNode
-          default: 'ubuntu18.04-basebuild-4c-8g'
+          # default: 'ubuntu18.04-basebuild-4c-8g'
+          default: 'voltha-1804-micro'
           description: 'Name of the Jenkins node to run the job on'
 
 # [EOF]
diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index c5c4e13..a285d98 100644
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -61,7 +61,7 @@
     # The most frequently used type of Build Executor. Name is per the LF global-jjb.
     # See build node types under "Cloud > Amazon EC2" at
     #  https://jenkins.opencord.org/configure
-    build-node: ubuntu18.04-basebuild-1c-1g
+    build-node: 'ubuntu18.04-basebuild-1c-1g'
 
     # CORD Gerrit server definition, set in configuration
     gerrit-server-name: 'CORD Gerrit'
diff --git a/jjb/device-management.yaml b/jjb/device-management.yaml
index bc25b37..df53616 100644
--- a/jjb/device-management.yaml
+++ b/jjb/device-management.yaml
@@ -28,7 +28,8 @@
     parameters:
       - string:
           name: buildNode
-          default: 'ubuntu18.04-basebuild-4c-8g'
+          # default: 'ubuntu18.04-basebuild-4c-8g'
+          default: 'voltha-1804-micro'
           description: 'Name of the Jenkins node to run the job on'
 
       - string:
diff --git a/jjb/omec-ci.yaml b/jjb/omec-ci.yaml
index 3283c51..bbb678c 100644
--- a/jjb/omec-ci.yaml
+++ b/jjb/omec-ci.yaml
@@ -101,7 +101,8 @@
       - 'docker-publish-github':
           build-timeout: 30
           docker-repo: 'omecproject'
-          build-node: 'ubuntu18.04-basebuild-4c-8g'
+          # build-node: 'ubuntu18.04-basebuild-4c-8g'
+          build-node: 'voltha-1804-micro'
       - 'omec-container'
 
 # for c3po
diff --git a/jjb/triggered-api-test.yaml b/jjb/triggered-api-test.yaml
index 815d54b..38ae606 100644
--- a/jjb/triggered-api-test.yaml
+++ b/jjb/triggered-api-test.yaml
@@ -30,7 +30,8 @@
     parameters:
       - string:
           name: buildNode
-          default: 'ubuntu18.04-basebuild-4c-8g'
+          # default: 'ubuntu18.04-basebuild-4c-8g'
+          default: 'voltha-1804-micro'
           description: 'Name of the Jenkins node to run the job on'
 
       - string:
diff --git a/jjb/verify/bbsim.yaml b/jjb/verify/bbsim.yaml
index bbba989..eb57ab7 100644
--- a/jjb/verify/bbsim.yaml
+++ b/jjb/verify/bbsim.yaml
@@ -51,7 +51,8 @@
       - 'tag-collision-reject':
           dependency-jobs: 'verify_bbsim_licensed'
       - 'make-unit-test':
-          build-node: 'ubuntu18.04-basebuild-4c-8g'
+          # build-node: 'ubuntu18.04-basebuild-4c-8g'
+          build-node: 'voltha-1804-micro'
           dest-gopath: "github.com/opencord"
           unit-test-targets: 'lint sca test'
           unit-test-keep-going: 'false'
diff --git a/jjb/verify/ofagent-go.yaml b/jjb/verify/ofagent-go.yaml
index 7cb54e2..3c912f1 100644
--- a/jjb/verify/ofagent-go.yaml
+++ b/jjb/verify/ofagent-go.yaml
@@ -32,7 +32,8 @@
       - 'tag-collision-reject':
           dependency-jobs: 'verify_ofagent-go_licensed'
       - 'make-unit-test':
-          build-node: 'ubuntu18.04-basebuild-4c-8g'
+          # build-node: 'ubuntu18.04-basebuild-4c-8g'
+          build-node: 'voltha-1804-micro'
           dest-gopath: "github.com/opencord"
           unit-test-targets: 'lint sca test'
           unit-test-keep-going: 'false'
diff --git a/jjb/verify/voltha-go.yaml b/jjb/verify/voltha-go.yaml
index fbf92db..d95619f 100644
--- a/jjb/verify/voltha-go.yaml
+++ b/jjb/verify/voltha-go.yaml
@@ -32,7 +32,8 @@
       - 'tag-collision-reject':
           dependency-jobs: 'verify_voltha-go_licensed'
       - 'make-unit-test':
-          build-node: 'ubuntu18.04-basebuild-4c-8g'
+          # build-node: 'ubuntu18.04-basebuild-4c-8g'
+          build-node: 'voltha-1804-micro'
           build-timeout: 20
           dest-gopath: "github.com/opencord"
           name-extension: "-lint"
diff --git a/jjb/verify/voltha-northbound-bbf-adapter.yaml b/jjb/verify/voltha-northbound-bbf-adapter.yaml
index de8a516..83f18c2 100644
--- a/jjb/verify/voltha-northbound-bbf-adapter.yaml
+++ b/jjb/verify/voltha-northbound-bbf-adapter.yaml
@@ -20,7 +20,8 @@
       - 'tag-collision-reject':
           dependency-jobs: 'verify_voltha-northbound-bbf-adapter_licensed'
       - 'make-unit-test':
-          build-node: 'ubuntu18.04-basebuild-4c-8g'
+          # build-node: 'ubuntu18.04-basebuild-4c-8g'
+          build-node: 'voltha-1804-micro'
           dest-gopath: "github.com/opencord"
           unit-test-targets: 'lint sca test'
           unit-test-keep-going: 'false'
diff --git a/jjb/verify/voltha-openonu-adapter-go.yaml b/jjb/verify/voltha-openonu-adapter-go.yaml
index eec0420..4e9b052 100644
--- a/jjb/verify/voltha-openonu-adapter-go.yaml
+++ b/jjb/verify/voltha-openonu-adapter-go.yaml
@@ -36,7 +36,8 @@
           unit-test-targets: 'lint sca'
           unit-test-keep-going: 'false'
           junit-allow-empty-results: true
-          build-node: 'ubuntu18.04-basebuild-4c-8g'
+          # build-node: 'ubuntu18.04-basebuild-4c-8g'
+          build-node: 'voltha-1804-micro'
       - 'make-unit-test':
           dest-gopath: "github.com/opencord"
           name-extension: "-tests"
diff --git a/jjb/verify/voltha-system-tests.yaml b/jjb/verify/voltha-system-tests.yaml
index dbbda40..bdbd256 100644
--- a/jjb/verify/voltha-system-tests.yaml
+++ b/jjb/verify/voltha-system-tests.yaml
@@ -7,18 +7,22 @@
 
     jobs:
       - 'verify-voltha-system-tests-jobs':
-          build-node: 'ubuntu18.04-basebuild-4c-8g'
+          # build-node: 'ubuntu18.04-basebuild-4c-8g'
+          build-node: 'voltha-1804-micro'
           branch-regexp: '{all-branches-regexp}'
       - 'verify-voltha-system-tests-jobs-master':
-          build-node: 'ubuntu18.04-basebuild-4c-8g'
+          # build-node: 'ubuntu18.04-basebuild-4c-8g'
+          build-node: 'voltha-1804-micro'
           branch-regexp: '^master$'
       - 'verify-voltha-system-tests-jobs-voltha-2.12':
-          build-node: 'ubuntu18.04-basebuild-4c-8g'
+          # build-node: 'ubuntu18.04-basebuild-4c-8g'
+          build-node: 'voltha-1804-micro'
           name-extension: '-voltha-2.12'
           override-branch: 'voltha-2.12'
           branch-regexp: '^voltha-2.12$'
       - 'verify-voltha-system-tests-jobs-voltha-2.11':
-          build-node: 'ubuntu18.04-basebuild-4c-8g'
+          # build-node: 'ubuntu18.04-basebuild-4c-8g'
+          build-node: 'voltha-1804-micro'
           name-extension: '-voltha-2.11'
           override-branch: 'voltha-2.11'
           branch-regexp: '^voltha-2.11$'
diff --git a/jjb/verify/xos.yaml b/jjb/verify/xos.yaml
index 31f0482..eb76ede 100644
--- a/jjb/verify/xos.yaml
+++ b/jjb/verify/xos.yaml
@@ -51,7 +51,8 @@
     jobs:
       - 'python-unit-test':
           build-timeout: 45
-          build-node: 'ubuntu18.04-basebuild-2c-4g'
+          # build-node: 'ubuntu18.04-basebuild-2c-4g'
+          build-node: 'voltha-1804-micro'
       - 'api-test':
           pipeline-script: 'xos-core.groovy'
 
@@ -64,7 +65,7 @@
           pypi-index: 'pypi'
           dependency-jobs: 'version-tag_wildcard'
       - 'docker-publish':
-          maintainers: "onf-bat-admin@opennetworking.org, andy@opennetworking.org, scottb@opennetworking.org"
+          maintainers: "onf-bat-admin@opennetworking.org"
           build-timeout: 30
           docker-repo: 'xosproject'
           dependency-jobs: 'version-tag_wildcard'
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 9938f5c..c0a48f7 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -1807,7 +1807,8 @@
       # -----------------------------------------------------------------------
       - 'voltha-periodic-test':
           name: 'periodic-voltha-etcd-test'
-          build-node: 'ubuntu18.04-basebuild-4c-8g'
+          # build-node: 'ubuntu18.04-basebuild-4c-8g'
+          build-node: 'voltha-1804-micro'
           code-branch: 'master'
           extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set onu=2,pon=2'
           time-trigger: "H H/12 * * *"
@@ -1836,7 +1837,8 @@
           name: 'periodic-voltha-etcd-test-2.11'
           pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
           pipeline-branch: 'voltha-2.11'
-          build-node: 'ubuntu18.04-basebuild-4c-8g'
+          # build-node: 'ubuntu18.04-basebuild-4c-8g'
+          build-node: 'voltha-1804-micro'
           code-branch: 'voltha-2.11'
           extraHelmFlags: '--set onu=2,pon=2'
           time-trigger: "H H/23 * * *"
@@ -1851,7 +1853,8 @@
           name: 'periodic-voltha-etcd-test-2.12'
           pipeline-script: 'voltha/bbsim-tests.groovy'
           pipeline-branch: 'voltha-2.12'
-          build-node: 'ubuntu18.04-basebuild-4c-8g'
+          # build-node: 'ubuntu18.04-basebuild-4c-8g'
+          build-node: 'voltha-1804-micro'
           code-branch: 'voltha-2.12'
           extraHelmFlags: '--set onu=2,pon=2'
           time-trigger: "H H/23 * * *"
@@ -1961,7 +1964,8 @@
       # 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: 'ubuntu18.04-basebuild-4c-8g'
+          build-node: 'voltha-1804-micro'
           code-branch: 'master'
           time-trigger: "H H/23 * * *"
           extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set onu=2,controlledActivation=only-onu'
@@ -1979,7 +1983,8 @@
       # -----------------------------------------------------------------------
       - 'voltha-periodic-test':
           name: 'periodic-voltha-memory-leak-test-bbsim-2.12'
-          build-node: 'ubuntu18.04-basebuild-4c-8g'
+          # build-node: 'ubuntu18.04-basebuild-4c-8g'
+          build-node: 'voltha-1804-micro'
           pipeline-script: 'voltha/bbsim-tests.groovy'
           pipeline-branch: 'voltha-2.12'
           code-branch: 'voltha-2.12'
@@ -1996,7 +2001,8 @@
 
       - 'voltha-periodic-test':
           name: 'periodic-voltha-memory-leak-test-bbsim-2.11'
-          build-node: 'ubuntu18.04-basebuild-4c-8g'
+          # build-node: 'ubuntu18.04-basebuild-4c-8g'
+          build-node: 'voltha-1804-micro'
           pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
           pipeline-branch: 'voltha-2.11'
           code-branch: 'voltha-2.11'
@@ -2292,7 +2298,8 @@
 - 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-4c-8g'
+    build-node: 'voltha-1804-micro'
     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 b21e70f..2134d46 100644
--- a/jjb/voltha-e2e/master.yaml
+++ b/jjb/voltha-e2e/master.yaml
@@ -153,7 +153,8 @@
       # -----------------------------------------------------------------------
       - 'voltha-periodic-test':
           name: 'periodic-voltha-dt-test-bbsim-master'
-          build-node: 'ubuntu18.04-basebuild-4c-8g'
+          # build-node: 'ubuntu18.04-basebuild-4c-8g'
+          build-node: 'voltha-1804-micro'
           pipeline-script: 'voltha/bbsim-tests.groovy'
           pipeline-branch: 'master'
           code-branch: 'master'
@@ -175,7 +176,8 @@
       # -----------------------------------------------------------------------
       - 'voltha-periodic-test':
           name: 'periodic-voltha-dt-fttb-test-bbsim-master'
-          build-node: 'ubuntu18.04-basebuild-4c-8g'
+          # build-node: 'ubuntu18.04-basebuild-4c-8g'
+          build-node: 'voltha-1804-micro'
           code-branch: 'master'
           time-trigger: "H H/23 * * *"
           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/jjb/voltha-e2e/voltha-2.11.yaml b/jjb/voltha-e2e/voltha-2.11.yaml
index e04b9e1..61105c8 100644
--- a/jjb/voltha-e2e/voltha-2.11.yaml
+++ b/jjb/voltha-e2e/voltha-2.11.yaml
@@ -145,7 +145,8 @@
       # -----------------------------------------------------------------------
       - 'voltha-periodic-test':
           name: 'periodic-voltha-dt-test-bbsim-2.11'
-          build-node: 'ubuntu18.04-basebuild-4c-8g'
+          # build-node: 'ubuntu18.04-basebuild-4c-8g'
+          build-node: 'voltha-1804-micro'
           pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
           pipeline-branch: 'voltha-2.11'
           code-branch: 'master'
diff --git a/jjb/voltha-e2e/voltha-2.12.yaml b/jjb/voltha-e2e/voltha-2.12.yaml
index 2e9899d..e223028 100644
--- a/jjb/voltha-e2e/voltha-2.12.yaml
+++ b/jjb/voltha-e2e/voltha-2.12.yaml
@@ -154,7 +154,8 @@
       # -----------------------------------------------------------------------
       - 'voltha-periodic-test':
           name: 'periodic-voltha-dt-test-bbsim-2.12'
-          build-node: 'ubuntu18.04-basebuild-4c-8g'
+          # build-node: 'ubuntu18.04-basebuild-4c-8g'
+          build-node: 'voltha-1804-micro'          
           pipeline-script: 'voltha/bbsim-tests.groovy'
           pipeline-branch: 'voltha-2.12'
           code-branch: 'voltha-2.12'
@@ -184,7 +185,8 @@
       # -----------------------------------------------------------------------
       - 'voltha-periodic-test':
           name: 'periodic-voltha-dt-fttb-test-bbsim-2.12'
-          build-node: 'ubuntu18.04-basebuild-4c-8g'
+          # build-node: 'ubuntu18.04-basebuild-4c-8g'
+          build-node: 'voltha-1804-micro'          
           code-branch: 'VOLTHA-2.12'
           time-trigger: "H H/23 * * *"
           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/jjb/voltha-unit-test.yaml b/jjb/voltha-unit-test.yaml
index be21bf5..c298cec 100644
--- a/jjb/voltha-unit-test.yaml
+++ b/jjb/voltha-unit-test.yaml
@@ -38,7 +38,8 @@
           choosing-strategy: gerrit
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
-    node: 'ubuntu18.04-basebuild-4c-8g'
+    # node: 'ubuntu18.04-basebuild-4c-8g'
+    node: 'voltha-1804-micro'
     project-type: freestyle
     concurrent: true
 
diff --git a/jjb/xos-auth.yaml b/jjb/xos-auth.yaml
index 11a4357..ea53b11 100644
--- a/jjb/xos-auth.yaml
+++ b/jjb/xos-auth.yaml
@@ -32,7 +32,8 @@
           branch: '$GERRIT_BRANCH'
           destination-dir: 'cord'
 
-    node: 'ubuntu18.04-basebuild-4c-8g'
+    # node: 'ubuntu18.04-basebuild-4c-8g'
+    node: 'voltha-1804-micro'
     project-type: freestyle
     concurrent: true
 
diff --git a/jjb/xos-integration-tests.yaml b/jjb/xos-integration-tests.yaml
index d56ba8a..0772e69 100644
--- a/jjb/xos-integration-tests.yaml
+++ b/jjb/xos-integration-tests.yaml
@@ -35,7 +35,8 @@
     parameters:
       - string:
           name: buildNode
-          default: 'ubuntu18.04-basebuild-4c-8g'
+          # default: 'ubuntu18.04-basebuild-4c-8g'
+          default: 'voltha-1804-micro'          
           description: 'Name of the Jenkins node to run the job on'
 
       - string:
@@ -89,7 +90,8 @@
     parameters:
       - string:
           name: buildNode
-          default: 'ubuntu18.04-basebuild-4c-8g'
+          # default: 'ubuntu18.04-basebuild-4c-8g'
+          default: 'voltha-1804-micro'          
           description: 'Name of the Jenkins node to run the job on'
 
       - string:
@@ -143,7 +145,8 @@
     parameters:
       - string:
           name: buildNode
-          default: 'ubuntu18.04-basebuild-4c-8g'
+          # default: 'ubuntu18.04-basebuild-4c-8g'
+          default: 'voltha-1804-micro'
           description: 'Name of the Jenkins node to run the job on'
 
       - string:
@@ -197,7 +200,8 @@
     parameters:
       - string:
           name: buildNode
-          default: 'ubuntu18.04-basebuild-4c-8g'
+          # default: 'ubuntu18.04-basebuild-4c-8g'
+          default: 'voltha-1804-micro'
           description: 'Name of the Jenkins node to run the job on'
 
       - string:
diff --git a/jjb/xos-synchronizer-update.yaml b/jjb/xos-synchronizer-update.yaml
index 94157f3..ed3d0dc 100644
--- a/jjb/xos-synchronizer-update.yaml
+++ b/jjb/xos-synchronizer-update.yaml
@@ -28,7 +28,8 @@
     parameters:
       - string:
           name: buildNode
-          default: 'ubuntu18.04-basebuild-4c-8g'
+          # default: 'ubuntu18.04-basebuild-4c-8g'
+          default: 'voltha-1804-micro'
           description: 'Name of the Jenkins node to run the job on'
 
       - string:
diff --git a/jjb/xos-upgrade.yaml b/jjb/xos-upgrade.yaml
index 0d41546..b426c64 100644
--- a/jjb/xos-upgrade.yaml
+++ b/jjb/xos-upgrade.yaml
@@ -29,7 +29,8 @@
     parameters:
       - string:
           name: buildNode
-          default: 'ubuntu18.04-basebuild-4c-8g'
+          # default: 'ubuntu18.04-basebuild-4c-8g'
+          default: 'voltha-1804-micro'
           description: 'Name of the Jenkins node to run the job on'
 
       - string: