diff --git a/kubernetes-configs/bbsim-voltha-master.yml b/kubernetes-configs/bbsim-voltha-master.yml
index 79c72be..7083c3a 100644
--- a/kubernetes-configs/bbsim-voltha-master.yml
+++ b/kubernetes-configs/bbsim-voltha-master.yml
@@ -87,7 +87,7 @@
     tag: 'latest'
 volt:
   image:
-    tag: 'master'
+    tag: '2.2.3'
 rcord:
   image:
     tag: 'master'
diff --git a/kubernetes-configs/flex-ocp-cord-voltha-master.yml b/kubernetes-configs/flex-ocp-cord-voltha-master.yml
index 994ee20..bf7ef57 100644
--- a/kubernetes-configs/flex-ocp-cord-voltha-master.yml
+++ b/kubernetes-configs/flex-ocp-cord-voltha-master.yml
@@ -42,7 +42,12 @@
     repository: 'matteoscandolo/onos'
     tag: '1.13-branch'
     #tag: '1.13.9-rc4'
-
+xos-gui:
+  images:
+    xos_gui:
+      tag: 'master'
+    xos_ws:
+      tag: 'master'
 
 volt:
   image:
@@ -50,11 +55,15 @@
 
 rcord:
   image:
+    #repository: '10.90.0.101:30500/xosproject/rcord-synchronizer'
+    #tag: 'candidate'
     tag: 'master'
 
 att-workflow-driver:
   image:
     tag: 'master'
+    #repository: '10.90.0.101:30500/xosproject/att-workflow-driver-synchronizer'
+    #tag: 'candidate'
 
 sadis-server:
   image:
diff --git a/kubernetes-configs/onlab-pod1-qa.yml b/kubernetes-configs/onlab-pod1-qa.yml
index c0ac1b0..d69f6b6 100644
--- a/kubernetes-configs/onlab-pod1-qa.yml
+++ b/kubernetes-configs/onlab-pod1-qa.yml
@@ -31,9 +31,9 @@
     tag: 'voltha-1.7'
 
   vcore:
-    repository: '10.90.0.101:30500/voltha/voltha-voltha'
-    #tag: 'voltha-1.7'
-    tag: 'dev'
+    #repository: '10.90.0.101:30500/voltha/voltha-voltha'
+    tag: 'voltha-1.7'
+    #tag: 'dev'
 
 # ONOS
   onos:
diff --git a/tosca-configs/att-workflow/onf-demo-pod-fabric.yaml b/tosca-configs/att-workflow/onf-demo-pod-fabric.yaml
index 7604995..2f9d429 100755
--- a/tosca-configs/att-workflow/onf-demo-pod-fabric.yaml
+++ b/tosca-configs/att-workflow/onf-demo-pod-fabric.yaml
@@ -24,7 +24,6 @@
   - custom_types/attworkflowdriverservice.yaml
   - custom_types/serviceinstanceattribute.yaml
   - custom_types/onosapp.yaml
-  - custom_types/technologyprofile.yaml
 
 description: Configures the fabric and the whitelist
 
@@ -133,65 +132,3 @@
         - 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/onf-demo-pod-olt.yaml b/tosca-configs/att-workflow/onf-demo-pod-olt.yaml
index 7d65dbf..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,8 +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
+                }
+              }
+            ]
+          }