diff --git a/deployment-configs/flex-ocp-cord-voltha-master.yaml b/deployment-configs/flex-ocp-cord-voltha-master.yaml
index 0787063..5d75f06 100644
--- a/deployment-configs/flex-ocp-cord-voltha-master.yaml
+++ b/deployment-configs/flex-ocp-cord-voltha-master.yaml
@@ -46,6 +46,10 @@
     pass: 'onl'
     fortygig: 'true'
 
+onus:
+  -
+    serial: 'ALPHe3d1cfa7'
+
 hosts:
   src:
     -
@@ -53,13 +57,15 @@
       user: 'cord'
       pass: 'cord'
       dp_iface_name: 'ens2f1'
-      container_type: ''
-      container_name: ''
+      container_type: null
+      container_name: null
       onu: 'ALPHe3d1cfa7'
+      c_tag: '999'
+      s_tag: '111'
 
   dst:
     -
-      ip: '10.192.20.198'
+      ip: '10.192.20.47'
       user: 'cord'
       pass: 'cord'
       dp_iface_name: 'ens3d1'
@@ -67,4 +73,4 @@
       dp_iface_ip: '10.8.3.1'
       dp_iface_gateway: '10.8.3.254'
       container_type: null
-      container_name: null
+      container_name: null
\ No newline at end of file
diff --git a/kubernetes-configs/bbsim-voltha-1.7.yml b/kubernetes-configs/bbsim-voltha-1.7.yml
index 9adaa04..1c702d4 100644
--- a/kubernetes-configs/bbsim-voltha-1.7.yml
+++ b/kubernetes-configs/bbsim-voltha-1.7.yml
@@ -17,115 +17,6 @@
 # Use this file to deploy the 'master' (dev) versions of all services.
 # This is mainly useful for testing.
 
-# voltha
-etcd-cluster:
-  clusterSize: 1
-
-# in xos-core chart and other charts with multiple images
-images:
-  xos_tosca:
-    tag: '1.3.1'
-
-# ONOS
-  onos:
-    repository: 'matteoscandolo/onos'
-    tag: '1.13.9-rc4'
-
-# VOLTHA
-  vcore:
-    tag: 'voltha-1.7'
-  vcli:
-    tag: 'voltha-1.7'
-  ofagent:
-    tag: 'master'
-  netconf:
-    tag: 'voltha-1.7'
-  envoy_for_etcd:
-    tag: 'voltha-1.7'
-  alarm_generator:
-    tag: 'voltha-1.7'
-  freeradius:
-    tag: 'latest'
-
-# Ponsimv2
-  olt:
-    repository: "voltha/voltha-ponsim"
-    tag: "voltha-1.7"
-  onu:
-   repository: "voltha/voltha-ponsim"
-   tag: "voltha-1.7"
-
-# in xos-gui sub-chart required by xos-core chart
-xos-gui:
-  images:
-    xos_gui:
-      tag: '1.0.5'
-    xos_ws:
-      tag: '2.0.2'
-
-# in seba service chart
-fabric:
-  image:
-    tag: '2.2.1'
-fabric-crossconnect:
-  image:
-    tag: '1.2.1'
-onos-service:
-  image:
-    tag: '2.1.1'
-sadis-server:
-  image:
-    tag: 'latest'
-olt-service:
-  image:
-    tag: '2.2.1'
-rcord:
-  image:
-    tag: 'master'
-
-# in base-kubernetes chart
-kubernetes:
-  image:
-    tag: '1.2.1'
-
-# in workflow/att-workflow service chart
-att-workflow-driver:
-  image:
-    tag: '1.2.2'
-
-  # this is mandatory, it's needed to correctly configure the kafka endpoint
-  kafkaService: cord-kafka
-
-# in workflow/tt-workflow service chart
-tt-workflow-driver:
-  image:
-    tag: 'master'
-
-  # this is mandatory, it's needed to correctly configure the kafka endpoint
-  kafkaService: cord-kafka
-
-# in mininet chart
-vlanMatchDepth: 2
-
-# in ponsim-pod chart
-bandwidthProfiles: True
-
-# ONOS applications
-aaaAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=aaa-app&v=1.9.0-SNAPSHOT&e=oar"
-aaaAppVersion: "1.9.0.SNAPSHOT"
-
-sadisAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=sadis-app&v=3.1.0-SNAPSHOT&e=oar"
-sadisAppVersion: "3.1.0.SNAPSHOT"
-
-dhcpl2relayAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=dhcpl2relay-app&v=1.6.0-SNAPSHOT&e=oar"
-dhcpl2relayAppVersion: "1.6.0.SNAPSHOT"
-
-oltAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=olt-app&v=3.0.1-SNAPSHOT&e=oar"
-oltAppVersion: "3.0.1.SNAPSHOT"
-
-kafkaAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=kafka&v=1.1.0-SNAPSHOT&e=oar"
-kafkaAppVersion: "1.1.0.SNAPSHOT"
-
 application_logs: |
   log4j.logger.org.opencord.olt = DEBUG
   log4j.logger.org.opencord.kafka = TRACE
