diff --git a/kubernetes-configs/flex-ocp-cord-voltha-master.yml b/kubernetes-configs/flex-ocp-cord-voltha-master.yml
index 3d86bab..994ee20 100644
--- a/kubernetes-configs/flex-ocp-cord-voltha-master.yml
+++ b/kubernetes-configs/flex-ocp-cord-voltha-master.yml
@@ -16,6 +16,9 @@
 # Automated deployment configuration for Flex POD 1 , olt/onu are connected to this
 
 images:
+  xos_core:
+    tag: 'master'
+
 # VOLTHA
   envoy_for_etcd:
     tag: 'voltha-1.7'
@@ -40,6 +43,7 @@
     tag: '1.13-branch'
     #tag: '1.13.9-rc4'
 
+
 volt:
   image:
     tag: 'master'
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 1cb2b4f..aa935e5 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
@@ -55,8 +55,8 @@
           {
             "name": "4QueueHybridProfileMap1",
             "profile_type": "XPON",
-            "version": 1.0,
-            "num_gem_ports": 1,
+            "version": 1,
+            "num_gem_ports": 4,
             "instance_control": {
               "onu": "multi-instance",
               "uni": "single-instance",
@@ -76,13 +76,56 @@
               "weight": 0,
               "q_sched_policy": "hybrid"
             },
-            "upstream_gem_port_attribute_list": [{
-                "pbit_map": "0b11000000",
-                "aes_encryption": "TRUE",
-                "scheduling_policy": "Strict-Priority",
-                "priority_q": 1,
+            "upstream_gem_port_attribute_list": [
+              {
+                "pbit_map": "0b00000101",
+                "aes_encryption": "True",
+                "scheduling_policy": "WRR",
+                "priority_q": 4,
+                "weight": 25,
+                "discard_policy": "TailDrop",
+                "max_q_size": "auto",
+                "discard_config": {
+                  "max_threshold": 0,
+                  "min_threshold": 0,
+                  "max_probability": 0
+                }
+              },
+              {
+                "pbit_map": "0b00011010",
+                "aes_encryption": "True",
+                "scheduling_policy": "WRR",
+                "priority_q": 3,
+                "weight": 75,
+                "discard_policy": "TailDrop",
+                "max_q_size": "auto",
+                "discard_config": {
+                  "min_threshold": 0,
+                  "max_threshold": 0,
+                  "max_probability": 0
+                }
+              },
+              {
+                "pbit_map": "0b00100000",
+                "aes_encryption": "True",
+                "scheduling_policy": "StrictPriority",
+                "priority_q": 2,
                 "weight": 0,
-                "discard_policy": "Tail-Drop",
+                "discard_policy": "TailDrop",
+                "max_q_size": "auto",
+                "discard_config": {
+                  "min_threshold": 0,
+                  "max_threshold": 0,
+                  "max_probability": 0
+                }
+              },
+              {
+                "pbit_map": "0b11000000",
+                "aes_encryption": "True",
+                "scheduling_policy": "StrictPriority",
+                "priority_q": 1,
+                "weight": 25,
+                "discard_policy": "TailDrop",
                 "max_q_size": "auto",
                 "discard_config": {
                   "min_threshold": 0,
@@ -91,13 +134,56 @@
                 }
               }
             ],
-            "downstream_gem_port_attribute_list": [{
-                "pbit_map": "0b11000000",
-                "aes_encryption": "TRUE",
-                "scheduling_policy": "Strict-Priority",
-                "priority_q": 1,
+            "downstream_gem_port_attribute_list": [
+              {
+                "pbit_map": "0b00000101",
+                "aes_encryption": "True",
+                "scheduling_policy": "WRR",
+                "priority_q": 4,
+                "weight": 10,
+                "discard_policy": "TailDrop",
+                "max_q_size": "auto",
+                "discard_config": {
+                  "min_threshold": 0,
+                  "max_threshold": 0,
+                  "max_probability": 0
+                }
+              },
+              {
+                "pbit_map": "0b00011010",
+                "aes_encryption": "True",
+                "scheduling_policy": "WRR",
+                "priority_q": 3,
+                "weight": 90,
+                "discard_policy": "TailDrop",
+                "max_q_size": "auto",
+                "discard_config": {
+                  "min_threshold": 0,
+                  "max_threshold": 0,
+                  "max_probability": 0
+                }
+              },
+              {
+                "pbit_map": "0b00100000",
+                "aes_encryption": "True",
+                "scheduling_policy": "StrictPriority",
+                "priority_q": 2,
                 "weight": 0,
-                "discard_policy": "Tail-Drop",
+                "discard_policy": "TailDrop",
+                "max_q_size": "auto",
+                "discard_config": {
+                  "min_threshold": 0,
+                  "max_threshold": 0,
+                  "max_probability": 0
+                }
+              },
+              {
+                "pbit_map": "0b11000000",
+                "aes_encryption": "True",
+                "scheduling_policy": "StrictPriority",
+                "priority_q": 1,
+                "weight": 25,
+                "discard_policy": "TailDrop",
                 "max_q_size": "auto",
                 "discard_config": {
                   "min_threshold": 0,