diff --git a/jjb/omec-ci.yaml b/jjb/omec-ci.yaml
index 6e312ac..64c0065 100644
--- a/jjb/omec-ci.yaml
+++ b/jjb/omec-ci.yaml
@@ -259,9 +259,9 @@
           pipeline-file: 'omec-reuse-scan.groovy'
           build-node: 'ubuntu18.04-basebuild-1c-2g'
 
-# for upf-epc
+# for upf
 - project:
-    name: upf-epc
+    name: upf
     project: '{name}'
 
     github-organization: 'omec-project'
@@ -275,19 +275,6 @@
       - 'omec-fossa':
           pipeline-file: 'omec-fossa-scan.groovy'
           build-node: 'ubuntu18.04-basebuild-1c-2g'
-      - 'omec-reuse':
-          pipeline-file: 'omec-reuse-scan.groovy'
-          build-node: 'ubuntu18.04-basebuild-1c-2g'
-      - 'docker-publish-github':
-          build-timeout: 30
-          docker-repo: 'omecproject'
-          build-node: 'ubuntu18.04-basebuild-2c-4g'
-          extraEnvironmentVars: CPU=haswell
-      - 'omec-container'
-      - 'omec-container-remote':
-          pod: 'ci-4g'
-          remote-jenkins-name: 'Aether Jenkins'
-          pipeline-file: 'omec-container-remote.groovy'
 
 # Combined pipeline
 - job-template:
diff --git a/jjb/pipeline/voltha/master/bbsim-tests.groovy b/jjb/pipeline/voltha/master/bbsim-tests.groovy
index a164d55..fefa4d4 100755
--- a/jjb/pipeline/voltha/master/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/master/bbsim-tests.groovy
@@ -73,7 +73,7 @@
             infraNamespace: infraNamespace,
             volthaNamespace: volthaNamespace,
             workflow: workflow.toLowerCase(),
-            withMacLearning: enableMacLearning,
+            withMacLearning: enableMacLearning.toBoolean(),
             extraHelmFlags: localHelmFlags,
             localCharts: localCharts,
             bbsimReplica: olts.toInteger(),
diff --git a/jjb/software-upgrades.yaml b/jjb/software-upgrades.yaml
index 5fa684e..8e1365c 100644
--- a/jjb/software-upgrades.yaml
+++ b/jjb/software-upgrades.yaml
@@ -14,13 +14,13 @@
           aaa-version: '2.6.0.SNAPSHOT'
           aaa-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/aaa-app/2.6.0-SNAPSHOT/aaa-app-2.6.0-20211227.162925-1.oar'
           olt-version: '5.1.0.SNAPSHOT'
-          olt-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/olt-app/5.1.0-SNAPSHOT/olt-app-5.1.0-20220209.100550-7.oar'
+          olt-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/olt-app/5.1.0-SNAPSHOT/olt-app-5.1.0-20220217.163818-8.oar'
           dhcpl2relay-version: '2.7.0.SNAPSHOT'
           dhcpl2relay-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/dhcpl2relay-app/2.7.0-SNAPSHOT/dhcpl2relay-app-2.7.0-20211227.173623-1.oar'
           igmpproxy-version: '2.5.0.SNAPSHOT'
           igmpproxy-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/onos-app-igmpproxy-app/2.5.0-SNAPSHOT/onos-app-igmpproxy-app-2.5.0-20211227.182108-1.oar'
           sadis-version: '5.6.0.SNAPSHOT'
-          sadis-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/sadis-app/5.6.0-SNAPSHOT/sadis-app-5.6.0-20220208.143514-4.oar'
+          sadis-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/sadis-app/5.6.0-SNAPSHOT/sadis-app-5.6.0-20220217.161332-5.oar'
           mcast-version: '2.6.0.SNAPSHOT'
           mcast-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/mcast-app/2.6.0-SNAPSHOT/mcast-app-2.6.0-20211227.170629-1.oar'
           kafka-version: '2.9.0.SNAPSHOT'
@@ -52,7 +52,7 @@
           mcast-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/mcast-app/2.4.0/mcast-app-2.4.0.oar'
           kafka-version: '2.7.0'
           kafka-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/kafka/2.7.0/kafka-2.7.0.oar'
