diff --git a/kubernetes-configs/onf-demo-pod.yml b/kubernetes-configs/onf-demo-pod.yml
index 564a608..56a8c10 100644
--- a/kubernetes-configs/onf-demo-pod.yml
+++ b/kubernetes-configs/onf-demo-pod.yml
@@ -1,56 +1,56 @@
 ---
 # global:
 #   registry: 192.168.100.1:30500/
-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'
-# BBSIM
- bbsim:
-   repository: voltha/voltha-bbsim
-   tag: latest
-# ONOS
- onos:
-   repository: 'matteoscandolo/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
+# 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'
+# # BBSIM
+#  bbsim:
+#    repository: voltha/voltha-bbsim
+#    tag: latest
+# # ONOS
+#  onos:
+#    repository: 'matteoscandolo/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"
+# 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"
diff --git a/tosca-configs/att-workflow/onf-demo-pod-subscriber.yaml b/tosca-configs/att-workflow/onf-demo-pod-subscriber.yaml
index 4b7750a..c3d4bdf 100755
--- a/tosca-configs/att-workflow/onf-demo-pod-subscriber.yaml
+++ b/tosca-configs/att-workflow/onf-demo-pod-subscriber.yaml
@@ -17,7 +17,7 @@
 tosca_definitions_version: tosca_simple_yaml_1_0
 imports:
   - custom_types/rcordsubscriber.yaml
-  - custom_types/bandwidthprofile.yaml
+  # - custom_types/bandwidthprofile.yaml
 
 description: Pre-provsion subscribers
 
@@ -42,13 +42,13 @@
         nas_port_id : "PON 1/1/04/1:1.1.1"
         circuit_id: edgecore_iskratel_circuit
         remote_id: edgecore_iskratel_remote
-      requirements:
-       - upstream_bps:
-           node: default_bp
-           relationship: tosca.relationships.BelongsToOne
-       - downstream_bps:
-           node: default_bp
-           relationship: tosca.relationships.BelongsToOne
+      # requirements:
+      #  - upstream_bps:
+      #      node: default_bp
+      #      relationship: tosca.relationships.BelongsToOne
+      #  - downstream_bps:
+      #      node: default_bp
+      #      relationship: tosca.relationships.BelongsToOne
 
     edgecore_brcm_subscriber:
       type: tosca.nodes.RCORDSubscriber
@@ -61,10 +61,10 @@
         nas_port_id : "PON 1/1/04/1:1.1.2"
         circuit_id: edgecore_brcm_circuit
         remote_id: edgecore_brcm_remote
-      requirements:
-       - upstream_bps:
-           node: default_bp
-           relationship: tosca.relationships.BelongsToOne
-       - downstream_bps:
-           node: default_bp
-           relationship: tosca.relationships.BelongsToOne
+      # requirements:
+      #  - upstream_bps:
+      #      node: default_bp
+      #      relationship: tosca.relationships.BelongsToOne
+      #  - downstream_bps:
+      #      node: default_bp
+      #      relationship: tosca.relationships.BelongsToOne