diff --git a/jjb/omec-ci.yaml b/jjb/omec-ci.yaml
index acd4e6e..26032a8 100644
--- a/jjb/omec-ci.yaml
+++ b/jjb/omec-ci.yaml
@@ -8,6 +8,8 @@
     name: omec
     build-node: 'intel-102'
     github-organization: 'omec-project'
+    registry: 'registry.aetherproject.org/omecproject'
+    registry-proxy: 'registry.aetherproject.org/proxy/omecproject'
 
     github_pr_auth_id: '64fe2b1a-b33a-4f13-8442-ad8360434003'
     github_pr_org_list:
@@ -50,12 +52,12 @@
     project: '{name}'
 
     build-node: 'intel-102'
-
     github-organization: 'omec-project'
-
     github_pr_auth_id: '64fe2b1a-b33a-4f13-8442-ad8360434003'
     github_pr_org_list:
       - 'omec-project'
+    registry: 'registry.aetherproject.org/omecproject'
+    registry-proxy: 'registry.aetherproject.org/proxy/omecproject'
 
     jobs:
       - 'omec-combined':
@@ -83,12 +85,12 @@
     project: '{name}'
 
     build-node: 'intel-102'
-
     github-organization: 'omec-project'
-
     github_pr_auth_id: '64fe2b1a-b33a-4f13-8442-ad8360434003'
     github_pr_org_list:
       - 'omec-project'
+    registry: 'registry.aetherproject.org/omecproject'
+    registry-proxy: 'registry.aetherproject.org/proxy/omecproject'
 
     jobs:
       - 'omec-combined':
@@ -120,12 +122,12 @@
     project: '{name}'
 
     build-node: 'intel-102'
-
     github-organization: 'omec-project'
-
     github_pr_auth_id: '64fe2b1a-b33a-4f13-8442-ad8360434003'
     github_pr_org_list:
       - 'omec-project'
+    registry: 'registry.aetherproject.org/omecproject'
+    registry-proxy: 'registry.aetherproject.org/proxy/omecproject'
 
     jobs:
       - 'omec-combined':
@@ -152,12 +154,12 @@
     project: '{name}'
 
     build-node: 'intel-102'
-
     github-organization: 'omec-project'
-
     github_pr_auth_id: '64fe2b1a-b33a-4f13-8442-ad8360434003'
     github_pr_org_list:
       - 'omec-project'
+    registry: 'registry.aetherproject.org/omecproject'
+    registry-proxy: 'registry.aetherproject.org/proxy/omecproject'
 
     jobs:
       - 'omec-combined':
@@ -185,12 +187,12 @@
     project: '{name}'
 
     build-node: 'intel-102'
-
     github-organization: 'omec-project'
-
     github_pr_auth_id: '64fe2b1a-b33a-4f13-8442-ad8360434003'
     github_pr_org_list:
       - 'omec-project'
+    registry: 'registry.aetherproject.org/omecproject'
+    registry-proxy: 'registry.aetherproject.org/proxy/omecproject'
 
     jobs:
       - 'omec-fossa':
@@ -206,12 +208,12 @@
     project: '{name}'
 
     build-node: 'intel-102'
-
     github-organization: 'omec-project'
-
     github_pr_auth_id: '64fe2b1a-b33a-4f13-8442-ad8360434003'
     github_pr_org_list:
       - 'omec-project'
+    registry: 'registry.aetherproject.org/omecproject'
+    registry-proxy: 'registry.aetherproject.org/proxy/omecproject'
 
     jobs:
       - 'omec-fossa':
@@ -227,10 +229,11 @@
     project: '{name}'
 
     github-organization: 'omec-project'
-
     github_pr_auth_id: '64fe2b1a-b33a-4f13-8442-ad8360434003'
     github_pr_org_list:
       - 'omec-project'
+    registry: 'registry.aetherproject.org/omecproject'
+    registry-proxy: 'registry.aetherproject.org/proxy/omecproject'
 
     jobs:
       - 'omec-fossa':
@@ -580,9 +583,9 @@
           description: 'Name of the Jenkins node to run the job on'
 
       - string:
-          name: registry
-          default: 'omecproject'
-          description: 'Docker registry to push images to'
+          name: registryProxy
+          default: '{registry-proxy}'
+          description: 'Harbor proxy which caches dockerhub images'
 
       - string:
           name: repoName
@@ -688,10 +691,15 @@
 
       - string:
           name: registry
-          default: 'registry.aetherproject.org/omecproject'
+          default: '{registry}'
           description: 'Docker registry that stores images built for CI testing'
 
       - string:
+          name: registryProxy
+          default: '{registry-proxy}'
+          description: 'Harbor proxy which caches dockerhub images'
+
+      - string:
           name: c3poBranch
           default: 'master'
           description: 'Branch name of c3po repo which we run tests against'
@@ -775,37 +783,37 @@
 
       - string:
           name: hssdbImage
-          default: 'omecproject/c3po-hssdb:master-latest'
+          default: '{registry-proxy}/c3po-hssdb:master-latest'
           description: 'Docker image for hssdb. Leave empty to use default helm-charts value'
 
       - string:
           name: hssImage
-          default: 'omecproject/c3po-hss:master-latest'
+          default: '{registry-proxy}/c3po-hss:master-latest'
           description: 'Docker image for hss. Leave empty to use default helm-charts value'
 
       - string:
           name: mmeImage
-          default: 'omecproject/nucleus:master-latest'
+          default: '{registry-proxy}/nucleus:master-latest'
           description: 'Docker image for mme. Leave empty to use default helm-charts value'
 
       - string:
           name: spgwcImage
-          default: 'omecproject/spgw:master-latest'
+          default: '{registry-proxy}/spgw:master-latest'
           description: 'Docker image for spgwc. Leave empty to use default helm-charts value'
 
       - string:
           name: bessImage
-          default: 'omecproject/upf-epc-bess:master-latest'
+          default: '{registry-proxy}/upf-epc-bess:master-latest'
           description: 'Docker image for bess. Leave empty to use default helm-charts value'
 
       - string:
           name: zmqifaceImage
-          default: 'omecproject/upf-epc-cpiface:master-latest'
+          default: '{registry-proxy}/upf-epc-cpiface:master-latest'
           description: 'Docker image for zmqiface. Leave empty to use default helm-charts value'
 
       - string:
           name: pfcpifaceImage
-          default: 'omecproject/upf-epc-pfcpiface:master-latest'
+          default: '{registry-proxy}/upf-epc-pfcpiface:master-latest'
           description: 'Docker image for pfcpiface. Leave empty to use default helm-charts value'
 
     concurrent: false
diff --git a/jjb/pipeline/omec-fossa-scan.groovy b/jjb/pipeline/omec-fossa-scan.groovy
index fa82b84..66deb9d 100644
--- a/jjb/pipeline/omec-fossa-scan.groovy
+++ b/jjb/pipeline/omec-fossa-scan.groovy
@@ -19,8 +19,10 @@
 
     agent {
         docker {
-            image "omecproject/fossa-verify:latest"
+            image "registry.aetherproject.org/ci/fossa-verify:latest"
             label "${params.buildNode}"
+            registryUrl "https://registry.aetherproject.org/"
+            registryCredentialsId "registry.aetherproject.org"
         }
     }
 
diff --git a/jjb/pipeline/omec-postmerge.groovy b/jjb/pipeline/omec-postmerge.groovy
index 5f0d815..d901418 100644
--- a/jjb/pipeline/omec-postmerge.groovy
+++ b/jjb/pipeline/omec-postmerge.groovy
@@ -69,34 +69,34 @@
           zmqiface_tag = sh returnStdout: true, script: """curl -s 'https://registry.hub.docker.com/v2/repositories/omecproject/upf-epc-cpiface/tags/' | jq '.results[] | select(.name | test("${upfBranchName}-[0-9a-z]{7}\$")) | select(.last_updater_username=="zdwonf") |.name' | head -1 | tr -d \\\""""
           pfcpiface_tag = sh returnStdout: true, script: """curl -s 'https://registry.hub.docker.com/v2/repositories/omecproject/upf-epc-pfcpiface/tags/' | jq '.results[] | select(.name | test("${upfBranchName}-[0-9a-z]{7}\$")) | select(.last_updater_username=="zdwonf") |.name' | head -1 | tr -d \\\""""
 
