diff --git a/kubernetes-configs/bbwf.yml b/kubernetes-configs/bbwf.yml
index 7cd349f..d4fc5d8 100644
--- a/kubernetes-configs/bbwf.yml
+++ b/kubernetes-configs/bbwf.yml
@@ -1,10 +1,16 @@
 # SEBA Values
 
-envoyForEtcdImage: 'matteoscandolo/voltha-envoy:berlin-1.0.1'
-netconfImage: 'matteoscandolo/voltha-netconf:berlin-1.0.1'
-ofagentImage: 'matteoscandolo/voltha-ofagent:berlin-1.0.1'
-vcliImage: 'matteoscandolo/voltha-cli:berlin-1.0.1'
-vcoreImage: 'matteoscandolo/voltha-voltha:berlin-1.0.1'
+# envoyForEtcdImage: 'matteoscandolo/voltha-envoy:berlin-1.0.1'
+# netconfImage: 'matteoscandolo/voltha-netconf:berlin-1.0.1'
+# ofagentImage: 'matteoscandolo/voltha-ofagent:berlin-1.0.1'
+# vcliImage: 'matteoscandolo/voltha-cli:berlin-1.0.1'
+# vcoreImage: 'matteoscandolo/voltha-voltha:berlin-1.0.1'
+
+envoyForEtcdImage: 'matteoscandolo/voltha-envoy:latest'
+netconfImage: 'matteoscandolo/voltha-netconf:latest'
+ofagentImage: 'matteoscandolo/voltha-ofagent:latest'
+vcliImage: 'matteoscandolo/voltha-cli:latest'
+vcoreImage: 'matteoscandolo/voltha-voltha:latest'
 
 onosImage: 'onosproject/onos:1.13.5'
 
diff --git a/tosca-configs/att-workflow/bbwf-fabric.yaml b/tosca-configs/att-workflow/bbwf-fabric.yaml
index bbdc25e..565ccd7 100755
--- a/tosca-configs/att-workflow/bbwf-fabric.yaml
+++ b/tosca-configs/att-workflow/bbwf-fabric.yaml
@@ -136,30 +136,30 @@
             node: onos_app#dhcpl2relay
             relationship: tosca.relationships.BelongsToOne
 
-    # OLT app extra config
-    onos_app#olt:
-      type: tosca.nodes.ONOSApp
-      properties:
-        name: olt
-        must-exist: true
-
-    olt-config-attr:
-      type: tosca.nodes.ServiceInstanceAttribute
-      properties:
-        name: /onos/v1/network/configuration/devices
-        value: >
-          {
-            "of:00000024454a6be4" : {
-              "basic" : {
-                "name" : "ADTRAN OLT",
-                "driver" : "voltha"
-              }
-            }
-          }
-      requirements:
-        - service_instance:
-            node: onos_app#olt
-            relationship: tosca.relationships.BelongsToOne
+    # # OLT app extra config
+    # onos_app#olt:
+    #   type: tosca.nodes.ONOSApp
+    #   properties:
+    #     name: olt
+    #     must-exist: true
+    #
+    # olt-config-attr:
+    #   type: tosca.nodes.ServiceInstanceAttribute
+    #   properties:
+    #     name: /onos/v1/network/configuration/devices
+    #     value: >
+    #       {
+    #         "of:00000024454a6be4" : {
+    #           "basic" : {
+    #             "name" : "ADTRAN OLT",
+    #             "driver" : "voltha"
+    #           }
+    #         }
+    #       }
+    #   requirements:
+    #     - service_instance:
+    #         node: onos_app#olt
+    #         relationship: tosca.relationships.BelongsToOne
 
     # ONU Whitelist
     service#att: