diff --git a/kubernetes-configs/bbsim-voltha-1.7.yml b/kubernetes-configs/bbsim-voltha-1.7.yml
index 9adaa04..1c702d4 100644
--- a/kubernetes-configs/bbsim-voltha-1.7.yml
+++ b/kubernetes-configs/bbsim-voltha-1.7.yml
@@ -17,115 +17,6 @@
 # Use this file to deploy the 'master' (dev) versions of all services.
 # This is mainly useful for testing.
 
-# voltha
-etcd-cluster:
-  clusterSize: 1
-
-# in xos-core chart and other charts with multiple images
-images:
-  xos_tosca:
-    tag: '1.3.1'
-
-# ONOS
-  onos:
-    repository: 'matteoscandolo/onos'
-    tag: '1.13.9-rc4'
-
-# VOLTHA
-  vcore:
-    tag: 'voltha-1.7'
-  vcli:
-    tag: 'voltha-1.7'
-  ofagent:
-    tag: 'master'
-  netconf:
-    tag: 'voltha-1.7'
-  envoy_for_etcd:
-    tag: 'voltha-1.7'
-  alarm_generator:
-    tag: 'voltha-1.7'
-  freeradius:
-    tag: 'latest'
-
-# Ponsimv2
-  olt:
-    repository: "voltha/voltha-ponsim"
-    tag: "voltha-1.7"
-  onu:
-   repository: "voltha/voltha-ponsim"
-   tag: "voltha-1.7"
-
-# in xos-gui sub-chart required by xos-core chart
-xos-gui:
-  images:
-    xos_gui:
-      tag: '1.0.5'
-    xos_ws:
-      tag: '2.0.2'
-
-# in seba service chart
-fabric:
-  image:
-    tag: '2.2.1'
-fabric-crossconnect:
-  image:
-    tag: '1.2.1'
-onos-service:
-  image:
-    tag: '2.1.1'
-sadis-server:
-  image:
-    tag: 'latest'
-olt-service:
-  image:
-    tag: '2.2.1'
-rcord:
-  image:
-    tag: 'master'
-
-# in base-kubernetes chart
-kubernetes:
-  image:
-    tag: '1.2.1'
-
-# in workflow/att-workflow service chart
-att-workflow-driver:
-  image:
-    tag: '1.2.2'
-
-  # this is mandatory, it's needed to correctly configure the kafka endpoint
-  kafkaService: cord-kafka
-
-# in workflow/tt-workflow service chart
-tt-workflow-driver:
-  image:
-    tag: 'master'
-
-  # this is mandatory, it's needed to correctly configure the kafka endpoint
-  kafkaService: cord-kafka
-
-# in mininet chart
-vlanMatchDepth: 2
-
-# in ponsim-pod chart
-bandwidthProfiles: True
-
-# 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"
-
 application_logs: |
   log4j.logger.org.opencord.olt = DEBUG
   log4j.logger.org.opencord.kafka = TRACE
diff --git a/kubernetes-configs/bbsim-voltha-master.yml b/kubernetes-configs/bbsim-voltha-master.yml
index 2a48612..1abc1b3 100644
--- a/kubernetes-configs/bbsim-voltha-master.yml
+++ b/kubernetes-configs/bbsim-voltha-master.yml
@@ -17,124 +17,6 @@
 # Use this file to deploy the 'master' (dev) versions of all services.
 # This is mainly useful for testing.
 