diff --git a/kubernetes-configs/bbsim-voltha-master.yml b/kubernetes-configs/bbsim-voltha-master.yml
index 2033a30..1abc1b3 100644
--- a/kubernetes-configs/bbsim-voltha-master.yml
+++ b/kubernetes-configs/bbsim-voltha-master.yml
@@ -17,129 +17,9 @@
 # Use this file to deploy the 'master' (dev) versions of all services.
 # This is mainly useful for testing.
 
-# voltha
-etcd-cluster:
-  clusterSize: 1
-
-# in xos-core chart and other charts with multiple images
-images:
-  xos_core:
-    tag: 'master'
-  xos_chameleon:
-    tag: 'master'
-  xos_tosca:
-    tag: 'master'
-  xos_api_tester:
-    tag: 'master'
-  tosca_loader:
-    tag: 'master'
-
-# ONOS
-  onos:
-    repository: 'onosproject/onos'
-    tag: 'latest'
-    pullPolicy: 'Never'
-
-# VOLTHA
-  vcore:
-    tag: 'voltha-1.7'
-  vcli:
-    tag: 'voltha-1.7'
-  ofagent:
-    tag: 'voltha-1.7'
-  netconf:
-    tag: 'voltha-1.7'
-  envoy_for_etcd:
-    tag: 'voltha-1.7'
-  alarm_generator:
-    tag: 'voltha-1.7'
-  freeradius:
-    tag: 'latest'
-
-# Ponsimv2
-  olt:
-    repository: "voltha/voltha-ponsim"
-    tag: "voltha-1.7"
-  onu:
-   repository: "voltha/voltha-ponsim"
-   tag: "voltha-1.7"
-
-# in xos-gui sub-chart required by xos-core chart
-xos-gui:
-  images:
-    xos_gui:
-      tag: 'master'
-    xos_ws:
-      tag: 'master'
-
-# in seba service chart
-fabric:
-  image:
-    tag: 'master'
-fabric-crossconnect:
-  image:
-    tag: 'master'
-onos-service:
-  image:
-    tag: 'master'
-sadis-server:
-  image:
-    tag: 'latest'
-volt:
-  image:
-    tag: 'master'
-rcord:
-  image:
-    tag: 'master'
-
-# in base-kubernetes chart
-kubernetes:
-  image:
-    tag: 'master'
-
-# in workflow/att-workflow service chart
-att-workflow-driver:
-  image:
-    tag: 'master'
-
-  # this is mandatory, it's needed to correctly configure the kafka endpoint
-  kafkaService: cord-kafka
-
-# in workflow/tt-workflow service chart
-tt-workflow-driver:
-  image:
-    tag: 'master'
-
-  # this is mandatory, it's needed to correctly configure the kafka endpoint
-  kafkaService: cord-kafka
-
-# in mininet chart
-vlanMatchDepth: 2
-
-# in ponsim-pod chart
-bandwidthProfiles: True
-
-# ONOS applications
-#aaaAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=aaa-app&v=1.9.0-SNAPSHOT&e=oar"
-#using older aaa-app version due to bug
-aaaAppUrl: "https://oss.sonatype.org/content/groups/public/org/opencord/aaa-app/1.9.0-SNAPSHOT/aaa-app-1.9.0-20190521.071409-20.oar"
-aaaAppVersion: "1.9.0.SNAPSHOT"
-
-sadisAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=sadis-app&v=3.1.0-SNAPSHOT&e=oar"
-sadisAppVersion: "3.1.0.SNAPSHOT"
-
-dhcpl2relayAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=dhcpl2relay-app&v=1.6.0-SNAPSHOT&e=oar"
-dhcpl2relayAppVersion: "1.6.0.SNAPSHOT"
-
-oltAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=olt-app&v=3.0.1-SNAPSHOT&e=oar"
-oltAppVersion: "3.0.1.SNAPSHOT"
-
-kafkaAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=kafka&v=1.1.0-SNAPSHOT&e=oar"
-kafkaAppVersion: "1.1.0.SNAPSHOT"
-
 application_logs: |
   log4j.logger.org.opencord.olt = DEBUG
   log4j.logger.org.opencord.kafka = TRACE
   log4j.logger.org.opencord.sadis = DEBUG
   log4j.logger.org.opencord.aaa = DEBUG