-          adapter-open-olt-image: 'voltha/voltha-openolt-adapter:3.5.11'
+          adapter-open-olt-image: 'voltha/voltha-openolt-adapter:3.5.12'
           adapter-open-onu-image: 'voltha/voltha-openonu-adapter-go:1.3.26'
           rw-core-image: 'voltha/voltha-rw-core:2.9.6'
           ofagent-image: 'voltha/voltha-ofagent-go:1.6.5'
diff --git a/jjb/verify/voltha-northbound-bbf-adapter.yaml b/jjb/verify/voltha-northbound-bbf-adapter.yaml
new file mode 100644
index 0000000..02ee765
--- /dev/null
+++ b/jjb/verify/voltha-northbound-bbf-adapter.yaml
@@ -0,0 +1,57 @@
+---
+# verification jobs for 'voltha-northbound-bbf-adapter' repo
+
+- project:
+    name: voltha-northbound-bbf-adapter
+    project: '{name}'
+
+    jobs:
+      - 'voltha-northbound-bbf-adapter':
+          branch-regexp: '{all-branches-regexp}'
+      # - 'voltha-northbound-bbf-adapter-master':
+      #     branch-regexp: '^master$'
+      - 'publish-voltha-northbound-bbf-adapter-jobs':
+          branch-regexp: '{all-branches-regexp}'
+
+- job-group:
+    name: 'voltha-northbound-bbf-adapter'
+    jobs:
+      - 'verify-licensed'
+      - 'tag-collision-reject':
+          dependency-jobs: 'verify_voltha-northbound-bbf-adapter_licensed'
+      - 'make-unit-test':
+          build-node: 'ubuntu18.04-basebuild-4c-8g'
+          dest-gopath: "github.com/opencord"
+          unit-test-targets: 'lint sca test'
+          unit-test-keep-going: 'true'
+
+# NOTE add once we have sanity jobs for voltha-northbound-bbf-adapter
+# - job-group:
+#     name: 'voltha-northbound-bbf-adapter-master'
+#     jobs:
+#       - 'voltha-patch-test':
+#           extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
+#           testTargets: |
+#             - target: sanity-voltha-northbound-bbf-adapter-att
+#               workflow: att
+#               flags: ""
+#               teardown: true
+#               logging: true
+#             - target: sanity-voltha-northbound-bbf-adapter-dt
+#               workflow: dt
+#               flags: ""
+#               teardown: true
+#               logging: true
+#             - target: sanity-voltha-northbound-bbf-adapter-tt
+#               workflow: tt
+#               flags: ""
+#               teardown: true
+#               logging: true
+
+- job-group:
+    name: 'publish-voltha-northbound-bbf-adapter-jobs'
+    jobs:
+      - 'docker-publish':
+          maintainers: "teo@opennetworking.org"
+          docker-repo: 'voltha'
+          dependency-jobs: 'version-tag'
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 26c6257..e85193f 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -281,7 +281,7 @@
               logging: true
             - target: openonu-go-adapter-omci-hardening-failed-test
               workflow: att
-              flags: "--set omci_response_rate=7"
+              flags: "--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1,omci_response_rate=7"
               teardown: true
               logging: true
             - target: voltha-onu-omci-get-single-kind-att
@@ -450,7 +450,7 @@
               logging: true
             - target: openonu-go-adapter-omci-hardening-failed-test
               workflow: att
-              flags: "--set omci_response_rate=7"
+              flags: "--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1,omci_response_rate=7"
               teardown: true
               logging: true
             - target: voltha-onu-omci-get-single-kind-att
diff --git a/vars/volthaStackDeploy.groovy b/vars/volthaStackDeploy.groovy
index 37a00d2..bea044b 100644
--- a/vars/volthaStackDeploy.groovy
+++ b/vars/volthaStackDeploy.groovy
@@ -8,6 +8,7 @@
       stackName: "voltha",
       stackId: 1, // NOTE this is used to differentiate between BBSims across multiple stacks
       workflow: "att",
+      withMacLearning: false,
       extraHelmFlags: "",
       localCharts: false,
       onosReplica: 1,