-# voltha
-etcd-cluster:
-  clusterSize: 1
-
-# in xos-core chart and other charts with multiple images
-images:
-  xos_core:
-    tag: 'master'
-  xos_chameleon:
-    tag: 'master'
-  xos_tosca:
-    tag: 'master'
-  xos_api_tester:
-    tag: 'master'
-  tosca_loader:
-    tag: 'master'
-
-# ONOS
-  onos:
-    repository: 'onosproject/onos'
-    tag: '1.13.9'
-
-# VOLTHA
-  vcore:
-    tag: 'voltha-1.7'
-  vcli:
-    tag: 'voltha-1.7'
-  ofagent:
-    tag: 'voltha-1.7'
-  netconf:
-    tag: 'voltha-1.7'
-  envoy_for_etcd:
-    tag: 'voltha-1.7'
-  alarm_generator:
-    tag: 'voltha-1.7'
-  freeradius:
-    tag: 'latest'
-
-# Ponsimv2
-  olt:
-    repository: "voltha/voltha-ponsim"
-    tag: "voltha-1.7"
-  onu:
-   repository: "voltha/voltha-ponsim"
-   tag: "voltha-1.7"
-
-# in xos-gui sub-chart required by xos-core chart
-xos-gui:
-  images:
-    xos_gui:
-      tag: 'master'
-    xos_ws:
-      tag: 'master'
-
-# in seba service chart
-fabric:
-  image:
-    tag: 'master'
-fabric-crossconnect:
-  image:
-    tag: 'master'
-onos-service:
-  image:
-    tag: 'master'
-sadis-server:
-  image:
-    tag: 'latest'
-volt:
-  image:
-    tag: 'master'
-rcord:
-  image:
-    tag: 'master'
-
-# in base-kubernetes chart
-kubernetes:
-  image:
-    tag: 'master'
-
-# in workflow/att-workflow service chart
-att-workflow-driver:
-  image:
-    tag: 'master'
-
-  # this is mandatory, it's needed to correctly configure the kafka endpoint
-  kafkaService: cord-kafka
-
-# in workflow/tt-workflow service chart
-tt-workflow-driver:
-  image:
-    tag: 'master'
-
-  # this is mandatory, it's needed to correctly configure the kafka endpoint
-  kafkaService: cord-kafka
-
-# in mininet chart
-vlanMatchDepth: 2
-
-# in ponsim-pod chart
-bandwidthProfiles: True
-
-
-# ONOS applications
-aaaAppUrl: "https://oss.sonatype.org/content/groups/public/org/opencord/aaa-app/1.9.0/aaa-app-1.9.0.oar"
-aaaAppVersion: "1.9.0"
-
-sadisAppUrl: "https://oss.sonatype.org/content/groups/public/org/opencord/sadis-app/3.1.0/sadis-app-3.1.0.oar"
-sadisAppVersion: "3.1.0"
-
-dhcpl2relayAppUrl: "https://oss.sonatype.org/content/groups/public/org/opencord/dhcpl2relay-app/1.6.0/dhcpl2relay-app-1.6.0.oar"
-dhcpl2relayAppVersion: "1.6.0"
-
-oltAppUrl: "https://oss.sonatype.org/content/groups/public/org/opencord/olt-app/3.0.1/olt-app-3.0.1.oar"
-oltAppVersion: "3.0.1"
-
-kafkaAppUrl: "https://oss.sonatype.org/content/groups/public/org/opencord/kafka/1.1.0/kafka-1.1.0.oar"
-kafkaAppVersion: "1.1.0"
-
 application_logs: |
   log4j.logger.org.opencord.olt = DEBUG
   log4j.logger.org.opencord.kafka = TRACE
diff --git a/kubernetes-configs/onf-demo-pod.yml b/kubernetes-configs/onf-demo-pod.yml
index db768ff..dc5bd10 100644
--- a/kubernetes-configs/onf-demo-pod.yml
+++ b/kubernetes-configs/onf-demo-pod.yml
@@ -15,78 +15,6 @@
 
 # Automated deployment configuration for Flex POD 1 , olt/onu are connected to this
 
-# This file is used to optionally customize helm charts installations
-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:
-    #repository: '10.90.0.101:30500/voltha/voltha-voltha'
-    tag: 'voltha-1.7'
-    #tag: 'dev'
-
-# ONOS
-  onos:
-    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:
-    tag: 'master'
-
-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:
-    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"
-#using older aaa-app version due to bug
-aaaAppUrl: "https://oss.sonatype.org/content/groups/public/org/opencord/aaa-app/1.9.0-SNAPSHOT/aaa-app-1.9.0-20190521.071409-20.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"
-
 application_logs: |
   log4j.logger.org.opencord.olt = DEBUG
   log4j.logger.org.opencord.kafka = DEBUG
diff --git a/kubernetes-configs/onlab-pod1-qa.yml b/kubernetes-configs/onlab-pod1-qa.yml
index b6740c1..1bbb4b9 100644
--- a/kubernetes-configs/onlab-pod1-qa.yml
+++ b/kubernetes-configs/onlab-pod1-qa.yml
@@ -15,71 +15,6 @@
 
 # Automated deployment configuration for pod1 QA build , olt/onu are connected to this
 
-images:
-  xos_core:
-    tag: 'master'
-
-# 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'
-
-# ONOS
-  onos:
-    repository: 'onosproject/onos'
-    tag: '1.13.9'
-
-xos-gui:
-  images:
-    xos_gui:
-      tag: 'master'
-    xos_ws:
-      tag: 'master'
-
-volt:
-  image:
-    tag: 'master'
-
-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/content/groups/public/org/opencord/aaa-app/1.9.0/aaa-app-1.9.0.oar"
-aaaAppVersion: "1.9.0"
-
-sadisAppUrl: "https://oss.sonatype.org/content/groups/public/org/opencord/sadis-app/3.1.0/sadis-app-3.1.0.oar"
-sadisAppVersion: "3.1.0"
-
-dhcpl2relayAppUrl: "https://oss.sonatype.org/content/groups/public/org/opencord/dhcpl2relay-app/1.6.0/dhcpl2relay-app-1.6.0.oar"
-dhcpl2relayAppVersion: "1.6.0"
-
-oltAppUrl: "https://oss.sonatype.org/content/groups/public/org/opencord/olt-app/3.0.1/olt-app-3.0.1.oar"
-oltAppVersion: "3.0.1"
-
-kafkaAppUrl: "https://oss.sonatype.org/content/groups/public/org/opencord/kafka/1.1.0/kafka-1.1.0.oar"
-kafkaAppVersion: "1.1.0"
-
 application_logs: |
   log4j.logger.org.opencord.olt = DEBUG
   log4j.logger.org.opencord.kafka = DEBUG
diff --git a/kubernetes-configs/onlab-pod1.yml b/kubernetes-configs/onlab-pod1.yml
index 790a439..d8c048e 100644
--- a/kubernetes-configs/onlab-pod1.yml
+++ b/kubernetes-configs/onlab-pod1.yml
@@ -13,105 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# This file is used to optionally customize helm charts installations
-# voltha
-# etcd-cluster:
-#   clusterSize: 1
-
-# in xos-core chart and other charts with multiple images
-images:
-  xos_core:
-    tag: 'master'
-  xos_chameleon:
-    tag: 'master'
-  xos_tosca:
-    tag: 'master'
-  xos_api_tester:
-    tag: 'master'
-  tosca_loader:
-    tag: 'master'
-# ONOS
-  onos:
-    repository: 'matteoscandolo/onos'
-    tag: '1.13-branch'
-# 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'
-  alarm_generator:
-    tag: 'voltha-1.7'
-  # freeradius:
-  #   tag: 'voltha-1.7'
-# BBSim
-  bbsim:
-    tag: 'latest'
-
-# in xos-gui sub-chart required by xos-core chart
-xos-gui:
-  images:
-    xos_gui:
-      tag: 'master'
-    xos_ws:
-      tag: 'master'
-
-# in seba service chart
-fabric:
-  image:
-    tag: 'master'
-fabric-crossconnect:
-  image:
-    tag: 'master'
-onos-service:
-  image:
-    tag: 'master'
-sadis-server:
-  image:
-    tag: 'latest'
-volt:
-  image:
-    tag: 'master'
-rcord:
-  image:
-    tag: 'master'
-
-# in base-kubernetes chart
-kubernetes:
-  image:
-    tag: 'master'
-
-# in workflow/att-workflow service chart
-att-workflow-driver:
-  image:
-    tag: 'master'
-
-  # this is mandatory, it's needed to correctly configure the kafka endpoint
-  kafkaService: cord-kafka
-
-# 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"
-#using older aaa-app version due to bug
-aaaAppUrl: "https://oss.sonatype.org/content/groups/public/org/opencord/aaa-app/1.9.0-SNAPSHOT/aaa-app-1.9.0-20190521.071409-20.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"
-
 application_logs: |
   log4j.logger.org.opencord.olt = DEBUG
   log4j.logger.org.opencord.kafka = DEBUG