-  log4j.logger.org.opencord.dhcpl2relay = DEBUG
+  log4j.logger.org.opencord.dhcpl2relay = TRACE
\ No newline at end of file
diff --git a/kubernetes-configs/flex-ocp-cord-voltha-master.yml b/kubernetes-configs/flex-ocp-cord-voltha-master.yml
index 08fd7e5..ceb1253 100644
--- a/kubernetes-configs/flex-ocp-cord-voltha-master.yml
+++ b/kubernetes-configs/flex-ocp-cord-voltha-master.yml
@@ -13,58 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Automated deployment configuration for Flex POD 1 , olt/onu are connected to this
-
-# This file is used to optionally customize helm charts installations
-images:
-# VOLTHA
-  envoy_for_etcd:
-    tag: 'voltha-1.7'
-
-  netconf:
-    tag: 'voltha-1.7'
-
-  ofagent:
-    tag: 'voltha-1.7'
-
-  vcli:
-    tag: 'voltha-1.7'
-
-  vcore:
-    tag: 'voltha-1.7'
-
-# ONOS
-  onos:
-    tag: '1.13.9-rc4'
-
-rcord:
-  image:
-    tag: 'master'
-
-att-workflow-driver:
-  image:
-    tag: 'master'
-
-sadis-server:
-  image:
-    repository: opencord/sadis-server
-    tag: latest
-
-# ONOS applications
-aaaAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=aaa-app&v=1.9.0-SNAPSHOT&e=oar"
-aaaAppVersion: "1.9.0.SNAPSHOT"
-
-sadisAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=sadis-app&v=3.1.0-SNAPSHOT&e=oar"
-sadisAppVersion: "3.1.0.SNAPSHOT"
-
-dhcpl2relayAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=dhcpl2relay-app&v=1.6.0-SNAPSHOT&e=oar"
-dhcpl2relayAppVersion: "1.6.0.SNAPSHOT"
-
-oltAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=olt-app&v=3.0.1-SNAPSHOT&e=oar"
-oltAppVersion: "3.0.1.SNAPSHOT"
-
-kafkaAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=kafka&v=1.1.0-SNAPSHOT&e=oar"
-kafkaAppVersion: "1.1.0.SNAPSHOT"
+# Automated deployment configuration for flex ocp cord pod build , olt/onu are connected to this
 
 application_logs: |
   log4j.logger.org.opencord.olt = DEBUG
@@ -72,3 +21,4 @@
   log4j.logger.org.opencord.sadis = DEBUG
   log4j.logger.org.opencord.aaa = DEBUG
   log4j.logger.org.opencord.dhcpl2relay = DEBUG
+
diff --git a/kubernetes-configs/onf-demo-pod.yml b/kubernetes-configs/onf-demo-pod.yml
index ed134fd..dc5bd10 100644
--- a/kubernetes-configs/onf-demo-pod.yml
+++ b/kubernetes-configs/onf-demo-pod.yml
@@ -1,64 +1,23 @@
 ---
+# Copyright 2017-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
-etcd-cluster:
-  clusterSize: 1
-# global:
-#    registry: 192.168.100.1:30500/
-images:
-# VOLTHA
- envoy_for_etcd:
-   repository: '192.168.100.1:30500/voltha/voltha-envoy'
-   tag: 'dev'
+# Automated deployment configuration for Flex POD 1 , olt/onu are connected to this
 
