diff --git a/kubernetes-configs/onlab-pod1.yml b/kubernetes-configs/onlab-pod1.yml
index 9af85ad..6e77848 100644
--- a/kubernetes-configs/onlab-pod1.yml
+++ b/kubernetes-configs/onlab-pod1.yml
@@ -1,31 +1,31 @@
 ---
 # SEBA Values
 
-images:
-  envoy_for_etcd:
-    repository: 'smbaker/voltha-envoy'
-    tag: '1.6'
+# images:
+#   envoy_for_etcd:
+#     repository: 'smbaker/voltha-envoy'
+#     tag: '1.6'
 
-  netconf:
-    repository: 'smbaker/voltha-netconf'
-    tag: '1.6'
+#   netconf:
+#     repository: 'smbaker/voltha-netconf'
+#     tag: '1.6'
 
-  ofagent:
-    repository: 'smbaker/voltha-ofagent'
-    tag: '1.6'
+#   ofagent:
+#     repository: 'smbaker/voltha-ofagent'
+#     tag: '1.6'
 
-  vcli:
-    repository: 'smbaker/voltha-cli'
-    tag: '1.6'
+#   vcli:
+#     repository: 'smbaker/voltha-cli'
+#     tag: '1.6'
 
-  vcore:
-    repository: 'smbaker/voltha-voltha'
-    tag: '1.6'
+#   vcore:
+#     repository: 'smbaker/voltha-voltha'
+#     tag: '1.6'
 
-volt:
-  image:
-      repository: smbaker/volt-synchronizer
-      tag: test-syncstep
+# volt:
+#   image:
+#       repository: smbaker/volt-synchronizer
+#       tag: test-syncstep
 
 application_logs: |
   log4j.logger.org.opencord.olt = TRACE
diff --git a/kubernetes-configs/onlab-pod2.yml b/kubernetes-configs/onlab-pod2.yml
index a439f2a..acc7102 100644
--- a/kubernetes-configs/onlab-pod2.yml
+++ b/kubernetes-configs/onlab-pod2.yml
@@ -1,29 +1,29 @@
 ---
 # SEBA Values
 
-images:
-  vcore:
-    tag: 'voltha-1.6'
+# images:
+#   vcore:
+#     tag: 'voltha-1.6'
 
-  vcli:
-    tag: 'voltha-1.6'
-    pullPolicy: 'Always'
+#   vcli:
+#     tag: 'voltha-1.6'
+#     pullPolicy: 'Always'
 
-  ofagent:
-    tag: 'voltha-1.6'
-    pullPolicy: 'Always'
+#   ofagent:
+#     tag: 'voltha-1.6'
+#     pullPolicy: 'Always'
 
-  netconf:
-    tag: 'voltha-1.6'
-    pullPolicy: 'Always'
+#   netconf:
+#     tag: 'voltha-1.6'
+#     pullPolicy: 'Always'
 
-  envoy_for_etcd:
-    tag: 'voltha-1.6'
-    pullPolicy: 'Always'
+#   envoy_for_etcd:
+#     tag: 'voltha-1.6'
+#     pullPolicy: 'Always'
 
-  alarm_generator:
-    tag: 'voltha-1.6'
-    pullPolicy: 'Always'
+#   alarm_generator:
+#     tag: 'voltha-1.6'
+#     pullPolicy: 'Always'
 
 #volt:
 #  image:
diff --git a/tosca-configs/att-workflow/onlab-pod1-olt.yaml b/tosca-configs/att-workflow/onlab-pod1-olt.yaml
index c94b5e1..c0a33f9 100755
--- a/tosca-configs/att-workflow/onlab-pod1-olt.yaml
+++ b/tosca-configs/att-workflow/onlab-pod1-olt.yaml
@@ -19,11 +19,6 @@
   - custom_types/oltdevice.yaml
   - custom_types/onudevice.yaml
   - custom_types/voltservice.yaml
-  - custom_types/attworkflowdriverwhitelistentry.yaml
-  - custom_types/attworkflowdriverservice.yaml
-  - custom_types/rcordsubscriber.yaml
-  - custom_types/switch.yaml
-  - custom_types/switchport.yaml
 description: Create a simulated OLT Device in VOLTHA
 topology_template:
   node_templates:
@@ -34,67 +29,19 @@
         name: volt
         must-exist: true
 
-    # CIG
     olt_device:
       type: tosca.nodes.OLTDevice
       properties:
-        name: CIG
+        name: ONF OLT
         device_type: openolt
-        host: 10.90.0.115
-        port: 10400
+        host: 10.90.0.114
+        port: 9191
         switch_datapath_id: of:0000000000000001
-        switch_port: "4"
+        switch_port: "1"
         outer_tpid: "0x8100"
         uplink: "65536"
         nas_id: "NAS_ID"
       requirements:
         - volt_service:
             node: service#volt
-            relationship: tosca.relationships.BelongsToOne
-
-    # Whitelist
-    service#att:
-      type: tosca.nodes.AttWorkflowDriverService
-      properties:
-        name: att-workflow-driver
-        must-exist: true
-
-    CIG:
-      type: tosca.nodes.AttWorkflowDriverWhiteListEntry
-      properties:
-        serial_number: CIGG70606829
-        pon_port_id: 536870913
-        device_id: of:000000000a5a0073
-      requirements:
-        - owner:
-            node: service#att
-            relationship: tosca.relationships.BelongsToOne
-
-    # Pre-provision the subscriber
-    cig_subscriber_1:
-      type: tosca.nodes.RCORDSubscriber
-      properties:
-        name: Sub_CIGG70606829
-        status: pre-provisioned
-        c_tag: 444
-        s_tag: 444
-        onu_device: CIGG70606829
-        nas_port_id : "PON 1/1/03/1:1.1.1"
-        circuit_id: foo1
-        remote_id: bar1
-
-    switch#leaf_1:
-      type: tosca.nodes.Switch
-      properties:
-        name: AGG_SWITCH
-        must-exist: true
-
-    port#cig_olt_port:
-      type: tosca.nodes.SwitchPort
-      properties:
-        portId: 4
-        host_learning: false
-      requirements:
-        - switch:
-            node: switch#leaf_1
             relationship: tosca.relationships.BelongsToOne
\ No newline at end of file