-          hssdb_image = "omecproject/c3po-hssdb:"+hssdb_tag
-          hss_image = "omecproject/c3po-hss:"+hss_tag
-          mme_image = "omecproject/nucleus:"+mme_tag
-          spgwc_image = "omecproject/spgw:"+spgwc_tag
-          bess_image = "omecproject/upf-epc-bess:"+bess_tag
-          zmqiface_image = "omecproject/upf-epc-cpiface:"+zmqiface_tag
-          pfcpiface_image = "omecproject/upf-epc-pfcpiface:"+pfcpiface_tag
+          hssdb_image = "${params.registryProxy}/c3po-hssdb:"+hssdb_tag
+          hss_image = "${params.registryProxy}/c3po-hss:"+hss_tag
+          mme_image = "${params.registryProxy}/nucleus:"+mme_tag
+          spgwc_image = "${params.registryProxy}/spgw:"+spgwc_tag
+          bess_image = "${params.registryProxy}/upf-epc-bess:"+bess_tag
+          zmqiface_image = "${params.registryProxy}/upf-epc-cpiface:"+zmqiface_tag
+          pfcpiface_image = "${params.registryProxy}/upf-epc-pfcpiface:"+pfcpiface_tag
 
           updatedImages = ""
           switch("${params.repoName}") {
           case "c3po":
-            hssdb_image = "${params.registry}/c3po-hssdb:${branchName}-${abbreviated_commit_hash}"
-            hss_image = "${params.registry}/c3po-hss:${branchName}-${abbreviated_commit_hash}"
+            hssdb_image = "${params.registryProxy}/c3po-hssdb:${branchName}-${abbreviated_commit_hash}"
+            hss_image = "${params.registryProxy}/c3po-hss:${branchName}-${abbreviated_commit_hash}"
             updatedImages += hssdb_image + ","
             updatedImages += hss_image
             break
           case "spgw":
-            spgwc_image = "${params.registry}/spgw:${branchName}-${abbreviated_commit_hash}"
+            spgwc_image = "${params.registryProxy}/spgw:${branchName}-${abbreviated_commit_hash}"
             updatedImages += spgwc_image
             break
           case "Nucleus":
-            mme_image = "${params.registry}/nucleus:${branchName}-${abbreviated_commit_hash}"
+            mme_image = "${params.registryProxy}/nucleus:${branchName}-${abbreviated_commit_hash}"
             updatedImages += mme_image
             break
           case "upf-epc":
-            bess_image = "${params.registry}/upf-epc-bess:${branchName}-${abbreviated_commit_hash}"
-            zmqiface_image = "${params.registry}/upf-epc-cpiface:${branchName}-${abbreviated_commit_hash}"
-            pfcpiface_image = "${params.registry}/upf-epc-pfcpiface:${branchName}-${abbreviated_commit_hash}"
+            bess_image = "${params.registryProxy}/upf-epc-bess:${branchName}-${abbreviated_commit_hash}"
+            zmqiface_image = "${params.registryProxy}/upf-epc-cpiface:${branchName}-${abbreviated_commit_hash}"
+            pfcpiface_image = "${params.registryProxy}/upf-epc-pfcpiface:${branchName}-${abbreviated_commit_hash}"
             updatedImages += bess_image + ","
             updatedImages += zmqiface_image + ","
             updatedImages += pfcpiface_image + ","
diff --git a/jjb/pipeline/omec-reuse-scan.groovy b/jjb/pipeline/omec-reuse-scan.groovy
index 03b19e8..8f40053 100644
--- a/jjb/pipeline/omec-reuse-scan.groovy
+++ b/jjb/pipeline/omec-reuse-scan.groovy
@@ -19,8 +19,10 @@
 
     agent {
         docker {
-            image "omecproject/reuse-verify:latest"
+            image "registry.aetherproject.org/ci/reuse-verify:latest"
             label "${params.buildNode}"
+            registryUrl "https://registry.aetherproject.org/"
+            registryCredentialsId "registry.aetherproject.org"
         }
     }
 
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index b07f68f..0594218 100644
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -32,7 +32,7 @@
           name: 'periodic-voltha-multiple-olts-test-bbsim'
           pipeline-script: 'voltha-nightly-tests-bbsim.groovy'
           build-node: 'qct-pod4-node2'
-          make-target: functional-multi-olt
+          make-target: functional-single-kind
           make-target-failtest: bbsim-multi-olt-failurescenarios
           make-target-errortest: bbsim-multi-olt-errorscenarios
           make-target-alarmtest: bbsim-alarms-kind
@@ -131,7 +131,7 @@
           name: 'verify_physical_voltha_patchset_auto'
           build-node: 'tucson-pod'
           config-pod: 'tucson-pod'
-          oltDebVersionMaster: 'openolt_asfvolt16-3.0.0-07ac2cb46d74b83b707fa654ee2e8d4d4de2372a.deb'
+          oltDebVersionMaster: 'openolt_asfvolt16-3.1.0-812c1126ece038da5c40d0830a09cb67ca36ea07.deb'
           oltDebVersionVoltha23: 'openolt_asfvolt16-2.4.9-dev-d4aeca5a2094f7dc7c519913ab1558348c546dab.deb'
           profile: 'Default'
 
@@ -140,7 +140,7 @@
           name: 'verify_physical_voltha_patchset_manual'
           build-node: 'tucson-pod'
           config-pod: 'tucson-pod'
-          oltDebVersionMaster: 'openolt_asfvolt16-3.0.0-07ac2cb46d74b83b707fa654ee2e8d4d4de2372a.deb'
+          oltDebVersionMaster: 'openolt_asfvolt16-3.1.0-812c1126ece038da5c40d0830a09cb67ca36ea07.deb'
           oltDebVersionVoltha23: 'openolt_asfvolt16-2.4.9-dev-d4aeca5a2094f7dc7c519913ab1558348c546dab.deb'
           profile: 'Default'
           trigger-string: 'hardware test'
@@ -168,7 +168,7 @@
           build-node: 'tucson-pod'
           config-pod: 'tucson-pod'
           manualBranch: 'master'
-          oltDebVersionMaster: 'openolt_asfvolt16-3.0.0-07ac2cb46d74b83b707fa654ee2e8d4d4de2372a.deb'
+          oltDebVersionMaster: 'openolt_asfvolt16-3.1.0-812c1126ece038da5c40d0830a09cb67ca36ea07.deb'
           oltDebVersionVoltha23: 'openolt_asfvolt16-2.4.9-dev-d4aeca5a2094f7dc7c519913ab1558348c546dab.deb'
           profile: 'Default'