- netconf:
-   repository: '192.168.100.1:30500/voltha/voltha-netconf'
-   tag: 'dev'
-
- ofagent:
-   repository: '192.168.100.1:30500/voltha/voltha-ofagent'
-   tag: 'dev'
-
- vcli:
-   repository: '192.168.100.1:30500/voltha/voltha-cli'
-   tag: 'dev'
-
- vcore:
-   repository: '192.168.100.1:30500/voltha/voltha-voltha'
-   tag: 'dev'
-# BBSIM
- bbsim:
-   repository: voltha/voltha-bbsim
-   tag: latest
-# ONOS
- onos:
-   repository: 'onosproject/onos'
-   tag: '1.13.9-rc4'
-
-rcord:
- image:
-   tag: 'master'
-
-att-workflow-driver:
- image:
-   tag: 'master'
-
-sadis-server:
- image:
-   repository: opencord/sadis-server
-   tag: latest
-
-# ONOS applications
-aaaAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=aaa-app&v=1.9.0-SNAPSHOT&e=oar"
-aaaAppVersion: "1.9.0.SNAPSHOT"
-
-sadisAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=sadis-app&v=3.1.0-SNAPSHOT&e=oar"
-sadisAppVersion: "3.1.0.SNAPSHOT"
-
-dhcpl2relayAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=dhcpl2relay-app&v=1.6.0-SNAPSHOT&e=oar"
-dhcpl2relayAppVersion: "1.6.0.SNAPSHOT"
-
-oltAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=olt-app&v=3.0.1-SNAPSHOT&e=oar"
-oltAppVersion: "3.0.1.SNAPSHOT"
-
-kafkaAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=kafka&v=1.1.0-SNAPSHOT&e=oar"
-kafkaAppVersion: "1.1.0.SNAPSHOT"
+application_logs: |
+  log4j.logger.org.opencord.olt = DEBUG
+  log4j.logger.org.opencord.kafka = DEBUG
+  log4j.logger.org.opencord.sadis = DEBUG
+  log4j.logger.org.opencord.aaa = DEBUG
+  log4j.logger.org.opencord.dhcpl2relay = DEBUG
diff --git a/kubernetes-configs/onlab-pod1-qa.yml b/kubernetes-configs/onlab-pod1-qa.yml
index 6986be6..1bbb4b9 100644
--- a/kubernetes-configs/onlab-pod1-qa.yml
+++ b/kubernetes-configs/onlab-pod1-qa.yml
@@ -13,68 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Automated deployment configuration for Flex POD 1 , olt/onu are connected to this
-
-# This file is used to optionally customize helm charts installations
-images:
-# VOLTHA
-  envoy_for_etcd:
-    tag: 'voltha-1.7'
-
-  netconf:
-    tag: 'voltha-1.7'
-
-  ofagent:
-    tag: 'voltha-1.7'
-
-  vcli:
-    tag: 'voltha-1.7'
-
-  vcore:
-    #repository: '10.90.0.101:30500/voltha/voltha-voltha'
-    tag: 'voltha-1.7'
-    #tag: 'dev'
-
-# ONOS
-  onos:
-    repository: 'matteoscandolo/onos'
-    tag: '1.13-branch'
-    #tag: '1.13.9-rc4'
-
-volt:
-  image:
-    tag: 'master'
-
-rcord:
-  image:
-    tag: 'master'
-
-att-workflow-driver:
-  image:
-    tag: 'master'
-
-sadis-server:
-  image:
-    repository: opencord/sadis-server
-    tag: latest
-
-# ONOS applications
-#aaaAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=aaa-app&v=1.9.0-SNAPSHOT&e=oar"
-#using older aaa-app version due to bug
-aaaAppUrl: "https://oss.sonatype.org/content/groups/public/org/opencord/aaa-app/1.9.0-SNAPSHOT/aaa-app-1.9.0-20190521.071409-20.oar"
-aaaAppVersion: "1.9.0.SNAPSHOT"
-
-sadisAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=sadis-app&v=3.1.0-SNAPSHOT&e=oar"
-sadisAppVersion: "3.1.0.SNAPSHOT"
-
-dhcpl2relayAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=dhcpl2relay-app&v=1.6.0-SNAPSHOT&e=oar"
-dhcpl2relayAppVersion: "1.6.0.SNAPSHOT"
-
-oltAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=olt-app&v=3.0.1-SNAPSHOT&e=oar"
-oltAppVersion: "3.0.1.SNAPSHOT"
-
-kafkaAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=kafka&v=1.1.0-SNAPSHOT&e=oar"
-kafkaAppVersion: "1.1.0.SNAPSHOT"
+# Automated deployment configuration for pod1 QA build , olt/onu are connected to this
 
 application_logs: |
   log4j.logger.org.opencord.olt = DEBUG
@@ -82,3 +21,4 @@
   log4j.logger.org.opencord.sadis = DEBUG
   log4j.logger.org.opencord.aaa = DEBUG
   log4j.logger.org.opencord.dhcpl2relay = DEBUG
+
diff --git a/kubernetes-configs/onlab-pod1.yml b/kubernetes-configs/onlab-pod1.yml
index 0213d12..d8c048e 100644
--- a/kubernetes-configs/onlab-pod1.yml
+++ b/kubernetes-configs/onlab-pod1.yml
@@ -13,109 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# This file is used to optionally customize helm charts installations
-# voltha
-# etcd-cluster:
-#   clusterSize: 1
-
-# in xos-core chart and other charts with multiple images
-images:
-  xos_core:
-    tag: 'master'
-  xos_chameleon:
-    tag: 'master'
-  xos_tosca:
-    tag: 'master'
-  xos_api_tester:
-    tag: 'master'
-  tosca_loader:
-    tag: 'master'
-# ONOS
-  onos:
-    repository: 'matteoscandolo/onos'
-    tag: '1.13-branch'
-# VOLTHA
-  envoy_for_etcd:
-    tag: 'voltha-1.7'
-  netconf:
-    tag: 'voltha-1.7'
-  ofagent:
-    tag: 'voltha-1.7'
-  vcli:
-    tag: 'voltha-1.7'
-  vcore:
-    tag: 'voltha-1.7'
-  alarm_generator:
-    tag: 'voltha-1.7'
-  # freeradius:
-  #   tag: 'voltha-1.7'
-# BBSim
-  bbsim:
-    tag: 'latest'
-
-# in xos-gui sub-chart required by xos-core chart
-xos-gui:
-  images:
-    xos_gui:
-      tag: 'master'
-    xos_ws:
-      tag: 'master'
-
-# in seba service chart
-fabric:
-  image:
-    tag: 'master'
-fabric-crossconnect:
-  image:
-    tag: 'master'
-onos-service:
-  image:
-    tag: 'master'
-sadis-server:
-  image:
-    tag: 'latest'
-volt:
-  image:
-    repository: "10.90.0.101:30500/xosproject/volt-synchronizer"
-    tag: 'candidate'
-    # tag: 'master'
-rcord:
-  image:
-    repository: "10.90.0.101:30500/xosproject/rcord-synchronizer"
-    tag: 'candidate'
-    #tag: 'master'
-
-# in base-kubernetes chart
-kubernetes:
-  image:
-    tag: 'master'
-
-# in workflow/att-workflow service chart
-att-workflow-driver:
-  image:
-    tag: 'master'
-
-  # this is mandatory, it's needed to correctly configure the kafka endpoint
-  kafkaService: cord-kafka
-
-# ONOS applications
-#aaaAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=aaa-app&v=1.9.0-SNAPSHOT&e=oar"
-#using older aaa-app version due to bug
-aaaAppUrl: "https://oss.sonatype.org/content/groups/public/org/opencord/aaa-app/1.9.0-SNAPSHOT/aaa-app-1.9.0-20190521.071409-20.oar"
-aaaAppVersion: "1.9.0.SNAPSHOT"
-
-sadisAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=sadis-app&v=3.1.0-SNAPSHOT&e=oar"
-sadisAppVersion: "3.1.0.SNAPSHOT"
-
-dhcpl2relayAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=dhcpl2relay-app&v=1.6.0-SNAPSHOT&e=oar"
-dhcpl2relayAppVersion: "1.6.0.SNAPSHOT"
-
-oltAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=olt-app&v=3.0.1-SNAPSHOT&e=oar"
-oltAppVersion: "3.0.1.SNAPSHOT"
-
-kafkaAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=kafka&v=1.1.0-SNAPSHOT&e=oar"
-kafkaAppVersion: "1.1.0.SNAPSHOT"
-
 application_logs: |
   log4j.logger.org.opencord.olt = DEBUG
   log4j.logger.org.opencord.kafka = DEBUG
diff --git a/tosca-configs/att-workflow/flex-ocp-cord-voltha-master-fabric.yaml b/tosca-configs/att-workflow/flex-ocp-cord-voltha-master-fabric.yaml
index dd1d59e..66bbe4d 100755
--- a/tosca-configs/att-workflow/flex-ocp-cord-voltha-master-fabric.yaml
+++ b/tosca-configs/att-workflow/flex-ocp-cord-voltha-master-fabric.yaml
@@ -24,6 +24,7 @@
   - custom_types/attworkflowdriverservice.yaml
   - custom_types/serviceinstanceattribute.yaml
   - custom_types/onosapp.yaml
+  - custom_types/technologyprofile.yaml
 
 description: Configures the Flex POD with AT&T workflow
 
@@ -56,7 +57,7 @@
     port#bng_port:
       type: tosca.nodes.SwitchPort
       properties:
-        portId: 8
+        portId: 3
       requirements:
         - switch:
             node: switch#leaf_1
@@ -68,7 +69,7 @@
       type: tosca.nodes.BNGPortMapping
       properties:
         s_tag: any
-        switch_port: 8
+        switch_port: 3
 
     # DHCP L2 Relay config
     onos_app#dhcpl2relay:
@@ -85,7 +86,7 @@
           {
             "dhcpl2relay" : {
               "useOltUplinkForServerPktInOut" : false,
-              "dhcpServerConnectPoints" : [ "of:0000cc37ab5b6da8/8" ]
+              "dhcpServerConnectPoints" : [ "of:0000cc37ab5b6da8/3" ]
             }
           }
       requirements:
@@ -110,3 +111,65 @@
         - owner:
             node: service#att
             relationship: tosca.relationships.BelongsToOne
+
+    technologyProfile:
+      type: tosca.nodes.TechnologyProfile
+      properties:
+        profile_id: 64
+        technology: xgspon
+        profile_value: >
+          {
+            "name": "4QueueHybridProfileMap1",
+            "profile_type": "XPON",
+            "version": 1.0,
+            "num_gem_ports": 1,
+            "instance_control": {
+              "onu": "multi-instance",
+              "uni": "single-instance",
+              "max_gem_payload_size": "auto"
+            },
+            "us_scheduler": {
+              "additional_bw": "auto",
+              "direction": "UPSTREAM",
+              "priority": 0,
+              "weight": 0,
+              "q_sched_policy": "hybrid"
+            },
+            "ds_scheduler": {
+              "additional_bw": "auto",
+              "direction": "DOWNSTREAM",
+              "priority": 0,
+              "weight": 0,
+              "q_sched_policy": "hybrid"
+            },
+            "upstream_gem_port_attribute_list": [{
+                "pbit_map": "0b11111111",
+                "aes_encryption": "True",
+                "scheduling_policy": "StrictPriority",
+                "priority_q": 1,
+                "weight": 0,
+                "discard_policy": "TailDrop",
+                "max_q_size": "auto",
+                "discard_config": {
+                  "min_threshold": 0,
+                  "max_threshold": 0,
+                  "max_probability": 0
+                }
+              }
+            ],
+            "downstream_gem_port_attribute_list": [{
+                "pbit_map": "0b11111111",
+                "aes_encryption": "True",
+                "scheduling_policy": "StrictPriority",
+                "priority_q": 1,
+                "weight": 0,
+                "discard_policy": "TailDrop",
+                "max_q_size": "auto",
+                "discard_config": {
+                  "min_threshold": 0,
+                  "max_threshold": 0,
+                  "max_probability": 0
+                }
+              }
+            ]
+          }
diff --git a/tosca-configs/att-workflow/flex-ocp-cord-voltha-master-olt.yaml b/tosca-configs/att-workflow/flex-ocp-cord-voltha-master-olt.yaml
index 96f1415..ad5c9f6 100755
--- a/tosca-configs/att-workflow/flex-ocp-cord-voltha-master-olt.yaml
+++ b/tosca-configs/att-workflow/flex-ocp-cord-voltha-master-olt.yaml
@@ -19,6 +19,7 @@
   - custom_types/oltdevice.yaml
   - custom_types/onudevice.yaml
   - custom_types/voltservice.yaml
+  - custom_types/technologyprofile.yaml
 description: Create a simulated OLT Device in VOLTHA
 topology_template:
   node_templates:
@@ -41,7 +42,70 @@
         outer_tpid: "0x8100"
         uplink: "65536"
         nas_id: "NAS_ID"
+        serial_number: "EC1838000853"
       requirements:
         - volt_service:
             node: service#volt
             relationship: tosca.relationships.BelongsToOne
+
+    technologyProfile:
+      type: tosca.nodes.TechnologyProfile
+      properties:
+        profile_id: 64
+        technology: xgspon
+        profile_value: >
+          {
+            "name": "4QueueHybridProfileMap1",
+            "profile_type": "XPON",
+            "version": 1.0,
+            "num_gem_ports": 1,
+            "instance_control": {
+              "onu": "multi-instance",
+              "uni": "single-instance",
+              "max_gem_payload_size": "auto"
+            },
+            "us_scheduler": {
+              "additional_bw": "auto",
+              "direction": "UPSTREAM",
+              "priority": 0,
+              "weight": 0,
+              "q_sched_policy": "hybrid"
+            },
+            "ds_scheduler": {
+              "additional_bw": "auto",
+              "direction": "DOWNSTREAM",
+              "priority": 0,
+              "weight": 0,
+              "q_sched_policy": "hybrid"
+            },
+            "upstream_gem_port_attribute_list": [{
+                "pbit_map": "0b11111111",
+                "aes_encryption": "True",
+                "scheduling_policy": "StrictPriority",
+                "priority_q": 1,
+                "weight": 0,
+                "discard_policy": "TailDrop",
+                "max_q_size": "auto",
+                "discard_config": {
+                  "min_threshold": 0,
+                  "max_threshold": 0,
+                  "max_probability": 0
+                }
+              }
+            ],
+            "downstream_gem_port_attribute_list": [{
+                "pbit_map": "0b11111111",
+                "aes_encryption": "True",
+                "scheduling_policy": "StrictPriority",
+                "priority_q": 1,
+                "weight": 0,
+                "discard_policy": "TailDrop",
+                "max_q_size": "auto",
+                "discard_config": {
+                  "min_threshold": 0,
+                  "max_threshold": 0,
+                  "max_probability": 0
+                }
+              }
+            ]
+          }
diff --git a/tosca-configs/att-workflow/flex-ocp-cord-voltha-master-subscriber.yaml b/tosca-configs/att-workflow/flex-ocp-cord-voltha-master-subscriber.yaml
index 4ea7fa0..ac9eb6d 100755
--- a/tosca-configs/att-workflow/flex-ocp-cord-voltha-master-subscriber.yaml
+++ b/tosca-configs/att-workflow/flex-ocp-cord-voltha-master-subscriber.yaml
@@ -53,6 +53,7 @@
         nas_port_id : "PON 1/1/03/1:1.1.1"
         circuit_id: foo1
         remote_id: bar1
+        tech_profile_id: 64
       requirements:
         - upstream_bps:
             node: bandwidth2_bp
diff --git a/tosca-configs/att-workflow/onf-demo-pod-olt.yaml b/tosca-configs/att-workflow/onf-demo-pod-olt.yaml
index 35b1607..0f46b05 100755
--- a/tosca-configs/att-workflow/onf-demo-pod-olt.yaml
+++ b/tosca-configs/att-workflow/onf-demo-pod-olt.yaml
@@ -19,6 +19,7 @@
   - custom_types/oltdevice.yaml
   - custom_types/onudevice.yaml
   - custom_types/voltservice.yaml
+  - custom_types/technologyprofile.yaml
 description: Creates OLT devices
 topology_template:
   node_templates:
@@ -41,9 +42,70 @@
         outer_tpid: "0x8100"
         uplink: "65536"
         nas_id: "NAS_ID"
-        serial_number: "192.168.100.111:9191"
+        serial_number: "EC1904000654"
       requirements:
         - volt_service:
             node: service#volt
             relationship: tosca.relationships.BelongsToOne
 
+    technologyProfile:
+      type: tosca.nodes.TechnologyProfile
+      properties:
+        profile_id: 64
+        technology: xgspon
+        profile_value: >
+          {
+            "name": "4QueueHybridProfileMap1",
+            "profile_type": "XPON",
+            "version": 1.0,
+            "num_gem_ports": 1,
+            "instance_control": {
+              "onu": "multi-instance",
+              "uni": "single-instance",
+              "max_gem_payload_size": "auto"
+            },
+            "us_scheduler": {
+              "additional_bw": "auto",
+              "direction": "UPSTREAM",
+              "priority": 0,
+              "weight": 0,
+              "q_sched_policy": "hybrid"
+            },
+            "ds_scheduler": {
+              "additional_bw": "auto",
+              "direction": "DOWNSTREAM",
+              "priority": 0,
+              "weight": 0,
+              "q_sched_policy": "hybrid"
+            },
+            "upstream_gem_port_attribute_list": [{
+                "pbit_map": "0b11111111",
+                "aes_encryption": "True",
+                "scheduling_policy": "StrictPriority",
+                "priority_q": 1,
+                "weight": 0,
+                "discard_policy": "TailDrop",
+                "max_q_size": "auto",
+                "discard_config": {
+                  "min_threshold": 0,
+                  "max_threshold": 0,
+                  "max_probability": 0
+                }
+              }
+            ],
+            "downstream_gem_port_attribute_list": [{
+                "pbit_map": "0b11111111",
+                "aes_encryption": "True",
+                "scheduling_policy": "StrictPriority",
+                "priority_q": 1,
+                "weight": 0,
+                "discard_policy": "TailDrop",
+                "max_q_size": "auto",
+                "discard_config": {
+                  "min_threshold": 0,
+                  "max_threshold": 0,
+                  "max_probability": 0
+                }
+              }
+            ]
+          }
diff --git a/tosca-configs/att-workflow/onf-demo-pod-subscriber.yaml b/tosca-configs/att-workflow/onf-demo-pod-subscriber.yaml
index ae6a792..dfcc81a 100755
--- a/tosca-configs/att-workflow/onf-demo-pod-subscriber.yaml
+++ b/tosca-configs/att-workflow/onf-demo-pod-subscriber.yaml
@@ -24,11 +24,26 @@
 topology_template:
   node_templates:
 
-    default_bp:
-     type: tosca.nodes.BandwidthProfile
-     properties:
+    default:
+      type: tosca.nodes.BandwidthProfile
+      properties:
         name: Default
         must-exist: true
+        air: 100000
+        cbs: 30
+        cir: 600
+        ebs: 30
+        eir: 400
+
+    high_speed_bp:
+      type: tosca.nodes.BandwidthProfile
+      properties:
+         air: 100000
+         cbs: 2000
+         cir: 5000
+         ebs: 2000
+         eir: 3000
+         name: Bronze
 
     # EdgeCore OLT subscribers
     edgecore_iskratel_subscriber:
@@ -45,10 +60,10 @@
         tech_profile_id: 64
       requirements:
        - upstream_bps:
-           node: default_bp
+           node: high_speed_bp
            relationship: tosca.relationships.BelongsToOne
        - downstream_bps:
-           node: default_bp
+           node: high_speed_bp
            relationship: tosca.relationships.BelongsToOne
 
     edgecore_brcm_subscriber:
@@ -65,8 +80,8 @@
         tech_profile_id: 64
       requirements:
        - upstream_bps:
-           node: default_bp
+           node: high_speed_bp
            relationship: tosca.relationships.BelongsToOne
        - downstream_bps:
-           node: default_bp
+           node: high_speed_bp
            relationship: tosca.relationships.BelongsToOne
diff --git a/tosca-configs/att-workflow/onlab-pod1-qa-fabric.yaml b/tosca-configs/att-workflow/onlab-pod1-qa-fabric.yaml
index 222075a..6ff081a 100755
--- a/tosca-configs/att-workflow/onlab-pod1-qa-fabric.yaml
+++ b/tosca-configs/att-workflow/onlab-pod1-qa-fabric.yaml
@@ -100,12 +100,11 @@
         name: att-workflow-driver
         must-exist: true
 
-    BRCM22222222:
+    ISKT71e801a0:
       type: tosca.nodes.AttWorkflowDriverWhiteListEntry
       properties:
-        serial_number: BRCM22222222
-        # pon_port_id: 536870912
-        pon_port_id: 12345678
+        serial_number: ISKT71e801a0
+        pon_port_id: 536870912
         device_id: of:000000000a5a0072
       requirements:
         - owner:
diff --git a/tosca-configs/att-workflow/onlab-pod1-qa-olt.yaml b/tosca-configs/att-workflow/onlab-pod1-qa-olt.yaml
index bbf5f71..dff53e4 100755
--- a/tosca-configs/att-workflow/onlab-pod1-qa-olt.yaml
+++ b/tosca-configs/att-workflow/onlab-pod1-qa-olt.yaml
@@ -12,13 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# curl -H "xos-username: admin@opencord.org" -H "xos-password: letmein" -X POST --data-binary @onlab-pod1-qa-olt.yaml http://10.90.0.101:30007/run
+# curl -H "xos-username: admin@opencord.org" -H "xos-password: letmein" -X POST --data-binary @onlab-pod1-olt.yaml http://10.90.0.101:30007/run
 
 tosca_definitions_version: tosca_simple_yaml_1_0
 imports:
   - custom_types/oltdevice.yaml
   - custom_types/onudevice.yaml
   - custom_types/voltservice.yaml
+  - custom_types/technologyprofile.yaml
 description: Create a simulated OLT Device in VOLTHA
 topology_template:
   node_templates:
@@ -38,6 +39,7 @@
         port: 9191
         switch_datapath_id: of:0000000000000001
         switch_port: "1"
+        serial_number: "EC1721000208"
         outer_tpid: "0x8100"
         uplink: "65536"
         nas_id: "NAS_ID"
@@ -45,3 +47,65 @@
         - volt_service:
             node: service#volt
             relationship: tosca.relationships.BelongsToOne
+
+    technologyProfile:
+      type: tosca.nodes.TechnologyProfile
+      properties:
+        profile_id: 64
+        technology: xgspon
+        profile_value: >
+          {
+            "name": "4QueueHybridProfileMap1",
+            "profile_type": "XPON",
+            "version": 1.0,
+            "num_gem_ports": 1,
+            "instance_control": {
+              "onu": "multi-instance",
+              "uni": "single-instance",
+              "max_gem_payload_size": "auto"
+            },
+            "us_scheduler": {
+              "additional_bw": "auto",
+              "direction": "UPSTREAM",
+              "priority": 0,
+              "weight": 0,
+              "q_sched_policy": "hybrid"
+            },
+            "ds_scheduler": {
+              "additional_bw": "auto",
+              "direction": "DOWNSTREAM",
+              "priority": 0,
+              "weight": 0,
+              "q_sched_policy": "hybrid"
+            },
+            "upstream_gem_port_attribute_list": [{
+                "pbit_map": "0b11111111",
+                "aes_encryption": "True",
+                "scheduling_policy": "StrictPriority",
+                "priority_q": 1,
+                "weight": 0,
+                "discard_policy": "TailDrop",
+                "max_q_size": "auto",
+                "discard_config": {
+                  "min_threshold": 0,
+                  "max_threshold": 0,
+                  "max_probability": 0
+                }
+              }
+            ],
+            "downstream_gem_port_attribute_list": [{
+                "pbit_map": "0b11111111",
+                "aes_encryption": "True",
+                "scheduling_policy": "StrictPriority",
+                "priority_q": 1,
+                "weight": 0,
+                "discard_policy": "TailDrop",
+                "max_q_size": "auto",
+                "discard_config": {
+                  "min_threshold": 0,
+                  "max_threshold": 0,
+                  "max_probability": 0
+                }
+              }
+            ]
+          }
diff --git a/tosca-configs/att-workflow/onlab-pod1-qa-subscriber.yaml b/tosca-configs/att-workflow/onlab-pod1-qa-subscriber.yaml
index c4cfb2b..74ee32c 100755
--- a/tosca-configs/att-workflow/onlab-pod1-qa-subscriber.yaml
+++ b/tosca-configs/att-workflow/onlab-pod1-qa-subscriber.yaml
@@ -34,22 +34,22 @@
     bandwidth2_bp:
       type: tosca.nodes.BandwidthProfile
       properties:
-         air: 99999
-         cbs: 99999
-         cir: 99999
-         ebs: 99999
-         eir: 99999
+         air: 100000
+         cbs: 10000
+         cir: 5000
+         ebs: 1000
+         eir: 5000
          name: bandwidth2
 
     # Pre-provision the subscriber the subscriber
     onf_subscriber_1:
       type: tosca.nodes.RCORDSubscriber
       properties:
-        name: Sub_BRCM22222222
+        name: Sub_ISKT71e801a0
         status: pre-provisioned
         c_tag: 111
         s_tag: 111
-        onu_device: BRCM22222222
+        onu_device: ISKT71e801a0
         nas_port_id : "PON 1/1/03/1:1.1.1"
         circuit_id: foo1
         remote_id: bar1
diff --git a/tosca-configs/att-workflow/onlab-pod1-subscriber.yaml b/tosca-configs/att-workflow/onlab-pod1-subscriber.yaml
index 937263a..fd736d3 100755
--- a/tosca-configs/att-workflow/onlab-pod1-subscriber.yaml
+++ b/tosca-configs/att-workflow/onlab-pod1-subscriber.yaml
@@ -27,11 +27,11 @@
     high_speed_bp:
       type: tosca.nodes.BandwidthProfile
       properties:
-         air: 2000
+         air: 100000
          cbs: 2000
-         cir: 2000
+         cir: 5000
          ebs: 2000
-         eir: 2000
+         eir: 3000
          name: Bronze
 
     # Pre-provision the subscriber the subscriber