140 files changed, 874 insertions, 391 deletions
diff --git a/kubernetes/aaf/templates/aaf-cs-deployment.yaml b/kubernetes/aaf/templates/aaf-cs-deployment.yaml
index 23968f9313..acd6a7aeb6 100644
--- a/kubernetes/aaf/templates/aaf-cs-deployment.yaml
+++ b/kubernetes/aaf/templates/aaf-cs-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableAafAafCs }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -34,3 +35,4 @@ spec:
             path: /dockerdata-nfs/{{ .Values.nsPrefix }}/aaf/data
       imagePullSecrets:
       - name: {{ .Values.nsPrefix }}-docker-registry-key
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/aaf/templates/aaf-deployment.yaml b/kubernetes/aaf/templates/aaf-deployment.yaml
index 5950b92c00..56c99ea37f 100644
--- a/kubernetes/aaf/templates/aaf-deployment.yaml
+++ b/kubernetes/aaf/templates/aaf-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableAafAaf }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -62,3 +63,4 @@ spec:
             path: /dockerdata-nfs/{{ .Values.nsPrefix }}/aaf/data2
       imagePullSecrets:
       - name: {{ .Values.nsPrefix }}-docker-registry-key
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/aaf/templates/all-services.yaml b/kubernetes/aaf/templates/all-services.yaml
index 0d1dc2298c..be04180089 100644
--- a/kubernetes/aaf/templates/all-services.yaml
+++ b/kubernetes/aaf/templates/all-services.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableAafAafCs }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -18,6 +19,8 @@ spec:
   selector:
     app: aaf-cs
   clusterIP: None
+#{{ end }}
+#{{ if not .Values.disableAafAaf }}
 ---
 apiVersion: v1
 kind: Service
@@ -34,3 +37,4 @@ spec:
   selector:
     app: clamp
   type: NodePort
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/aai/templates/aai-deployment.yaml b/kubernetes/aai/templates/aai-deployment.yaml
index dc375cb6bc..3f714f3e64 100644
--- a/kubernetes/aai/templates/aai-deployment.yaml
+++ b/kubernetes/aai/templates/aai-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableAaiAaiService }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -68,3 +69,4 @@ spec:
       restartPolicy: Always
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/aai/templates/aai-resources-deployment.yaml b/kubernetes/aai/templates/aai-resources-deployment.yaml
index b0d437b61d..ebf447f3ca 100644
--- a/kubernetes/aai/templates/aai-resources-deployment.yaml
+++ b/kubernetes/aai/templates/aai-resources-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableAaiAaiResources }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -112,4 +113,4 @@ metadata:
   namespace: {{ .Values.nsPrefix }}-aai
 data:
 {{ (.Files.Glob "resources/resources/conf/logback.xml").AsConfig | indent 2 }}
-
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/aai/templates/aai-traversal-deployment.yaml b/kubernetes/aai/templates/aai-traversal-deployment.yaml
index d2a9c42f3f..a54c49a59d 100644
--- a/kubernetes/aai/templates/aai-traversal-deployment.yaml
+++ b/kubernetes/aai/templates/aai-traversal-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableAaiAaiTraversal }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -114,4 +115,4 @@ metadata:
   namespace: {{ .Values.nsPrefix }}-aai
 data:
 {{ (.Files.Glob "resources/traversal/conf/logback.xml").AsConfig | indent 2 }}
-
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/aai/templates/all-services.yaml b/kubernetes/aai/templates/all-services.yaml
index 01e24e8373..df7e3567d0 100644
--- a/kubernetes/aai/templates/all-services.yaml
+++ b/kubernetes/aai/templates/all-services.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableAaiHbase }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -24,6 +25,8 @@ spec:
   selector:
     app: hbase
   clusterIP: None
+#{{ end }}
+#{{ if not .Values.disableAaiAaiService }}
 ---
 apiVersion: v1
 kind: Service
@@ -162,6 +165,8 @@ spec:
   type: NodePort
   selector:
     app: aai-service
+#{{ end }}
+#{{ if not .Values.disableAaiModelLoaderService }}
 ---
 apiVersion: v1
 kind: Service
@@ -181,6 +186,7 @@ spec:
   type: NodePort
   selector:
     app: model-loader-service
+#{{ end }}
 ---
 apiVersion: v1
 kind: Service
@@ -196,6 +202,7 @@ spec:
   selector:
     app: gremlin
   clusterIP: None
+#{{ if not .Values.disableAaiElasticsearch }}
 ---
 apiVersion: v1
 kind: Service
@@ -211,6 +218,8 @@ spec:
   selector:
     app: elasticsearch
   clusterIP: None
+#{{ end }}
+#{{ if not .Values.disableAaiSearchDataService }}
 ---
 apiVersion: v1
 kind: Service
@@ -226,6 +235,8 @@ spec:
   selector:
     app: search-data-service
   clusterIP: None
+#{{ end }}
+#{{ if not .Values.disableAaiAaiTraversal }}
 ---
 apiVersion: v1
 kind: Service
@@ -243,6 +254,8 @@ spec:
   selector:
     app: aai-traversal
   clusterIP: None
+#{{ end }}
+#{{ if not .Values.disableAaiAaiResources }}
 ---
 apiVersion: v1
 kind: Service
@@ -260,6 +273,8 @@ spec:
   selector:
     app: aai-resources
   clusterIP: None
+#{{ end }}
+#{{ if not .Values.disableAaiSparkyBe }}
 ---
 apiVersion: v1
 kind: Service
@@ -274,4 +289,5 @@ spec:
     port: 9517
   selector:
     app: sparky-be
-  clusterIP: None  
-\ No newline at end of file
+  clusterIP: None
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/aai/templates/data-router-deployment.yaml b/kubernetes/aai/templates/data-router-deployment.yaml
index 4473dcf8fe..6b3c024c2a 100644
--- a/kubernetes/aai/templates/data-router-deployment.yaml
+++ b/kubernetes/aai/templates/data-router-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableAaiDataRouter }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -65,3 +66,4 @@ spec:
       restartPolicy: Always
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/aai/templates/elasticsearch-deployment.yaml b/kubernetes/aai/templates/elasticsearch-deployment.yaml
index 1fc92addfc..680f942c52 100644
--- a/kubernetes/aai/templates/elasticsearch-deployment.yaml
+++ b/kubernetes/aai/templates/elasticsearch-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableAaiElasticsearch }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -45,3 +46,4 @@ spec:
           path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/elasticsearch/es-data"
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/aai/templates/hbase-deployment.yaml b/kubernetes/aai/templates/hbase-deployment.yaml
index c261504d22..fd8e10cc5a 100644
--- a/kubernetes/aai/templates/hbase-deployment.yaml
+++ b/kubernetes/aai/templates/hbase-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableAaiHbase }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -41,3 +42,4 @@ spec:
           path: /etc/localtime
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/aai/templates/modelloader-deployment.yaml b/kubernetes/aai/templates/modelloader-deployment.yaml
index f800c446eb..7c2fddb7cf 100644
--- a/kubernetes/aai/templates/modelloader-deployment.yaml
+++ b/kubernetes/aai/templates/modelloader-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableAaiModelLoaderService }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -72,4 +73,4 @@ metadata:
   namespace: {{ .Values.nsPrefix }}-aai
 data:
 {{ (.Files.Glob "resources/model-loader/conf/logback.xml").AsConfig | indent 2 }}
-
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/aai/templates/search-data-service-deployment.yaml b/kubernetes/aai/templates/search-data-service-deployment.yaml
index 3eb0c5c714..60fdbb50cd 100644
--- a/kubernetes/aai/templates/search-data-service-deployment.yaml
+++ b/kubernetes/aai/templates/search-data-service-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableAaiSearchDataService }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -80,4 +81,4 @@ metadata:
   namespace: {{ .Values.nsPrefix }}-aai
 data:
 {{ (.Files.Glob "resources/search-data-service/conf/logback.xml").AsConfig | indent 2 }}
-
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/aai/templates/sparky-be-deployment.yaml b/kubernetes/aai/templates/sparky-be-deployment.yaml
index ee9e067281..c60725ee15 100644
--- a/kubernetes/aai/templates/sparky-be-deployment.yaml
+++ b/kubernetes/aai/templates/sparky-be-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableAaiSparkyBe }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -80,4 +81,4 @@ metadata:
   namespace: {{ .Values.nsPrefix }}-aai
 data:
 {{ (.Files.Glob "resources/sparky-be/conf/logback.xml").AsConfig | indent 2 }}
-
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/appc/templates/all-services.yaml b/kubernetes/appc/templates/all-services.yaml
index 5c42d72a01..8f7ed19ae1 100644
--- a/kubernetes/appc/templates/all-services.yaml
+++ b/kubernetes/appc/templates/all-services.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableAppcAppcDbhost }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -40,6 +41,8 @@ spec:
   selector:
     app: appc-dbhost
   clusterIP: None
+#{{ end }}
+#{{ if not .Values.disableAppcAppc }}
 ---
 apiVersion: v1
 kind: Service
@@ -60,6 +63,8 @@ spec:
   type: NodePort
   selector:
     app: appc
+#{{ end }}
+#{{ if not .Values.disableAppcAppcDgbuilder }}
 ---
 apiVersion: v1
 kind: Service
@@ -77,3 +82,4 @@ spec:
   type: NodePort
   selector:
     app: appc-dgbuilder
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/appc/templates/appc-deployment.yaml b/kubernetes/appc/templates/appc-deployment.yaml
index 9beaacaa66..e379c167d7 100644
--- a/kubernetes/appc/templates/appc-deployment.yaml
+++ b/kubernetes/appc/templates/appc-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableAppcAppc }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -111,3 +112,4 @@ spec:
             path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdnc/conf/aaiclient.properties
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/appc/templates/appc-pv-pvc.yaml b/kubernetes/appc/templates/appc-pv-pvc.yaml
index 2ce6228953..1702ba8ecb 100644
--- a/kubernetes/appc/templates/appc-pv-pvc.yaml
+++ b/kubernetes/appc/templates/appc-pv-pvc.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableAppcAppcDbhost }}
 apiVersion: v1
 kind: PersistentVolume
 metadata:
@@ -28,3 +29,4 @@ spec:
   selector:
     matchLabels:
       name: "{{ .Values.nsPrefix }}-appc-db"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/appc/templates/db-deployment.yaml b/kubernetes/appc/templates/db-deployment.yaml
index 560f48220d..607a0df81f 100644
--- a/kubernetes/appc/templates/db-deployment.yaml
+++ b/kubernetes/appc/templates/db-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableAppcAppcDbhost }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -44,3 +45,4 @@ spec:
           claimName: appc-db
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/appc/templates/dgbuilder-deployment.yaml b/kubernetes/appc/templates/dgbuilder-deployment.yaml
index a2bd4a1bbb..b9495a740b 100644
--- a/kubernetes/appc/templates/dgbuilder-deployment.yaml
+++ b/kubernetes/appc/templates/dgbuilder-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableAppcAppcDgbuilder }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -74,3 +75,4 @@ spec:
       restartPolicy: Always
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/clamp/templates/all-services.yaml b/kubernetes/clamp/templates/all-services.yaml
index 20ec58415d..163ed58aa9 100644
--- a/kubernetes/clamp/templates/all-services.yaml
+++ b/kubernetes/clamp/templates/all-services.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableClampClampMariadb }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -12,6 +13,8 @@ spec:
   selector:
     app: clamp-mariadb
   clusterIP: None
+#{{ end }}
+#{{ if not .Values.disableClampClamp }}
 ---
 apiVersion: v1
 kind: Service
@@ -26,3 +29,4 @@ spec:
   selector:
     app: clamp
   type: NodePort
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/clamp/templates/clamp-deployment.yaml b/kubernetes/clamp/templates/clamp-deployment.yaml
index ea3ef19456..493bb49b9e 100644
--- a/kubernetes/clamp/templates/clamp-deployment.yaml
+++ b/kubernetes/clamp/templates/clamp-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableClampClamp }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -57,3 +58,4 @@ spec:
           periodSeconds: 10
       imagePullSecrets:
       - name: {{ .Values.nsPrefix }}-docker-registry-key
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/clamp/templates/clamp-mariadb-deployment.yaml b/kubernetes/clamp/templates/clamp-mariadb-deployment.yaml
index 2f796258ac..46a6433b7e 100644
--- a/kubernetes/clamp/templates/clamp-mariadb-deployment.yaml
+++ b/kubernetes/clamp/templates/clamp-mariadb-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableClampClampMariadb }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -47,3 +48,4 @@ spec:
             claimName: clamp-db
       imagePullSecrets:
       - name: {{ .Values.nsPrefix }}-docker-registry-key
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/clamp/templates/clamp-pv-pvc.yaml b/kubernetes/clamp/templates/clamp-pv-pvc.yaml
index 5a82752a17..0d36141b6c 100644
--- a/kubernetes/clamp/templates/clamp-pv-pvc.yaml
+++ b/kubernetes/clamp/templates/clamp-pv-pvc.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableClampClampMariadb }}
 apiVersion: v1
 kind: PersistentVolume
 metadata:
@@ -28,3 +29,4 @@ spec:
   selector:
     matchLabels:
       name: "{{ .Values.nsPrefix }}-clamp-db"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/cli/templates/all-service.yaml b/kubernetes/cli/templates/all-service.yaml
index ffd9f68187..e848bfdc38 100644
--- a/kubernetes/cli/templates/all-service.yaml
+++ b/kubernetes/cli/templates/all-service.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableCliCli }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -14,3 +15,4 @@ spec:
   type: NodePort
   selector:
     app: cli
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/cli/templates/cli-deployment.yaml b/kubernetes/cli/templates/cli-deployment.yaml
index 88cb3eb3dc..3a702b9016 100644
--- a/kubernetes/cli/templates/cli-deployment.yaml
+++ b/kubernetes/cli/templates/cli-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableCliCli }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -32,3 +33,4 @@ spec:
           periodSeconds: 10
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/aai-search-data-service-health.json b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/aai-search-data-service-health.json
index c74fe8af26..b1877c7424 100644
--- a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/aai-search-data-service-health.json
+++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/aai-search-data-service-health.json
@@ -18,7 +18,7 @@
       {
         "id": "search-data-service-availability",
         "name": "Search Data Service Availability",
-        "script": "curl -k  --cert /consul/config/bin/client-cert-onap.crt.pem --cert-type PEM --key /consul/config/bin/client-cert-onap.key.pem --key-type PEM https://search-data-service.onap-aai:9509/services/search-data-service/v1/jaxrsExample/jaxrs-services/echo/up 2>&1 | grep 'Up'",
+        "script": "curl -k  --cert /consul/config/certs/client-cert-onap.crt.pem --cert-type PEM --key /consul/config/bin/client-cert-onap.key.pem --key-type PEM https://search-data-service.onap-aai:9509/services/search-data-service/v1/jaxrsExample/jaxrs-services/echo/up 2>&1 | grep 'Up'",
         "interval": "15s"
       },
       {
diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/bin/client-cert-onap.crt.pem b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/certs/client-cert-onap.crt.pem
index 5696aa3570..5696aa3570 100644
--- a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/bin/client-cert-onap.crt.pem
+++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/certs/client-cert-onap.crt.pem
diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/bin/client-cert-onap.key.pem b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/certs/client-cert-onap.key.pem
index c7e386e55f..c7e386e55f 100644
--- a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/bin/client-cert-onap.key.pem
+++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/certs/client-cert-onap.key.pem
diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/search-data-service-availability.sh b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/search-data-service-availability.sh
index e5cf5cfefb..fc0b04a72b 100755
--- a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/search-data-service-availability.sh
+++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/search-data-service-availability.sh
@@ -9,8 +9,8 @@ INDEX_URL="https://$SEARCH_SERVICE_NAME:$SEARCH_SERVICE_PORT/services/search-dat
 INDEX_SCHEMA="{\"fields\":[{\"name\": \"field1\", \"data-type\": \"string\"}]}"
 
 
-SEARCH_CERT_FILE="/consul/config/client-cert-onap.crt.pem"
-SEARCH_KEY_FILE="/consul/config/client-cert-onap.key.pem"
+SEARCH_CERT_FILE="/consul/config/certs/client-cert-onap.crt.pem"
+SEARCH_KEY_FILE="/consul/config/certs/client-cert-onap.key.pem"
 
 
 ## Try to create an index via the Search Data Service API.
diff --git a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/logback.xml b/kubernetes/config/docker/init/src/config/log/portal/onapportal/logback.xml
index 2c319e03a3..be55dc9cff 100644
--- a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/logback.xml
+++ b/kubernetes/config/docker/init/src/config/log/portal/onapportal/logback.xml
@@ -39,12 +39,12 @@
 
 <!DOCTYPE xml>
 <configuration scan="true" scanPeriod="3 seconds" debug="true">
-	<!-- Log-back files for the ECOMP Portal "ecompportal" are created in directory
-		${catalina.base}/logs/ecompportal; e.g., apache-tomcat-8.0.35/logs/ecompportal/application.log -->
+	<!-- Log-back files for the ECOMP Portal are created in directory 
+		${catalina.base}/logs/${componentName}; e.g., apache-tomcat-8.0.35/logs/onapportal/application.log -->
 	<!--<jmxConfigurator /> -->
 
 	<!-- specify the component name -->
-	<property name="componentName" value="ecompportal"></property>
+	<property name="componentName" value="onapportal"></property>
 
 	<!-- specify the base path of the log directory -->
 	<property name="logDirPrefix" value="${catalina.base}/logs"></property>
diff --git a/kubernetes/config/docker/init/src/config/log/portal/onapportalsdk/logback.xml b/kubernetes/config/docker/init/src/config/log/portal/onapportalsdk/logback.xml
new file mode 100644
index 0000000000..32a790c6a3
--- /dev/null
+++ b/kubernetes/config/docker/init/src/config/log/portal/onapportalsdk/logback.xml
@@ -0,0 +1,371 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============LICENSE_START==========================================
+  ONAP Portal SDK
+  ===================================================================
+  Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+  ===================================================================
+ 
+  Unless otherwise specified, all software contained herein is licensed
+  under the Apache License, Version 2.0 (the “License”);
+  you may not use this software except in compliance with the License.
+  You may obtain a copy of the License at
+ 
+              http://www.apache.org/licenses/LICENSE-2.0
+ 
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+ 
+  Unless otherwise specified, all documentation contained herein is licensed
+  under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+  you may not use this documentation except in compliance with the License.
+  You may obtain a copy of the License at
+ 
+              https://creativecommons.org/licenses/by/4.0/
+ 
+  Unless required by applicable law or agreed to in writing, documentation
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+ 
+  ============LICENSE_END============================================
+ 
+  ECOMP is a trademark and service mark of AT&T Intellectual Property.
+  -->
+
+<configuration scan="true" scanPeriod="3 seconds" debug="true">
+  <!-- 
+  Logback files for the ONAP Portal SDK Application 
+  are created in directory ${catalina.base}/logs/${componentName}
+  e.g., apache-tomcat-8.0.35/logs/epsdk_app/application.log  
+  -->
+  <!--<jmxConfigurator /> -->
+
+  <!--  specify the component name -->
+  <property name="componentName" value="epsdk_app"></property>
+  
+  <!--  specify the base path of the log directory -->
+  <property name="logDirPrefix" value="${catalina.base}/logs"></property>
+  
+  <!-- The directories where logs are written -->
+  <property name="logDirectory" value="${logDirPrefix}/${componentName}" />
+  <!-- Can easily relocate debug logs by modifying this path. -->
+  <property name="debugLogDirectory" value="${logDirPrefix}/${componentName}" />
+  
+  <!--  log file names -->
+  <property name="generalLogName" value="application" />
+  <property name="errorLogName" value="error" />
+  <property name="metricsLogName" value="metrics" />
+  <property name="auditLogName" value="audit" />
+  <property name="debugLogName" value="debug" />
+  <!--
+  These loggers are not used in code (yet). 
+  <property name="securityLogName" value="security" />
+  <property name="policyLogName" value="policy" />
+  <property name="performanceLogName" value="performance" />
+  <property name="serverLogName" value="server" />
+   -->
+  
+  <!-- 1610 Logging Fields Format Revisions --> 
+  <property name="auditLoggerPattern"
+	value="%X{AuditLogBeginTimestamp}|%X{AuditLogEndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{VirtualServerName}|%X{ServiceName}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{Timer}|%X{ServerFQDN}|%X{ClientIPAddress}|%X{ClassName}|%X{Unused}|%X{ProcessKey}|%X{CustomField1}|%X{CustomField2}|%X{CustomField3}|%X{CustomField4}| %msg%n" />
+
+  <property name="metricsLoggerPattern"
+	value="%X{MetricsLogBeginTimestamp}|%X{MetricsLogEndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{VirtualServerName}|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{Timer}|%X{ServerFQDN}|%X{ClientIPAddress}|%X{ClassName}|%X{Unused}|%X{ProcessKey}|%X{TargetVisualEntity}|%X{CustomField1}|%X{CustomField2}|%X{CustomField3}|%X{CustomField4}| %msg%n" />
+
+  <property name="errorLoggerPattern"
+	value="%date{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestId}|%thread|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{ClassName}|%X{AlertSeverity}|%X{ErrorCode}|%X{ErrorDescription}| %msg%n" />
+
+  <property name="defaultLoggerPattern"
+	value="%date{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestId}|%thread|%X{ClassName}| %msg%n" />
+
+  <!-- use %class so library logging calls yield their class name -->
+  <property name="applicationLoggerPattern"
+	value="%date{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestId}|%thread|%class{36}| %msg%n" />
+
+  <!-- Example evaluator filter applied against console appender -->
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>${defaultLoggerPattern}</pattern>
+    </encoder>
+  </appender>
+
+  <!-- ============================================================================ -->
+  <!-- EELF Appenders -->
+  <!-- ============================================================================ -->
+
+  <!-- The EELFAppender is used to record events to the general application 
+    log -->
+    
+    
+  <appender name="EELF"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${logDirectory}/${generalLogName}.log</file>
+    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> 
+      <!-- daily rollover --> 
+      <fileNamePattern>${logDirectory}/${generalLogName}.%d{yyyy-MM-dd}.log.zip</fileNamePattern> 
+ 
+      <!-- keep 30 days' worth of history capped at 3GB total size --> 
+      <maxHistory>30</maxHistory> 
+      <totalSizeCap>3GB</totalSizeCap> 
+ 
+    </rollingPolicy>
+    <encoder>
+      <pattern>${applicationLoggerPattern}</pattern>
+    </encoder>
+    <filter class="org.onap.portalapp.util.CustomLoggingFilter" />
+  </appender>
+  
+  <appender name="asyncEELF" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <!-- Class name is part of caller data -->
+    <includeCallerData>true</includeCallerData>
+    <appender-ref ref="EELF" />
+  </appender>
+
+  <!-- EELF Security Appender. This appender is used to record security events 
+    to the security log file. Security events are separate from other loggers 
+    in EELF so that security log records can be captured and managed in a secure 
+    way separate from the other logs. This appender is set to never discard any 
+    events. -->
+  <!--     
+  <appender name="EELFSecurity"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${logDirectory}/${securityLogName}.log</file>
+    <rollingPolicy
+      class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+      <fileNamePattern>${logDirectory}/${securityLogName}.%i.log.zip
+      </fileNamePattern>
+      <minIndex>1</minIndex>
+      <maxIndex>9</maxIndex>
+    </rollingPolicy>
+    <triggeringPolicy
+      class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+      <maxFileSize>5MB</maxFileSize>
+    </triggeringPolicy>
+    <encoder>
+      <pattern>${defaultPattern}</pattern>
+    </encoder>
+  </appender>
+  
+  <appender name="asyncEELFSecurity" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <discardingThreshold>0</discardingThreshold>
+    <appender-ref ref="EELFSecurity" />
+  </appender>
+   -->
+   
+  <!-- EELF Performance Appender. This appender is used to record performance 
+    records. -->
+  <!--
+  <appender name="EELFPerformance"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${logDirectory}/${performanceLogName}.log</file>
+    <rollingPolicy
+      class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+      <fileNamePattern>${logDirectory}/${performanceLogName}.%i.log.zip
+      </fileNamePattern>
+      <minIndex>1</minIndex>
+      <maxIndex>9</maxIndex>
+    </rollingPolicy>
+    <triggeringPolicy
+      class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+      <maxFileSize>5MB</maxFileSize>
+    </triggeringPolicy>
+    <encoder>
+      <outputPatternAsHeader>true</outputPatternAsHeader>
+      <pattern>${defaultPattern}</pattern>
+    </encoder>
+  </appender>
+  <appender name="asyncEELFPerformance" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFPerformance" />
+  </appender>
+  -->
+
+  <!-- EELF Server Appender. This appender is used to record Server related 
+    logging events. The Server logger and appender are specializations of the 
+    EELF application root logger and appender. This can be used to segregate Server 
+    events from other components, or it can be eliminated to record these events 
+    as part of the application root log. -->
+  <!--
+  <appender name="EELFServer"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${logDirectory}/${serverLogName}.log</file>
+    <rollingPolicy
+      class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+      <fileNamePattern>${logDirectory}/${serverLogName}.%i.log.zip
+      </fileNamePattern>
+      <minIndex>1</minIndex>
+      <maxIndex>9</maxIndex>
+    </rollingPolicy>
+    <triggeringPolicy
+      class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+      <maxFileSize>5MB</maxFileSize>
+    </triggeringPolicy>
+    <encoder>
+        <pattern>${defaultPattern}</pattern>
+    </encoder>
+  </appender>
+  <appender name="asyncEELFServer" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFServer" />
+  </appender>
+   -->
+  
+  <!-- EELF Policy Appender. This appender is used to record Policy engine 
+    related logging events. The Policy logger and appender are specializations 
+    of the EELF application root logger and appender. This can be used to segregate 
+    Policy engine events from other components, or it can be eliminated to record 
+    these events as part of the application root log. -->
+  <!--
+  <appender name="EELFPolicy"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${logDirectory}/${policyLogName}.log</file>
+    <rollingPolicy
+      class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+      <fileNamePattern>${logDirectory}/${policyLogName}.%i.log.zip
+      </fileNamePattern>
+      <minIndex>1</minIndex>
+      <maxIndex>9</maxIndex>
+    </rollingPolicy>
+    <triggeringPolicy
+      class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+      <maxFileSize>5MB</maxFileSize>
+    </triggeringPolicy>
+    <encoder>
+        <pattern>${defaultPattern}</pattern>
+    </encoder>
+  </appender>
+  <appender name="asyncEELFPolicy" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFPolicy" />
+  </appender>
+  -->
+  
+  <!-- EELF Audit Appender. This appender is used to record audit engine 
+    related logging events. The audit logger and appender are specializations 
+    of the EELF application root logger and appender. This can be used to segregate 
+    Policy engine events from other components, or it can be eliminated to record 
+    these events as part of the application root log. -->
+    
+  <appender name="EELFAudit"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${logDirectory}/${auditLogName}.log</file>
+    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> 
+      <!-- daily rollover --> 
+      <fileNamePattern>${logDirectory}/${auditLogName}.%d{yyyy-MM-dd}.log.zip</fileNamePattern> 
+ 
+      <!-- keep 30 days' worth of history capped at 3GB total size --> 
+      <maxHistory>30</maxHistory> 
+      <totalSizeCap>3GB</totalSizeCap> 
+ 
+    </rollingPolicy>
+    <encoder>
+         <pattern>${auditLoggerPattern}</pattern>
+    </encoder>
+  </appender>
+  <appender name="asyncEELFAudit" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFAudit" />
+  </appender>
+
+  <appender name="EELFMetrics"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${logDirectory}/${metricsLogName}.log</file>
+    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> 
+      <!-- daily rollover --> 
+      <fileNamePattern>${logDirectory}/${metricsLogName}.%d{yyyy-MM-dd}.log.zip</fileNamePattern> 
+ 
+      <!-- keep 30 days' worth of history capped at 3GB total size --> 
+      <maxHistory>30</maxHistory> 
+      <totalSizeCap>3GB</totalSizeCap> 
+ 
+    </rollingPolicy>
+    <encoder>
+      <pattern>${metricsLoggerPattern}</pattern>
+    </encoder>
+  </appender>
+  
+  
+  <appender name="asyncEELFMetrics" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFMetrics"/>
+  </appender>
+   
+  <appender name="EELFError"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${logDirectory}/${errorLogName}.log</file>
+    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> 
+      <!-- daily rollover --> 
+      <fileNamePattern>${logDirectory}/${errorLogName}.%d{yyyy-MM-dd}.log.zip</fileNamePattern> 
+ 
+      <!-- keep 30 days' worth of history capped at 3GB total size --> 
+      <maxHistory>30</maxHistory> 
+      <totalSizeCap>3GB</totalSizeCap> 
+ 
+    </rollingPolicy>
+    <encoder>
+      <pattern>${errorLoggerPattern}</pattern>
+    </encoder>
+  </appender>
+  
+  <appender name="asyncEELFError" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFError"/>
+  </appender>
+  
+   <appender name="EELFDebug"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${debugLogDirectory}/${debugLogName}.log</file>
+    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> 
+      <!-- daily rollover --> 
+      <fileNamePattern>${logDirectory}/${debugLogName}.%d{yyyy-MM-dd}.log.zip</fileNamePattern> 
+ 
+      <!-- keep 30 days' worth of history capped at 3GB total size --> 
+      <maxHistory>30</maxHistory> 
+      <totalSizeCap>3GB</totalSizeCap> 
+ 
+    </rollingPolicy>
+    <encoder>
+      <pattern>${defaultLoggerPattern}</pattern>
+    </encoder>
+  </appender>
+  
+  <appender name="asyncEELFDebug" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFDebug" />
+  </appender>
+ 
+  
+ 
+
+  <logger name="org.onap.eelf" level="info" additivity="false">
+    <appender-ref ref="asyncEELF" />
+  </logger>
+
+  <logger name="org.onap.eelf.audit" level="info" additivity="false">
+    <appender-ref ref="asyncEELFAudit" />
+  </logger>
+  
+  <logger name="org.onap.eelf.debug" level="debug" additivity="false">
+    <appender-ref ref="asyncEELFDebug" />
+  </logger>
+	
+  <logger name="org.onap.eelf.error" level="info" additivity="false">
+    <appender-ref ref="asyncEELFError" />
+  </logger>
+
+  <logger name="org.onap.eelf.metrics" level="info" additivity="false">
+    <appender-ref ref="asyncEELFMetrics" />
+  </logger>      
+    
+  <root level="DEBUG">
+    <appender-ref ref="asyncEELF" />
+  </root>
+
+</configuration>
diff --git a/kubernetes/config/docker/init/src/config/log/portal/portal-be/logback.xml b/kubernetes/config/docker/init/src/config/log/portal/portal-be/logback.xml
deleted file mode 100644
index 26533ef751..0000000000
--- a/kubernetes/config/docker/init/src/config/log/portal/portal-be/logback.xml
+++ /dev/null
@@ -1,244 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ================================================================================
-  eCOMP Portal
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  -->
-<!DOCTYPE xml>
-<configuration debug="true" scan="true" scanPeriod="3 seconds">
-    <!-- Log-back files for the ECOMP Portal "ecompportal" are created in directory 
-                ${catalina.base}/logs/ecompportal; e.g., apache-tomcat-8.0.35/logs/ecompportal/application.log -->
-    <!--<jmxConfigurator /> -->
-    <!-- specify the component name -->
-    <property name="componentName" value="portal"></property>
-    <property name="subComponentName" value="portalBE"></property>
-    <!-- specify the base path of the log directory -->
-    <property name="logDirPrefix" value="/var/log/onap"></property>
-    <!-- The directories where logs are written -->
-    <property name="logDirectory" value="${logDirPrefix}/${componentName}/${subComponentName}" />
-    <!-- Can easily relocate debug logs by modifying this path. -->
-    <property name="debugLogDirectory" value="${logDirPrefix}/${componentName}/${subComponentName}" />
-    <!-- log file names -->
-    <property name="generalLogName" value="application" />
-    <property name="errorLogName" value="error" />
-    <property name="metricsLogName" value="metrics" />
-    <property name="auditLogName" value="audit" />
-    <property name="debugLogName" value="debug" />
-    <!-- These loggers are not used in code (yet). <property name="securityLogName" 
-                value="security" /> <property name="policyLogName" value="policy" /> <property 
-                name="performanceLogName" value="performance" /> <property name="serverLogName" 
-                value="server" /> -->
-    <!-- ServerFQDN=Server,  -->
-    <property name="pattern" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}\t[%thread]\t%-5level\t%logger{36}\t%replace(%replace(%replace(%mdc){'\t','\\\\t'}){', ','\t'}){'\n', '\\\\n'}\t%replace(%replace(%msg){'\n', '\\\\n'}){'\t','\\\\t'}%n" />
-    <property name="maxHistory" value="30" />
-    <property name="queueSize" value="256" />
-    <property name="maxFileSize" value="50MB" />
-    <property name="totalSizeCap" value="10GB" />
-    <!-- Example evaluator filter applied against console appender -->
-    <appender class="ch.qos.logback.core.ConsoleAppender" name="STDOUT">
-        <encoder>
-            <pattern>${pattern}</pattern>
-        </encoder>
-    </appender>
-    <!-- ============================================================================ -->
-    <!-- EELF Appenders -->
-    <!-- ============================================================================ -->
-    <!-- The EELFAppender is used to record events to the general application 
-                log -->
-    <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="EELF">
-        <file>${logDirectory}/${generalLogName}.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- daily rollover -->
-            <fileNamePattern>${logDirectory}/${generalLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>${maxFileSize}</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-            <maxHistory>${maxHistory}</maxHistory>
-            <totalSizeCap>${totalSizeCap}</totalSizeCap>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${pattern}</pattern>
-        </encoder>
-        <filter class="org.openecomp.portalapp.portal.utils.CustomLoggingFilter" />
-    </appender>
-    <appender class="ch.qos.logback.classic.AsyncAppender" name="asyncEELF">
-        <queueSize>${queueSize}</queueSize>
-        <!-- Class name is part of caller data -->
-        <includeCallerData>true</includeCallerData>
-        <appender-ref ref="EELF" />
-    </appender>
-    <!-- EELF Security Appender. This appender is used to record security events 
-                to the security log file. Security events are separate from other loggers 
-                in EELF so that security log records can be captured and managed in a secure 
-                way separate from the other logs. This appender is set to never discard any 
-                events. -->
-    <!-- <appender name="EELFSecurity" class="ch.qos.logback.core.rolling.RollingFileAppender"> 
-                <file>${logDirectory}/${securityLogName}.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> 
-                <fileNamePattern>${logDirectory}/${securityLogName}.%i.log.zip </fileNamePattern> 
-                <minIndex>1</minIndex> <maxIndex>9</maxIndex> </rollingPolicy> <triggeringPolicy 
-                class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> <maxFileSize>5MB</maxFileSize> 
-                </triggeringPolicy> <encoder> <pattern>${defaultPattern}</pattern> </encoder> 
-                </appender> <appender name="asyncEELFSecurity" class="ch.qos.logback.classic.AsyncAppender"> 
-                <queueSize>256</queueSize> <discardingThreshold>0</discardingThreshold> <appender-ref 
-                ref="EELFSecurity" /> </appender> -->
-    <!-- EELF Performance Appender. This appender is used to record performance 
-                records. -->
-    <!-- <appender name="EELFPerformance" class="ch.qos.logback.core.rolling.RollingFileAppender"> 
-                <file>${logDirectory}/${performanceLogName}.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> 
-                <fileNamePattern>${logDirectory}/${performanceLogName}.%i.log.zip </fileNamePattern> 
-                <minIndex>1</minIndex> <maxIndex>9</maxIndex> </rollingPolicy> <triggeringPolicy 
-                class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> <maxFileSize>5MB</maxFileSize> 
-                </triggeringPolicy> <encoder> <outputPatternAsHeader>true</outputPatternAsHeader> 
-                <pattern>${defaultPattern}</pattern> </encoder> </appender> <appender name="asyncEELFPerformance" 
-                class="ch.qos.logback.classic.AsyncAppender"> <queueSize>256</queueSize> 
-                <appender-ref ref="EELFPerformance" /> </appender> -->
-    <!-- EELF Server Appender. This appender is used to record Server related 
-                logging events. The Server logger and appender are specializations of the 
-                EELF application root logger and appender. This can be used to segregate 
-                Server events from other components, or it can be eliminated to record these 
-                events as part of the application root log. -->
-    <!-- <appender name="EELFServer" class="ch.qos.logback.core.rolling.RollingFileAppender"> 
-                <file>${logDirectory}/${serverLogName}.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> 
-                <fileNamePattern>${logDirectory}/${serverLogName}.%i.log.zip </fileNamePattern> 
-                <minIndex>1</minIndex> <maxIndex>9</maxIndex> </rollingPolicy> <triggeringPolicy 
-                class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> <maxFileSize>5MB</maxFileSize> 
-                </triggeringPolicy> <encoder> <pattern>${defaultPattern}</pattern> </encoder> 
-                </appender> <appender name="asyncEELFServer" class="ch.qos.logback.classic.AsyncAppender"> 
-                <queueSize>256</queueSize> <appender-ref ref="EELFServer" /> </appender> -->
-    <!-- EELF Policy Appender. This appender is used to record Policy engine 
-                related logging events. The Policy logger and appender are specializations 
-                of the EELF application root logger and appender. This can be used to segregate 
-                Policy engine events from other components, or it can be eliminated to record 
-                these events as part of the application root log. -->
-    <!-- <appender name="EELFPolicy" class="ch.qos.logback.core.rolling.RollingFileAppender"> 
-                <file>${logDirectory}/${policyLogName}.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> 
-                <fileNamePattern>${logDirectory}/${policyLogName}.%i.log.zip </fileNamePattern> 
-                <minIndex>1</minIndex> <maxIndex>9</maxIndex> </rollingPolicy> <triggeringPolicy 
-                class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> <maxFileSize>5MB</maxFileSize> 
-                </triggeringPolicy> <encoder> <pattern>${defaultPattern}</pattern> </encoder> 
-                </appender> <appender name="asyncEELFPolicy" class="ch.qos.logback.classic.AsyncAppender"> 
-                <queueSize>256</queueSize> <appender-ref ref="EELFPolicy" /> </appender> -->
-    <!-- EELF Audit Appender. This appender is used to record audit engine related 
-                logging events. The audit logger and appender are specializations of the 
-                EELF application root logger and appender. This can be used to segregate 
-                Policy engine events from other components, or it can be eliminated to record 
-                these events as part of the application root log. -->
-    <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="EELFAudit">
-        <file>${logDirectory}/${auditLogName}.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- daily roll over -->
-            <fileNamePattern>${logDirectory}/${auditLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>${maxFileSize}</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-            <maxHistory>${maxHistory}</maxHistory>
-            <totalSizeCap>${totalSizeCap}</totalSizeCap>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${pattern}</pattern>
-        </encoder>
-    </appender>
-    <appender class="ch.qos.logback.classic.AsyncAppender" name="asyncEELFAudit">
-        <queueSize>${queueSize}</queueSize>
-        <appender-ref ref="EELFAudit" />
-    </appender>
-    <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="EELFMetrics">
-        <file>${logDirectory}/${metricsLogName}.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- daily roll over -->
-            <fileNamePattern>${logDirectory}/${metricsLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>${maxFileSize}</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-            <maxHistory>${maxHistory}</maxHistory>
-            <totalSizeCap>${totalSizeCap}</totalSizeCap>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${pattern}</pattern>
-        </encoder>
-    </appender>
-    <appender class="ch.qos.logback.classic.AsyncAppender" name="asyncEELFMetrics">
-        <queueSize>${queueSize}</queueSize>
-        <appender-ref ref="EELFMetrics" />
-    </appender>
-    <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="EELFError">
-        <file>${logDirectory}/${errorLogName}.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- daily roll over -->
-            <fileNamePattern>${logDirectory}/${errorLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>${maxFileSize}</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-            <maxHistory>${maxHistory}</maxHistory>
-            <totalSizeCap>${totalSizeCap}</totalSizeCap>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${pattern}</pattern>
-        </encoder>
-    </appender>
-    <appender class="ch.qos.logback.classic.AsyncAppender" name="asyncEELFError">
-        <queueSize>${queueSize}</queueSize>
-        <appender-ref ref="EELFError" />
-    </appender>
-    <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="EELFDebug">
-        <file>${debugLogDirectory}/${debugLogName}.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- daily roll over -->
-            <fileNamePattern>${logDirectory}/${debugLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>${maxFileSize}</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-            <maxHistory>${maxHistory}</maxHistory>
-            <totalSizeCap>${totalSizeCap}</totalSizeCap>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${pattern}</pattern>
-        </encoder>
-    </appender>
-    <appender class="ch.qos.logback.classic.AsyncAppender" name="asyncEELFDebug">
-        <queueSize>${queueSize}</queueSize>
-        <appender-ref ref="EELFDebug" />
-        <includeCallerData>true</includeCallerData>
-    </appender>
-    <!-- ============================================================================ -->
-    <!-- EELF loggers -->
-    <!-- ============================================================================ -->
-    <logger additivity="false" level="info" name="com.att.eelf">
-        <appender-ref ref="asyncEELF" />
-    </logger>
-    <!-- <logger name="com.att.eelf.security" level="info" additivity="false"> 
-                <appender-ref ref="asyncEELFSecurity" /> </logger> <logger name="com.att.eelf.perf" 
-                level="info" additivity="false"> <appender-ref ref="asyncEELFPerformance" 
-                /> </logger> <logger name="com.att.eelf.server" level="info" additivity="false"> 
-                <appender-ref ref="asyncEELFServer" /> </logger> <logger name="com.att.eelf.policy" 
-                level="info" additivity="false"> <appender-ref ref="asyncEELFPolicy" /> </logger> -->
-    <logger additivity="false" level="info" name="com.att.eelf.audit">
-        <appender-ref ref="asyncEELFAudit" />
-    </logger>
-    <logger additivity="false" level="info" name="com.att.eelf.metrics">
-        <appender-ref ref="asyncEELFMetrics" />
-    </logger>
-    <logger additivity="false" level="info" name="com.att.eelf.error">
-        <appender-ref ref="asyncEELFError" />
-    </logger>
-    <logger additivity="false" level="debug" name="com.att.eelf.debug">
-        <appender-ref ref="asyncEELFDebug" />
-    </logger>
-    <root level="INFO">
-        <appender-ref ref="asyncEELF" />
-    </root>
-</configuration>
-\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/portal/mariadb/oom_updates.sql b/kubernetes/config/docker/init/src/config/portal/mariadb/oom_updates.sql
index 18efa92de3..3c7206c510 100644
--- a/kubernetes/config/docker/init/src/config/portal/mariadb/oom_updates.sql
+++ b/kubernetes/config/docker/init/src/config/portal/mariadb/oom_updates.sql
@@ -4,4 +4,4 @@ Any updates required by OOM to the portaldb are made here.
 1. split up SDC-FE and SDC-BE.  Originally both FE and BE point to the same IP
 while the OOM K8s version has these service split up.
 */
-UPDATE fn_app SET app_rest_endpoint = 'http://sdc.api.be.simpledemo.openecomp.org:8080/api/v2' where app_name = 'SDC';
+UPDATE fn_app SET app_rest_endpoint = 'http://sdc.api.be.simpledemo.onap.org:8080/api/v2' where app_name = 'SDC';
diff --git a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/openid-connect.properties b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/openid-connect.properties
deleted file mode 100755
index 33c919b214..0000000000
--- a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/openid-connect.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-authentication_server_url = http://portal.api.simpledemo.openecomp.org:8383/openid-connect-server-webapp/
-ecomp_openid_connect_client = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/openid_connect_login
-ecomp_redirect_uri = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/welcome.htm
diff --git a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/fusion.properties b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ONAPPORTAL/fusion.properties
index 20285e3677..876c5c7b9a 100755
--- a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/fusion.properties
+++ b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ONAPPORTAL/fusion.properties
@@ -4,7 +4,7 @@
 # validator settings
 #default_error_message = Default error message
 
-login_url_no_ret_val = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/login.htm
+login_url_no_ret_val = http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login.htm
 
 user_attribute_name      = user
 
diff --git a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ONAPPORTAL/openid-connect.properties b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ONAPPORTAL/openid-connect.properties
new file mode 100755
index 0000000000..2a33551933
--- /dev/null
+++ b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ONAPPORTAL/openid-connect.properties
@@ -0,0 +1,3 @@
+authentication_server_url = http://portal.api.simpledemo.onap.org:8383/openid-connect-server-webapp/
+ecomp_openid_connect_client = http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/openid_connect_login
+ecomp_redirect_uri = http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/welcome.htm
diff --git a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/portal.properties b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ONAPPORTAL/portal.properties
index 0863ef5fc2..4871b42288 100755
--- a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/portal.properties
+++ b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ONAPPORTAL/portal.properties
@@ -5,10 +5,10 @@ max.idle.time = 5
 user.attribute.name = user_attribute
 
 # for single sign on
-ecomp_redirect_url = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/login.htm
+ecomp_redirect_url = http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login.htm
 
 # URL of the ECOMP Portal REST API
-ecomp_rest_url = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/auxapi
+ecomp_rest_url = http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/auxapi
 
 ueb_listeners_enable = true
 
diff --git a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/system.properties b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ONAPPORTAL/system.properties
index 2cb38443a6..9085cee47f 100755
--- a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/system.properties
+++ b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ONAPPORTAL/system.properties
@@ -44,10 +44,10 @@ log_cron                      = 0 * * * * ? *
 sessiontimeout_feed_cron	  = 0 0/5 * * * ? *
 
 #Front end URL
-frontend_url                  = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/applicationsHome
+frontend_url                  = http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/applicationsHome 
 
 #cookie domain
-cookie_domain = openecomp.org
+cookie_domain = onap.org
 
 # An Unqiue 128-bit value defined to indentify a specific version of
 # ECOMP Portal deployed on a specific virtual machine.
@@ -62,7 +62,7 @@ user_guide_link             = http://
 
 # Contact Us page properties
 ush_ticket_url				= http://
-feedback_email_address		= portal@lists.openecomp.org
+feedback_email_address		= portal@lists.onap.org
 portal_info_url				= https://
 
 #Online user bar refresh interval, in seconds
@@ -72,7 +72,7 @@ online_user_update_rate                  = 30
 online_user_update_duration       = 300
 
 #authenticate user server
-authenticate_user_server=http://portal.api.simpledemo.openecomp.org:8383/openid-connect-server-webapp/allUsers
+authenticate_user_server=http://portal.api.simpledemo.onap.org:8383/openid-connect-server-webapp/allUsers
 
 #window width threshold to collapse left/right menu when page onload
 window_width_threshold_left_menu = 1400
diff --git a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPSDKAPP/fusion.properties b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ONAPPORTALSDK/fusion.properties
index 8ee0a95f74..8ee0a95f74 100644
--- a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPSDKAPP/fusion.properties
+++ b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ONAPPORTALSDK/fusion.properties
diff --git a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPSDKAPP/portal.properties b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ONAPPORTALSDK/portal.properties
index b68ab07f7f..e77a701798 100755
--- a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPSDKAPP/portal.properties
+++ b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ONAPPORTALSDK/portal.properties
@@ -20,11 +20,11 @@ use_rest_for_functional_menu=true
 portal.api.impl.class = org.onap.portalapp.service.OnBoardingApiServiceImpl
 
 # CSP Global Log On for single sign on
-ecomp_redirect_url = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/login.htm
+ecomp_redirect_url = http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login.htm
 
 # URL of the ECOMP Portal REST API
 
-ecomp_rest_url = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/auxapi
+ecomp_rest_url = http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/auxapi
 
 # Applications do not need to run a UEB listener in 1610.
 ueb_listeners_enable = false
diff --git a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPSDKAPP/system.properties b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ONAPPORTALSDK/system.properties
index d638abcca3..d638abcca3 100755
--- a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPSDKAPP/system.properties
+++ b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ONAPPORTALSDK/system.properties
diff --git a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPWIDGETMS/application.properties b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ONAPWIDGETMS/application.properties
index baf571eb45..a5e55dc6d8 100644
--- a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPWIDGETMS/application.properties
+++ b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ONAPWIDGETMS/application.properties
@@ -19,7 +19,7 @@ security.user.name=widget_user
 security.user.password=ENC(IjywcRnI9+nuVEh9+OFFiRWAjBT1n718)
 
 initialization.default.widgets=true
-initialization.widgetData.url=http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/commonWidgets
+initialization.widgetData.url=http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/commonWidgets
 
 ## Account Basic Authentication Properties
 account.user.name=portal
diff --git a/kubernetes/consul/templates/consul-agent-deployment.yaml b/kubernetes/consul/templates/consul-agent-deployment.yaml
index 15318660b5..aa8e096f6a 100644
--- a/kubernetes/consul/templates/consul-agent-deployment.yaml
+++ b/kubernetes/consul/templates/consul-agent-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableConsulConsulAgent }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -27,3 +28,4 @@ spec:
       - hostPath:
           path: {{ .Values.rootHostPath }}/{{ .Values.nsPrefix }}/consul/consul-agent-config
         name: consul-agent-config
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/consul/templates/consul-server-deployment.yaml b/kubernetes/consul/templates/consul-server-deployment.yaml
index e914b6b198..a2feb9f6a3 100644
--- a/kubernetes/consul/templates/consul-server-deployment.yaml
+++ b/kubernetes/consul/templates/consul-server-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableConsulConsulServer }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -28,3 +29,4 @@ spec:
       - hostPath:
           path: {{ .Values.rootHostPath }}/{{ .Values.nsPrefix }}/consul/consul-server-config
         name: consul-server-config
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/consul/templates/consul-server-service.yaml b/kubernetes/consul/templates/consul-server-service.yaml
index 465456425e..3dd801664c 100644
--- a/kubernetes/consul/templates/consul-server-service.yaml
+++ b/kubernetes/consul/templates/consul-server-service.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableConsulConsulServer }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -20,3 +21,4 @@ spec:
   selector:
     app: consul-server
   type: {{ .Values.service.type | quote }}
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/dcae/templates/all-services.yaml b/kubernetes/dcae/templates/all-services.yaml
index 45d22dba21..b0170734dd 100644
--- a/kubernetes/dcae/templates/all-services.yaml
+++ b/kubernetes/dcae/templates/all-services.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableDcaeZookeeper }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -12,6 +13,8 @@ spec:
   selector:
     app: zookeeper
   clusterIP: None
+#{{ end }}
+#{{ if not .Values.disableDcaeKafka }}
 ---
 apiVersion: v1
 kind: Service
@@ -27,6 +30,8 @@ spec:
   selector:
     app: kafka
   clusterIP: None
+#{{ end }}
+#{{ if not .Values.disableDcaeDmaap }}
 ---
 apiVersion: v1
 kind: Service
@@ -48,6 +53,8 @@ spec:
     app: dmaap
   #type: NodePort
   clusterIP: None
+#{{ end }}
+#{{ if not .Values.disableDcaeDcaePgaas }}
 ---
 apiVersion: v1
 kind: Service
@@ -65,6 +72,8 @@ spec:
       targetPort: 5432
       nodePort: {{ .Values.nodePortPrefix }}45
   type: NodePort
+#{{ end }}
+#{{ if not .Values.disableDcaeDcaeCollectorCommonEvent }}
 ---
 apiVersion: v1
 kind: Service
@@ -91,6 +100,8 @@ spec:
   selector:
     app: dcae-collector-common-event
   type: NodePort
+#{{ end }}
+#{{ if not .Values.disableDcaeDcaeCollectorDmaapbc }}
 ---
 apiVersion: v1
 kind: Service
@@ -115,3 +126,4 @@ spec:
   selector:
     app: dcae-collector-dmaapbc
   type: NodePort
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/dcae/templates/cdap0-dep.yaml b/kubernetes/dcae/templates/cdap0-dep.yaml
index d438ab9477..c6239e219b 100644
--- a/kubernetes/dcae/templates/cdap0-dep.yaml
+++ b/kubernetes/dcae/templates/cdap0-dep.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableDcaeCdap }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -82,3 +83,4 @@ spec:
           path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/cdap/cdap0-opt-data
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/dcae/templates/cdap1-dep.yaml b/kubernetes/dcae/templates/cdap1-dep.yaml
index efc64da203..64f69d32dd 100644
--- a/kubernetes/dcae/templates/cdap1-dep.yaml
+++ b/kubernetes/dcae/templates/cdap1-dep.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableDcaeCdap }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -82,3 +83,4 @@ spec:
           path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/cdap/cdap1-opt-data
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/dcae/templates/cdap2-dep.yaml b/kubernetes/dcae/templates/cdap2-dep.yaml
index 64f8e300b7..f6d6ec70e4 100644
--- a/kubernetes/dcae/templates/cdap2-dep.yaml
+++ b/kubernetes/dcae/templates/cdap2-dep.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableDcaeCdap }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -82,3 +83,4 @@ spec:
           path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/cdap/cdap2-opt-data
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/dcae/templates/dcae-collector-common-event.yaml b/kubernetes/dcae/templates/dcae-collector-common-event.yaml
index c77e5a4d96..aa51f140ff 100644
--- a/kubernetes/dcae/templates/dcae-collector-common-event.yaml
+++ b/kubernetes/dcae/templates/dcae-collector-common-event.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableDcaeDcaeCollectorCommonEvent }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -36,3 +37,4 @@ spec:
           path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/common-event/config
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/dcae/templates/dcae-collector-dmaapbc.yaml b/kubernetes/dcae/templates/dcae-collector-dmaapbc.yaml
index a36d5061f2..5de893b867 100644
--- a/kubernetes/dcae/templates/dcae-collector-dmaapbc.yaml
+++ b/kubernetes/dcae/templates/dcae-collector-dmaapbc.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableDcaeDcaeCollectorDmaapbc }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -35,3 +36,4 @@ spec:
           path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/dmaapbc/config
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/dcae/templates/dcae-controller.yaml b/kubernetes/dcae/templates/dcae-controller.yaml
index 459e81e8b3..30f3afb907 100644
--- a/kubernetes/dcae/templates/dcae-controller.yaml
+++ b/kubernetes/dcae/templates/dcae-controller.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableDcaeDcaeController }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -59,3 +60,4 @@ spec:
           path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/dcae-controller/config
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/dcae/templates/dcae-dmaap.yaml b/kubernetes/dcae/templates/dcae-dmaap.yaml
index e1f61e5135..885620b18d 100644
--- a/kubernetes/dcae/templates/dcae-dmaap.yaml
+++ b/kubernetes/dcae/templates/dcae-dmaap.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableDcaeDmaap }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -73,3 +74,4 @@ spec:
           path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/message-router/dmaap/mykey
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/dcae/templates/dcae-kafka.yaml b/kubernetes/dcae/templates/dcae-kafka.yaml
index 9a092264f9..9bfca2bd94 100644
--- a/kubernetes/dcae/templates/dcae-kafka.yaml
+++ b/kubernetes/dcae/templates/dcae-kafka.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableDcaeKafka }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -81,3 +82,4 @@ spec:
           path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/message-router/dcae-startup-vm-message-router/docker_files/start-kafka.sh
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/dcae/templates/dcae-zookeeper.yaml b/kubernetes/dcae/templates/dcae-zookeeper.yaml
index 8d03c9d985..189a03952d 100644
--- a/kubernetes/dcae/templates/dcae-zookeeper.yaml
+++ b/kubernetes/dcae/templates/dcae-zookeeper.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableDcaeZookeeper }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -29,3 +30,4 @@ spec:
           path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-zookeeper
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/dcae/templates/pgaas.yaml b/kubernetes/dcae/templates/pgaas.yaml
index de62be501a..788de60231 100644
--- a/kubernetes/dcae/templates/pgaas.yaml
+++ b/kubernetes/dcae/templates/pgaas.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableDcaeDcaePgaas }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -45,3 +46,4 @@ spec:
           path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/pgaas/tools
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/dcaegen2/templates/pod.yaml b/kubernetes/dcaegen2/templates/pod.yaml
index e275ff671d..ffb3716ecf 100644
--- a/kubernetes/dcaegen2/templates/pod.yaml
+++ b/kubernetes/dcaegen2/templates/pod.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableDcaegen2 }}
 apiVersion: v1
 kind: Pod
 metadata:
@@ -25,4 +26,5 @@ spec:
           name: "{{ .Chart.Name }}-config-inputs"
   imagePullSecrets:
   - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-  restartPolicy: Never
-\ No newline at end of file
+  restartPolicy: Never
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/kube2msb/templates/kube2msb-registrator-deployment.yaml b/kubernetes/kube2msb/templates/kube2msb-registrator-deployment.yaml
index 502c1fa50f..9df3aa8fa5 100644
--- a/kubernetes/kube2msb/templates/kube2msb-registrator-deployment.yaml
+++ b/kubernetes/kube2msb/templates/kube2msb-registrator-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableKube2MsbKube2MsbRegistrator }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -22,8 +23,11 @@ spec:
         env:
         - name: KUBE_MASTER_URL
           value: {{ .Values.kubeMasterUrl }}
+        - name: AUTH_TOKEN
+          value: {{ .Values.kubeMasterAuthToken }}
         - name: MSB_URL
           value: {{ .Values.discoveryUrl }}
         imagePullPolicy: {{ .Values.pullPolicy }}
       imagePullSecrets:
-      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-\ No newline at end of file
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/kube2msb/values.yaml b/kubernetes/kube2msb/values.yaml
index 3864f4d335..65200c39f1 100644
--- a/kubernetes/kube2msb/values.yaml
+++ b/kubernetes/kube2msb/values.yaml
@@ -2,5 +2,6 @@ nsPrefix: onap
 pullPolicy: IfNotPresent
 image:
   kube2msb: nexus3.onap.org:10001/onap/oom/kube2msb
-kubeMasterUrl: http://10.96.33.43:8080/r/projects/1a7/kubernetes:6443
-discoveryUrl: http://msb-discovery.onap-msb:10081
-\ No newline at end of file
+kubeMasterUrl: https://kubernetes.default.svc.cluster.local:443
+discoveryUrl: http://msb-discovery.onap-msb:10081
+kubeMasterAuthToken: QmFzaWMgTURrd056VXdSVEk1TVRGRk9UaEVOREJCTWprNlpHTnlaSGt4YzJsSVlsRlVZVU16WTFsUk1XWnZhV0UyY21GRWEwNUhkMDFDVWxORVRIUmlZUT09
diff --git a/kubernetes/log/resources/elasticsearch/conf/elasticsearch.yml b/kubernetes/log/resources/elasticsearch/conf/elasticsearch.yml
index de92a584e9..0b579d0729 100644
--- a/kubernetes/log/resources/elasticsearch/conf/elasticsearch.yml
+++ b/kubernetes/log/resources/elasticsearch/conf/elasticsearch.yml
@@ -13,26 +13,26 @@
 # ---------------------------------- Cluster -----------------------------------
 #
 # Name of the Elasticsearch cluster.
-# A node can only join a cluster when it shares its cluster.name with all the other nodes in the cluster. 
-# The default name is elasticsearch, but you should change it to an appropriate name which describes the 
-# purpose of the cluster. 
+# A node can only join a cluster when it shares its cluster.name with all the other nodes in the cluster.
+# The default name is elasticsearch, but you should change it to an appropriate name which describes the
+# purpose of the cluster.
 #
-cluster.name: "onap-log" 
+cluster.name: "onap-log"
 #
-# The port that other nodes in the cluster should use when communicating with this node. 
+# The port that other nodes in the cluster should use when communicating with this node.
 # Required for Elasticsearch's nodes running on different cluster nodes.
 # More : https://www.elastic.co/guide/en/elasticsearch/reference/current/modules-transport.html
-transport.publish_port:$transport.publish_port
+#transport.publish_port:$transport.publish_port
 #
 # The host address to publish for nodes in the cluster to connect to.
 # Required for Elasticsearch's nodes running on different cluster nodes.
 # More : https://www.elastic.co/guide/en/elasticsearch/reference/current/modules-transport.html
-transport.publish_host:$transport.publish_host
+#transport.publish_host:$transport.publish_host
 #
 # ------------------------------------ Node ------------------------------------
 #
 # It is better to provide different meaningfull names fot different elastic nodes.
-# By default, Elasticsearch will take the 7 first character of the randomly generated uuid used as the node id. 
+# By default, Elasticsearch will take the 7 first character of the randomly generated uuid used as the node id.
 # Note that the node id is persisted and does not change when a node restarts
 #
 #node.name: $node.name
@@ -44,20 +44,20 @@ transport.publish_host:$transport.publish_host
 # ----------------------------------- Paths ------------------------------------
 #
 # The location of the data files of each index / shard allocated on the node. Can hold multiple locations separated by coma.
-# In production, we should not keep this default to "/elasticsearch/data", as on upgrading Elasticsearch, directory structure 
+# In production, we should not keep this default to "/elasticsearch/data", as on upgrading Elasticsearch, directory structure
 # may change & can deal to data loss.
 path.data: /usr/share/elasticsearch/data
 #
-# Elasticsearch's log files location. In production, we should not keep this default to "/elasticsearch/logs", 
+# Elasticsearch's log files location. In production, we should not keep this default to "/elasticsearch/logs",
 # as on upgrading Elasticsearch, directory structure may change.
 path.logs: /usr/share/elasticsearch/logs
 #
 # ----------------------------------- Memory -----------------------------------
 #
-# It is vitally important to the health of your node that none of the JVM is ever swapped out to disk. 
+# It is vitally important to the health of your node that none of the JVM is ever swapped out to disk.
 # Lock the memory on startup.
 #
-bootstrap.memory_lock: true
+bootstrap.memory_lock: false
 #
 # Make sure that the heap size is set to about half the memory available
 # on the system and that the owner of the process is allowed to use this
@@ -68,8 +68,8 @@ bootstrap.memory_lock: true
 # ---------------------------------- Network -----------------------------------
 #
 # Set the bind address to a specific IP (IPv4 or IPv6):
-# In order to communicate and to form a cluster with nodes on other servers, your node will need to bind to a 
-# non-loopback address. 
+# In order to communicate and to form a cluster with nodes on other servers, your node will need to bind to a
+# non-loopback address.
 network.host: 0.0.0.0
 #
 # Set a custom port for HTTP: If required, default is 9200-9300
@@ -80,19 +80,19 @@ network.host: 0.0.0.0
 #
 # --------------------------------- Discovery ----------------------------------
 #
-# Pass an initial list of hosts to perform discovery when new node is started:
-# To form a cluster with nodes on other servers, you have to provide a seed list of other nodes in the cluster 
-# that are likely to be live and contactable. 
-# By default, Elasticsearch will bind to the available loopback addresses and will scan ports 9300 to 9305 to try 
+# Pass an initial list of hosts to perform discovery when new node is started
+# To form a cluster with nodes on other servers, you have to provide a seed list of other nodes in the cluster
+# that are likely to be live and contactable.
+# By default, Elasticsearch will bind to the available loopback addresses and will scan ports 9300 to 9305 to try
 # to connect to other nodes running on the same server.
 #
-discovery.zen.ping.unicast.hosts: ["elasticsearch.onap-log"]
+#discovery.zen.ping.unicast.hosts: ["elasticsearch.onap-log"
 #$discovery.zen.ping.unicast.hosts
 #
-# This setting tells Elasticsearch to not elect a master unless there are enough master-eligible nodes  
+# This setting tells Elasticsearch to not elect a master unless there are enough master-eligible nodes
 # available. Only then will an election take place.
 # Prevent the "split brain" by configuring the majority of nodes (total number of master-eligible nodes / 2 + 1):
-discovery.zen.minimum_master_nodes: 1 
+discovery.zen.minimum_master_nodes: 1
 #
 # For more information, consult the zen discovery module documentation.
 #
@@ -112,10 +112,10 @@ discovery.zen.minimum_master_nodes: 1
 # Set a custom port for HTTP: If required, default is 9200-9300
 # This is used for REST APIs
 http.port: 9200
-# Port to bind for communication between nodes. Accepts a single value or a range. 
+# Port to bind for communication between nodes. Accepts a single value or a range.
 # If a range is specified, the node will bind to the first available port in the range.
 # Defaults to 9300-9400.
-# More info: 
+# More info:
 transport.tcp.port: 9300
 
 xpack.graph.enabled: false
@@ -127,14 +127,8 @@ xpack.ml.enabled: false
 xpack.monitoring.enabled: false
 #Set to false to disable X-Pack monitoring features.
 
-xpack.reporting.enabled: false
-#Set to false to disable X-Pack reporting features.
-
 xpack.security.enabled: false
 #Set to false to disable X-Pack security features.
 
 xpack.watcher.enabled: false
 #Set to false to disable Watcher.
-
-index.number_of_replicas: 0
-
diff --git a/kubernetes/log/templates/all-services.yaml b/kubernetes/log/templates/all-services.yaml
index 5f9412e872..0885affdcf 100644
--- a/kubernetes/log/templates/all-services.yaml
+++ b/kubernetes/log/templates/all-services.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableLogElasticsearch }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -18,6 +19,23 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
+  name: elasticsearchtcp
+  namespace: {{ .Values.nsPrefix }}-log
+  labels:
+    app: elasticsearch
+spec:
+  ports:
+  - name: tcp
+    port: 9300
+    targetPort: 9300
+  selector:
+    app: elasticsearch
+#{{ end }}
+#{{ if not .Values.disableLogLogstash }}
+---
+apiVersion: v1
+kind: Service
+metadata:
   name: logstash
   namespace: {{ .Values.nsPrefix }}-log
   labels:
@@ -29,6 +47,8 @@ spec:
     targetPort: 5044
   selector:
     app: logstash
+#{{ end }}
+#{{ if not .Values.disableLogKibana }}
 ---
 apiVersion: v1
 kind: Service
@@ -46,4 +66,4 @@ spec:
   selector:
     app: kibana
   type: NodePort
-
+#{{ end }}
diff --git a/kubernetes/log/templates/elasticsearch-deployment.yaml b/kubernetes/log/templates/elasticsearch-deployment.yaml
index 75df8a16e1..c123df1daa 100644
--- a/kubernetes/log/templates/elasticsearch-deployment.yaml
+++ b/kubernetes/log/templates/elasticsearch-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableLogElasticsearch }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -50,10 +51,11 @@ spec:
           protocol: TCP
         readinessProbe:
           tcpSocket:
-            port: 9200
+            port: 9300
         volumeMounts:
-         - mountPath: /usr/share/elasticsearch/conf/
+         - mountPath: /usr/share/elasticsearch/config/elasticsearch.yml
            name: elasticsearch-conf
+           subPath: elasticsearch.yml
          - mountPath: /usr/share/elasticsearch/data/
            name: elasticsearch-data
          - mountPath: /usr/share/elasticsearch/logs/
@@ -78,4 +80,6 @@ metadata:
   name: elasticsearch-configmap
   namespace: {{ .Values.nsPrefix }}-log
 data:
-{{ (.Files.Glob "resources/elasticsearch/conf/elasticsearch.yml").AsConfig | indent 2 }}
-\ No newline at end of file
+{{ (.Files.Glob "resources/elasticsearch/conf/elasticsearch.yml").AsConfig | indent 2 }}
+#{{ end }}
+
diff --git a/kubernetes/log/templates/kibana-deployment.yaml b/kubernetes/log/templates/kibana-deployment.yaml
index f8070ef780..9ff26da798 100644
--- a/kubernetes/log/templates/kibana-deployment.yaml
+++ b/kubernetes/log/templates/kibana-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableLogKibana }}
 apiVersion: extensions/v1beta1 
 kind: Deployment
 metadata:
@@ -68,4 +69,5 @@ metadata:
   name: kibana-configmap
   namespace: {{ .Values.nsPrefix }}-log
 data:
-{{ (.Files.Glob "resources/kibana/conf/kibana.yml").AsConfig | indent 2 }}
-\ No newline at end of file
+{{ (.Files.Glob "resources/kibana/conf/kibana.yml").AsConfig | indent 2 }}
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/log/templates/log-pv-pvc.yaml b/kubernetes/log/templates/log-pv-pvc.yaml
index 989b118ca9..4f244718d0 100644
--- a/kubernetes/log/templates/log-pv-pvc.yaml
+++ b/kubernetes/log/templates/log-pv-pvc.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableLogElasticsearch }}
 apiVersion: v1
 kind: PersistentVolume
 metadata:
@@ -28,3 +29,4 @@ spec:
   selector:
     matchLabels:
       name: elasticsearch-db
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/log/templates/logstash-deployment.yaml b/kubernetes/log/templates/logstash-deployment.yaml
index 23d590690f..c4d46b7eff 100644
--- a/kubernetes/log/templates/logstash-deployment.yaml
+++ b/kubernetes/log/templates/logstash-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableLogLogstash }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -80,3 +81,4 @@ metadata:
 data:
 {{ (.Files.Glob "resources/logstash/conf/logstash.yml").AsConfig | indent 2 }}
 {{ (.Files.Glob "resources/logstash/pipeline/onap-pipeline.conf").AsConfig | indent 2 }}
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/message-router/templates/all-services.yaml b/kubernetes/message-router/templates/all-services.yaml
index 418a3eda89..e76a1d9431 100644
--- a/kubernetes/message-router/templates/all-services.yaml
+++ b/kubernetes/message-router/templates/all-services.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableMessageRouterZookeeper }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -12,6 +13,8 @@ spec:
   selector:
     app: zookeeper
   clusterIP: None
+#{{ end }}
+#{{ if not .Values.disableMessageRouterGlobalKafka }}
 ---
 apiVersion: v1
 kind: Service
@@ -27,6 +30,8 @@ spec:
   selector:
     app: global-kafka
   clusterIP: None
+#{{ end }}
+#{{ if not .Values.disableMessageRouterDmaap }}
 ---
 apiVersion: v1
 kind: Service
@@ -58,3 +63,4 @@ spec:
   selector:
     app: dmaap
   type: NodePort
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/message-router/templates/message-router-dmaap.yaml b/kubernetes/message-router/templates/message-router-dmaap.yaml
index 1cc79c819e..67d51fd00e 100644
--- a/kubernetes/message-router/templates/message-router-dmaap.yaml
+++ b/kubernetes/message-router/templates/message-router-dmaap.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableMessageRouterDmaap }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -79,3 +80,4 @@ spec:
           path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dmaap/mykey
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/message-router/templates/message-router-kafka.yaml b/kubernetes/message-router/templates/message-router-kafka.yaml
index 1564f9b03a..3e2628b750 100644
--- a/kubernetes/message-router/templates/message-router-kafka.yaml
+++ b/kubernetes/message-router/templates/message-router-kafka.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableMessageRouterGlobalKafka }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -87,3 +88,4 @@ spec:
           path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dcae-startup-vm-message-router/docker_files/start-kafka.sh
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/message-router/templates/message-router-pv-pvc.yaml b/kubernetes/message-router/templates/message-router-pv-pvc.yaml
index e31e78c1fd..53329ca29b 100644
--- a/kubernetes/message-router/templates/message-router-pv-pvc.yaml
+++ b/kubernetes/message-router/templates/message-router-pv-pvc.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableMessageRouterGlobalKafka }}
 apiVersion: v1
 kind: PersistentVolume
 metadata:
@@ -28,6 +29,8 @@ spec:
   selector:
     matchLabels:
       name: "{{ .Values.nsPrefix }}-message-router-kafka"
+#{{ end }}
+#{{ if not .Values.disableMessageRouterZookeeper }}
 ---
 apiVersion: v1
 kind: PersistentVolume
@@ -59,3 +62,4 @@ spec:
   selector:
     matchLabels:
       name: "{{ .Values.nsPrefix }}-message-router-zookeeper"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/message-router/templates/message-router-zookeeper.yaml b/kubernetes/message-router/templates/message-router-zookeeper.yaml
index 0377beb05a..47cdb51f2f 100644
--- a/kubernetes/message-router/templates/message-router-zookeeper.yaml
+++ b/kubernetes/message-router/templates/message-router-zookeeper.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableMessageRouterZookeeper }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -40,3 +41,4 @@ spec:
           claimName: message-router-zookeeper
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/mock/templates/all-services.yaml b/kubernetes/mock/templates/all-services.yaml
index 8920191ac3..a1b0f170de 100644
--- a/kubernetes/mock/templates/all-services.yaml
+++ b/kubernetes/mock/templates/all-services.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableMockSniroEmulator }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -15,3 +16,4 @@ spec:
     name: http
   selector:
     app: sniro-emulator
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/mock/templates/sniroemulator-deployment.yaml b/kubernetes/mock/templates/sniroemulator-deployment.yaml
index a0473c95f4..5a1d483ae1 100644
--- a/kubernetes/mock/templates/sniroemulator-deployment.yaml
+++ b/kubernetes/mock/templates/sniroemulator-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableMockSniroEmulator }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -23,3 +24,4 @@ spec:
         args: ["--verbose"]
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/msb/templates/all-services.yaml b/kubernetes/msb/templates/all-services.yaml
index f752608984..487347393d 100644
--- a/kubernetes/msb/templates/all-services.yaml
+++ b/kubernetes/msb/templates/all-services.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableMsbMsbConsul }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -12,6 +13,8 @@ spec:
   selector:
     app: msb-consul
   type: NodePort
+#{{ end }}
+#{{ if not .Values.disableMsbMsbDiscovery }}
 ---
 apiVersion: v1
 kind: Service
@@ -28,6 +31,8 @@ spec:
   selector:
     app: msb-discovery
   type: NodePort
+#{{ end }}
+#{{ if not .Values.disableMsbMsbIag }}
 ---
 apiVersion: v1
 kind: Service
@@ -43,6 +48,8 @@ spec:
   selector:
     app: msb-iag
   type: NodePort
+#{{ end }}
+#{{ if not .Values.disableMsbMsbEag }}
 ---
 apiVersion: v1
 kind: Service
@@ -58,3 +65,4 @@ spec:
   selector:
     app: msb-eag
   type: NodePort
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/msb/templates/msb-consul-deployment.yaml b/kubernetes/msb/templates/msb-consul-deployment.yaml
index fc8a95a838..4d462aa96f 100644
--- a/kubernetes/msb/templates/msb-consul-deployment.yaml
+++ b/kubernetes/msb/templates/msb-consul-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableMsbMsbConsul }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -27,4 +28,5 @@ spec:
             port: {{ .Values.consulPort }}
           initialDelaySeconds: 5
           periodSeconds: 10
-        imagePullPolicy: {{ .Values.pullPolicy }}
-\ No newline at end of file
+        imagePullPolicy: {{ .Values.pullPolicy }}
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/msb/templates/msb-discovery-deployment.yaml b/kubernetes/msb/templates/msb-discovery-deployment.yaml
index 3af9e8f858..5f8db61ac5 100644
--- a/kubernetes/msb/templates/msb-discovery-deployment.yaml
+++ b/kubernetes/msb/templates/msb-discovery-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableMsbMsbDiscovery }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -33,4 +34,4 @@ spec:
         imagePullPolicy: {{ .Values.pullPolicy }}
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/msb/templates/msb-eag-deployment.yaml b/kubernetes/msb/templates/msb-eag-deployment.yaml
index db703d9188..714f19b1a5 100644
--- a/kubernetes/msb/templates/msb-eag-deployment.yaml
+++ b/kubernetes/msb/templates/msb-eag-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableMsbMsbEag }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -23,7 +24,7 @@ spec:
         - name: CONSUL_IP
           value:  msb-consul.{{ .Values.nsPrefix }}-msb
         - name: SDCLIENT_IP
-          value: "{{ .Values.discoveryClusterIP}}"
+          value:  msb-discovery.{{ .Values.nsPrefix }}-msb
         - name: ROUTE_LABELS
           value: "visualRange:0"
         ports:
@@ -37,4 +38,4 @@ spec:
         imagePullPolicy: {{ .Values.pullPolicy}}
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/msb/templates/msb-iag-deployment.yaml b/kubernetes/msb/templates/msb-iag-deployment.yaml
index 35fba560c0..ca4d5a033f 100644
--- a/kubernetes/msb/templates/msb-iag-deployment.yaml
+++ b/kubernetes/msb/templates/msb-iag-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableMsbMsbIag }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -23,7 +24,7 @@ spec:
         - name: CONSUL_IP
           value: msb-consul.{{ .Values.nsPrefix }}-msb
         - name: SDCLIENT_IP
-          value: "{{ .Values.discoveryClusterIP}}"
+          value: msb-discovery.{{ .Values.nsPrefix }}-msb
         - name: ROUTE_LABELS
           value: "visualRange:1"
         ports:
@@ -37,4 +38,4 @@ spec:
         imagePullPolicy: "{{ .Values.pullPolicy}}"
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/msb/values.yaml b/kubernetes/msb/values.yaml
index 8c1533887e..d78a3369f6 100644
--- a/kubernetes/msb/values.yaml
+++ b/kubernetes/msb/values.yaml
@@ -8,8 +8,6 @@ image:
 consulPort: 8500
 consulNodePort: 30500
 
-# Should remove cluster IP after domain name is supported by API gateway
-discoveryClusterIP: 10.43.6.205
 discoveryPort: 10081
 discoveryNodePort: 30081
 discoveryReplicas: 1
diff --git a/kubernetes/mso/templates/all-services.yaml b/kubernetes/mso/templates/all-services.yaml
index 96c7fd79e8..44e47c10fc 100644
--- a/kubernetes/mso/templates/all-services.yaml
+++ b/kubernetes/mso/templates/all-services.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableMsoMariadb }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -12,6 +13,8 @@ spec:
   selector:
     app: mariadb
   type: NodePort
+#{{ end }}
+#{{ if not .Values.disableMsoMso }}
 ---
 apiVersion: v1
 kind: Service
@@ -60,3 +63,4 @@ spec:
       port: 8787
       nodePort: {{ .Values.nodePortPrefix }}50
   type: NodePort
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/mso/templates/db-deployment.yaml b/kubernetes/mso/templates/db-deployment.yaml
index d105744f7e..820d7e2239 100644
--- a/kubernetes/mso/templates/db-deployment.yaml
+++ b/kubernetes/mso/templates/db-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableMsoMariadb }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -55,3 +56,4 @@ spec:
             claimName: mso-db
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/mso/templates/mso-deployment.yaml b/kubernetes/mso/templates/mso-deployment.yaml
index bf350aeca1..a33d9b08fa 100644
--- a/kubernetes/mso/templates/mso-deployment.yaml
+++ b/kubernetes/mso/templates/mso-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableMsoMso }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -144,3 +145,4 @@ spec:
             path: /dockerdata-nfs/{{ .Values.nsPrefix }}/mso/docker-files/scripts/start-jboss-server.sh
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/mso/templates/mso-pv-pvc.yaml b/kubernetes/mso/templates/mso-pv-pvc.yaml
index 47389e3ff0..07b5a03f61 100644
--- a/kubernetes/mso/templates/mso-pv-pvc.yaml
+++ b/kubernetes/mso/templates/mso-pv-pvc.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableMsoMariadb }}
 apiVersion: v1
 kind: PersistentVolume
 metadata:
@@ -28,3 +29,4 @@ spec:
   selector:
     matchLabels:
       name: "{{ .Values.nsPrefix }}-mso-db"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/multicloud/templates/all-services.yaml b/kubernetes/multicloud/templates/all-services.yaml
index d8de44745e..09a90d0eca 100644
--- a/kubernetes/multicloud/templates/all-services.yaml
+++ b/kubernetes/multicloud/templates/all-services.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableMulticloudFramework }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -24,6 +25,8 @@ spec:
   selector:
     app: framework
   type: NodePort
+#{{ end }}
+#{{ if not .Values.disableMulticloudMulticloudVio }}
 ---
 apiVersion: v1
 kind: Service
@@ -52,6 +55,8 @@ spec:
   selector:
     app: multicloud-vio
   type: NodePort
+#{{ end }}
+#{{ if not .Values.disableMulticloudMulticloudOcata }}
 ---
 apiVersion: v1
 kind: Service
@@ -80,6 +85,8 @@ spec:
   selector:
     app: multicloud-ocata
   type: NodePort
+#{{ end }}
+#{{ if not .Values.disableMulticloudMulticloudWindriver }}
 ---
 apiVersion: v1
 kind: Service
@@ -108,3 +115,4 @@ spec:
   selector:
     app: multicloud-windriver
   type: NodePort
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/multicloud/templates/framework-deployment.yaml b/kubernetes/multicloud/templates/framework-deployment.yaml
index 9f122f0fd2..b2f23715c8 100644
--- a/kubernetes/multicloud/templates/framework-deployment.yaml
+++ b/kubernetes/multicloud/templates/framework-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableMulticloudFramework }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -55,3 +56,4 @@ spec:
          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/multicloud/framework/logs
      imagePullSecrets:
      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/multicloud/templates/multicloud-ocata-deployment.yaml b/kubernetes/multicloud/templates/multicloud-ocata-deployment.yaml
index 8d9bd9d15a..994fe94c03 100644
--- a/kubernetes/multicloud/templates/multicloud-ocata-deployment.yaml
+++ b/kubernetes/multicloud/templates/multicloud-ocata-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableMulticloudMulticloudOcata }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -55,5 +56,4 @@ spec:
          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/multicloud/ocata/logs
      imagePullSecrets:
      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-
-
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/multicloud/templates/multicloud-vio-deployment.yaml b/kubernetes/multicloud/templates/multicloud-vio-deployment.yaml
index 85a43a10db..e2274b358f 100644
--- a/kubernetes/multicloud/templates/multicloud-vio-deployment.yaml
+++ b/kubernetes/multicloud/templates/multicloud-vio-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableMulticloudMulticloudVio }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -55,5 +56,4 @@ spec:
          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/multicloud/vio/logs
      imagePullSecrets:
      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-
-
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/multicloud/templates/multicloud-windriver-deployment.yaml b/kubernetes/multicloud/templates/multicloud-windriver-deployment.yaml
index a74ea19f23..ff0f09af19 100644
--- a/kubernetes/multicloud/templates/multicloud-windriver-deployment.yaml
+++ b/kubernetes/multicloud/templates/multicloud-windriver-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableMulticloudMulticloudWindriver }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -55,5 +56,4 @@ spec:
          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/multicloud/windriver/logs
      imagePullSecrets:
      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-
-
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/oneclick/deleteAll.bash b/kubernetes/oneclick/deleteAll.bash
index 2d5779ea2a..cf293e48ad 100755
--- a/kubernetes/oneclick/deleteAll.bash
+++ b/kubernetes/oneclick/deleteAll.bash
@@ -5,11 +5,6 @@
 delete_namespace() {
   _NS=$1-$2
   kubectl delete namespace $_NS
-   printf "Waiting for namespace $_NS termination...\n"
-   while kubectl get namespaces $_NS > /dev/null 2>&1; do
-     sleep 2
-   done
-  printf "Namespace $_NS deleted.\n\n"
 }
 
 delete_service_account() {
@@ -25,6 +20,24 @@ delete_app_helm() {
   helm delete $1-$2 --purge
 }
 
+wait_terminate() {
+  printf "Waiting for namespaces termination...\n"
+  while true; do
+    declare -i _STATUS=0
+    for i in ${HELM_APPS[@]}; do
+      kubectl get namespaces $1-$i > /dev/null 2>&1
+      if [ "$?" -eq "0" ]; then
+        _STATUS=1
+        break
+      fi
+    done
+    if [ "$_STATUS" -eq "0" ]; then
+      break
+    fi
+    sleep 2
+  done
+}
+
 usage() {
   cat <<EOF
 Usage: $0 [PARAMs]
@@ -34,6 +47,7 @@ Usage: $0 [PARAMs]
                       from the following choices:
                       sdc, aai ,mso, message-router, robot, vid, aaf, uui
                       sdnc, portal, policy, appc, multicloud, clamp, consul, vnfsdk
+-N                  : Do not wait for deletion of namespace and its objects
 EOF
 }
 
@@ -41,8 +55,9 @@ EOF
 NS=
 INCL_SVC=false
 APP=
+WAIT_TERMINATE=true
 
-while getopts ":n:u:s:a:" PARAM; do
+while getopts ":n:u:s:a:N" PARAM; do
   case $PARAM in
     u)
       usage
@@ -58,6 +73,9 @@ while getopts ":n:u:s:a:" PARAM; do
         exit 1
       fi
       ;;
+    N)
+      WAIT_TERMINATE=false
+      ;;
     ?)
       usage
       exit
@@ -85,5 +103,8 @@ for i in ${HELM_APPS[@]}; do
 
 done
 
+if $WAIT_TERMINATE; then
+  wait_terminate $NS
+fi
 
 printf "\n********** Gone **********\n"
diff --git a/kubernetes/policy/templates/all-services.yaml b/kubernetes/policy/templates/all-services.yaml
index 04c984df54..a1c480458d 100644
--- a/kubernetes/policy/templates/all-services.yaml
+++ b/kubernetes/policy/templates/all-services.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disablePolicyMariadb }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -12,6 +13,8 @@ spec:
   selector:
     app: mariadb
   clusterIP: None
+#{{ end }}
+#{{ if not .Values.disablePolicyNexus }}
 ---
 apiVersion: v1
 kind: Service
@@ -27,6 +30,8 @@ spec:
   selector:
     app: nexus
   clusterIP: None
+#{{ end }}
+#{{ if not .Values.disablePolicyDrools }}
 ---
 apiVersion: v1
 kind: Service
@@ -43,6 +48,8 @@ spec:
   selector:
     app: drools
   type: NodePort
+#{{ end }}
+#{{ if not .Values.disablePolicyPap }}
 ---
 apiVersion: v1
 kind: Service
@@ -62,6 +69,8 @@ spec:
   selector:
     app: pap
   type: NodePort
+#{{ end }}
+#{{ if not .Values.disablePolicyPdp }}
 ---
 apiVersion: v1
 kind: Service
@@ -98,6 +107,8 @@ spec:
   selector:
     app: pdp
   type: NodePort
+#{{ end }}
+#{{ if not .Values.disablePolicyBrmsgw }}
 ---
 apiVersion: v1
 kind: Service
@@ -114,3 +125,4 @@ spec:
   selector:
     app: brmsgw
   type: NodePort
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/policy/templates/dep-brmsgw.yaml b/kubernetes/policy/templates/dep-brmsgw.yaml
index e47b0403ca..df5d888165 100644
--- a/kubernetes/policy/templates/dep-brmsgw.yaml
+++ b/kubernetes/policy/templates/dep-brmsgw.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disablePolicyBrmsgw }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -69,3 +70,4 @@ spec:
             path: /dockerdata-nfs/{{ .Values.nsPrefix }}/policy/opt/policy/config/pe/
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/policy/templates/dep-drools.yaml b/kubernetes/policy/templates/dep-drools.yaml
index 2f06a08791..3e9fa014fb 100644
--- a/kubernetes/policy/templates/dep-drools.yaml
+++ b/kubernetes/policy/templates/dep-drools.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disablePolicyDrools }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -111,3 +112,4 @@ spec:
             path:  /dockerdata-nfs/{{ .Values.nsPrefix }}/policy/opt/policy/config/drools/
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/policy/templates/dep-maria.yaml b/kubernetes/policy/templates/dep-maria.yaml
index e3c93d7fe6..c0f5060884 100644
--- a/kubernetes/policy/templates/dep-maria.yaml
+++ b/kubernetes/policy/templates/dep-maria.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disablePolicyMariadb }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -39,3 +40,4 @@ spec:
           claimName: policy-db
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/policy/templates/dep-nexus.yaml b/kubernetes/policy/templates/dep-nexus.yaml
index 15b7ec38fd..07cd334879 100644
--- a/kubernetes/policy/templates/dep-nexus.yaml
+++ b/kubernetes/policy/templates/dep-nexus.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disablePolicyNexus }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -53,3 +54,4 @@ spec:
           path: /etc/localtime
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/policy/templates/dep-pap.yaml b/kubernetes/policy/templates/dep-pap.yaml
index aeb3d6b323..0816aa5291 100644
--- a/kubernetes/policy/templates/dep-pap.yaml
+++ b/kubernetes/policy/templates/dep-pap.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disablePolicyPap }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -128,3 +129,4 @@ spec:
             path: /dockerdata-nfs/{{ .Values.nsPrefix }}/policy/opt/policy/config/pe/
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/policy/templates/dep-pdp.yaml b/kubernetes/policy/templates/dep-pdp.yaml
index 841d55c00e..6cc442b417 100644
--- a/kubernetes/policy/templates/dep-pdp.yaml
+++ b/kubernetes/policy/templates/dep-pdp.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disablePolicyPdp }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -102,3 +103,4 @@ spec:
             path: /dockerdata-nfs/{{ .Values.nsPrefix }}/policy/opt/policy/config/pe/
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/policy/templates/policy-pv-pvc.yaml b/kubernetes/policy/templates/policy-pv-pvc.yaml
index 71cf3d8a48..5dc0c61c43 100644
--- a/kubernetes/policy/templates/policy-pv-pvc.yaml
+++ b/kubernetes/policy/templates/policy-pv-pvc.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disablePolicyMariadb }}
 apiVersion: v1
 kind: PersistentVolume
 metadata:
@@ -28,3 +29,4 @@ spec:
   selector:
     matchLabels:
       name: "{{ .Values.nsPrefix }}-policy-db"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/portal/templates/all-services.yaml b/kubernetes/portal/templates/all-services.yaml
index b819b1c5e3..28ca0303b1 100644
--- a/kubernetes/portal/templates/all-services.yaml
+++ b/kubernetes/portal/templates/all-services.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disablePortalPortaldb }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -12,6 +13,8 @@ spec:
   selector:
     app: portaldb
   clusterIP: None
+#{{ end }}
+#{{ if not .Values.disablePortalPortalapps }}
 ---
 apiVersion: v1
 kind: Service
@@ -48,6 +51,8 @@ spec:
   selector:
     app: portalapps
   type: NodePort
+#{{ end }}
+#{{ if not .Values.disablePortalVncPortal }}
 ---
 apiVersion: v1
 kind: Service
@@ -69,6 +74,8 @@ spec:
   selector:
     app: vnc-portal
   type: NodePort
+#{{ end }}
+#{{ if not .Values.disablePortalPortalwidgets }}
 ---
 apiVersion: v1
 kind: Service
@@ -84,3 +91,4 @@ spec:
   selector:
     app: portalwidgets
   clusterIP: None
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/portal/templates/portal-apps-deployment.yaml b/kubernetes/portal/templates/portal-apps-deployment.yaml
index c9cb645bae..75977c7be0 100755
--- a/kubernetes/portal/templates/portal-apps-deployment.yaml
+++ b/kubernetes/portal/templates/portal-apps-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disablePortalPortalapps }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -67,30 +68,30 @@ spec:
         - mountPath: /etc/localtime
           name: localtime
           readOnly: true
-        - mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPPORTAL/WEB-INF/fusion/conf/fusion.properties"
+        - mountPath: "{{ .Values.onapPortal.webappsDir }}/ONAPPORTAL/WEB-INF/fusion/conf/fusion.properties"
           name: portal-fusion-properties
-        - mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPPORTAL/WEB-INF/classes/openid-connect.properties"
+        - mountPath: "{{ .Values.onapPortal.webappsDir }}/ONAPPORTAL/WEB-INF/classes/openid-connect.properties"
           name: portal-openid-connect-properties
-        - mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPPORTAL/WEB-INF/conf/system.properties"
+        - mountPath: "{{ .Values.onapPortal.webappsDir }}/ONAPPORTAL/WEB-INF/conf/system.properties"
           name: portal-system-properties
-        - mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPPORTAL/WEB-INF/classes/portal.properties"
+        - mountPath: "{{ .Values.onapPortal.webappsDir }}/ONAPPORTAL/WEB-INF/classes/portal.properties"
           name: portal-portal-properties
-        - mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPPORTAL/WEB-INF/classes/logback.xml"
+        - mountPath: "{{ .Values.onapPortal.webappsDir }}/ONAPPORTAL/WEB-INF/classes/logback.xml"
           name: portal-logback
-        - mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPSDKAPP/WEB-INF/conf/system.properties"
+        - mountPath: "{{ .Values.onapPortal.webappsDir }}/ONAPPORTALSDK/WEB-INF/conf/system.properties"
           name: sdkapp-system-properties
-        - mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPSDKAPP/WEB-INF/classes/portal.properties"
+        - mountPath: "{{ .Values.onapPortal.webappsDir }}/ONAPPORTALSDK/WEB-INF/classes/portal.properties"
           name: sdkapp-portal-properties
-        - mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPSDKAPP/WEB-INF/fusion/conf/fusion.properties"
+        - mountPath: "{{ .Values.onapPortal.webappsDir }}/ONAPPORTALSDK/WEB-INF/fusion/conf/fusion.properties"
           name: sdkapp-fusion-properties
+        - mountPath: "{{ .Values.onapPortal.webappsDir }}/ONAPPORTALSDK/WEB-INF/classes/logback.xml"
+          name: sdkapp-logback
         - mountPath: /portal_root/
           name: portal-root
         - mountPath: "{{ .Values.onapPortal.webappsDir }}/logs"
           name: portal-logs
         - mountPath: /var/log/onap
           name: portal-logs2
-        - mountPath: /PROJECT/APPS/ECOMPPORTAL/ECOMPSDKAPP/WEB-INF/classes/logback.xml
-          name: portal-logback-be
         ports:
         - containerPort: 8005
         - containerPort: 8009
@@ -121,45 +122,33 @@ spec:
           emptyDir: {}
         - name: portal-data-filebeat
           emptyDir: {}
-        - name: portal-logback-be
-          hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/portal/portal-be/logback.xml
         - name: portal-fusion-properties
           hostPath:
-            path:  /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/fusion.properties
+            path:  /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ONAPPORTAL/fusion.properties
         - name: portal-openid-connect-properties
           hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/openid-connect.properties
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ONAPPORTAL/openid-connect.properties
         - name: portal-system-properties
           hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/system.properties
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ONAPPORTAL/system.properties
         - name: portal-portal-properties
           hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/portal.properties
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ONAPPORTAL/portal.properties
         - name: portal-logback
           hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/logback.xml
-        - name: dbcapp-fusion-properties
-          hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPDBCAPP/fusion.properties
-        - name: dbcapp-system-properties
-          hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPDBCAPP/system.properties
-        - name: dbcapp-portal-properties
-          hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPDBCAPP/portal.properties
-        - name: dbcapp-dbcapp-properties
-          hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPDBCAPP/dbcapp.properties
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/portal/onapportal/logback.xml
         - name: sdkapp-system-properties
           hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPSDKAPP/system.properties
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ONAPPORTALSDK/system.properties
         - name: sdkapp-portal-properties
           hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPSDKAPP/portal.properties
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ONAPPORTALSDK/portal.properties
         - name: sdkapp-fusion-properties
           hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPSDKAPP/fusion.properties
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ONAPPORTALSDK/fusion.properties
+        - name: sdkapp-logback
+          hostPath:
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/portal/onapportalsdk/logback.xml
         - name: portal-mariadb-onboarding-sql
           hostPath:
             path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/mariadb/oom_updates.sql
@@ -171,3 +160,4 @@ spec:
             path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/logs
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/portal/templates/portal-mariadb-deployment.yaml b/kubernetes/portal/templates/portal-mariadb-deployment.yaml
index 8dc7ebabf3..96084e5294 100755
--- a/kubernetes/portal/templates/portal-mariadb-deployment.yaml
+++ b/kubernetes/portal/templates/portal-mariadb-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disablePortalPortaldb }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -69,3 +70,4 @@ spec:
           path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/portal/portal-db/logback.xml
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/portal/templates/portal-pv-pvc.yaml b/kubernetes/portal/templates/portal-pv-pvc.yaml
index 11b3dbb4e1..b4d2baa334 100644
--- a/kubernetes/portal/templates/portal-pv-pvc.yaml
+++ b/kubernetes/portal/templates/portal-pv-pvc.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disablePortalPortaldb }}
 apiVersion: v1
 kind: PersistentVolume
 metadata:
@@ -28,3 +29,4 @@ spec:
   selector:
     matchLabels:
       name: "{{ .Values.nsPrefix }}-portal-db"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/portal/templates/portal-vnc-dep.yaml b/kubernetes/portal/templates/portal-vnc-dep.yaml
index 075b1f19e0..b4a9effe59 100644
--- a/kubernetes/portal/templates/portal-vnc-dep.yaml
+++ b/kubernetes/portal/templates/portal-vnc-dep.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disablePortalVncPortal }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -95,7 +96,7 @@ spec:
           },
           {
               "command": ["/bin/sh","-c"],
-              "args": ["echo `host sdc-be.{{ .Values.nsPrefix }}-sdc | awk ''{print$4}''` sdc.api.be.simpledemo.openecomp.org  >> /ubuntu-init/hosts; echo `host portalapps.{{ .Values.nsPrefix }}-portal | awk ''{print$4}''` portal.api.simpledemo.openecomp.org  >> /ubuntu-init/hosts; echo `host pap.{{ .Values.nsPrefix }}-policy | awk ''{print$4}''` policy.api.simpledemo.openecomp.org  >> /ubuntu-init/hosts; echo `host sdc-fe.{{ .Values.nsPrefix }}-sdc | awk ''{print$4}''` sdc.api.simpledemo.openecomp.org  >> /ubuntu-init/hosts; echo `host vid-server.{{ .Values.nsPrefix }}-vid | awk ''{print$4}''` vid.api.simpledemo.openecomp.org >> /ubuntu-init/hosts; echo `host sparky-be.{{ .Values.nsPrefix }}-aai | awk ''{print$4}''` aai.api.simpledemo.openecomp.org  >> /ubuntu-init/hosts"],
+              "args": ["echo `host sdc-be.{{ .Values.nsPrefix }}-sdc | awk ''{print$4}''` sdc.api.be.simpledemo.onap.org  >> /ubuntu-init/hosts; echo `host portalapps.{{ .Values.nsPrefix }}-portal | awk ''{print$4}''` portal.api.simpledemo.onap.org  >> /ubuntu-init/hosts; echo `host pap.{{ .Values.nsPrefix }}-policy | awk ''{print$4}''` policy.api.simpledemo.onap.org  >> /ubuntu-init/hosts; echo `host sdc-fe.{{ .Values.nsPrefix }}-sdc | awk ''{print$4}''` sdc.api.simpledemo.onap.org  >> /ubuntu-init/hosts; echo `host vid-server.{{ .Values.nsPrefix }}-vid | awk ''{print$4}''` vid.api.simpledemo.onap.org >> /ubuntu-init/hosts; echo `host sparky-be.{{ .Values.nsPrefix }}-aai | awk ''{print$4}''` aai.api.simpledemo.onap.org  >> /ubuntu-init/hosts"],
               "image": "{{ .Values.image.ubuntuInit }}",
               "imagePullPolicy": "{{ .Values.pullPolicy }}",
               "name": "vnc-init-hosts",
@@ -136,3 +137,4 @@ spec:
           emptyDir: {}
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/portal/templates/portal-widgets-deployment.yaml b/kubernetes/portal/templates/portal-widgets-deployment.yaml
index fb6b4d8712..865d84523f 100644
--- a/kubernetes/portal/templates/portal-widgets-deployment.yaml
+++ b/kubernetes/portal/templates/portal-widgets-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disablePortalPortalwidgets }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -62,6 +63,7 @@ spec:
             path: /etc/localtime
         - name: portalwidgets-application-properties
           hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPWIDGETMS/application.properties
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ONAPWIDGETMS/application.properties
       imagePullSecrets:
-      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-\ No newline at end of file
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/portal/values.yaml b/kubernetes/portal/values.yaml
index eadc834599..a5edb98329 100644
--- a/kubernetes/portal/values.yaml
+++ b/kubernetes/portal/values.yaml
@@ -3,10 +3,10 @@ pullPolicy: Always
 nodePortPrefix: 302
 image:
   readiness: oomk8s/readiness-check:1.0.0
-  portalapps: nexus3.onap.org:10001/openecomp/portal-apps:1.3-STAGING-latest
-  portaldb: nexus3.onap.org:10001/openecomp/portal-db:1.3-STAGING-latest
+  portalapps: nexus3.onap.org:10001/onap/portal-apps:1.3-STAGING-latest
+  portaldb: nexus3.onap.org:10001/onap/portal-db:1.3-STAGING-latest
   mariadbClient: oomk8s/mariadb-client-init:1.0.0
-  portalwms: nexus3.onap.org:10001/openecomp/portal-wms:1.3-STAGING-latest
+  portalwms: nexus3.onap.org:10001/onap/portal-wms:1.3-STAGING-latest
   ubuntuInit: oomk8s/ubuntu-init:1.0.0
   ubuntuDesktop: dorowu/ubuntu-desktop-lxde-vnc
   filebeat: docker.elastic.co/beats/filebeat:5.5.0
diff --git a/kubernetes/robot/templates/all-services.yaml b/kubernetes/robot/templates/all-services.yaml
index f126bc9b74..196e7b196a 100644
--- a/kubernetes/robot/templates/all-services.yaml
+++ b/kubernetes/robot/templates/all-services.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableRobotRobot }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -12,3 +13,4 @@ spec:
   selector:
     app: robot
   type: NodePort
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/robot/templates/robot-deployment.yaml b/kubernetes/robot/templates/robot-deployment.yaml
index da017db6a6..561d795287 100644
--- a/kubernetes/robot/templates/robot-deployment.yaml
+++ b/kubernetes/robot/templates/robot-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableRobotRobot }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -79,3 +80,4 @@ spec:
             path: /dockerdata-nfs/{{ .Values.nsPrefix }}/robot/robot/assets/asdc/base_vlb/dnsscaling.env
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/sdc/templates/all-services.yaml b/kubernetes/sdc/templates/all-services.yaml
index 2cd895b45a..4100dc24a4 100644
--- a/kubernetes/sdc/templates/all-services.yaml
+++ b/kubernetes/sdc/templates/all-services.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableSdcSdcEs }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -14,6 +15,8 @@ spec:
   selector:
     app: sdc-es
   clusterIP: None
+#{{ end }}
+#{{ if not .Values.disableSdcSdcCs }}
 ---
 apiVersion: v1
 kind: Service
@@ -31,6 +34,8 @@ spec:
   selector:
     app: sdc-cs
   clusterIP: None
+#{{ end }}
+#{{ if not .Values.disableSdcSdcKb }}
 ---
 apiVersion: v1
 kind: Service
@@ -46,6 +51,8 @@ spec:
   selector:
     app: sdc-kb
   clusterIP: None
+#{{ end }}
+#{{ if not .Values.disableSdcSdcBe }}
 ---
 apiVersion: v1
 kind: Service
@@ -85,6 +92,8 @@ spec:
   selector:
     app: sdc-be
   type: NodePort
+#{{ end }}
+#{{ if not .Values.disableSdcSdcFe }}
 ---
 apiVersion: v1
 kind: Service
@@ -115,3 +124,4 @@ spec:
   selector:
     app: sdc-fe
   type: NodePort
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/sdc/templates/sdc-be.yaml b/kubernetes/sdc/templates/sdc-be.yaml
index 0ba4db50ce..f38dbd71d9 100644
--- a/kubernetes/sdc/templates/sdc-be.yaml
+++ b/kubernetes/sdc/templates/sdc-be.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableSdcSdcBe }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -135,3 +136,4 @@ spec:
             path:  /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/logs
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/sdc/templates/sdc-cs.yaml b/kubernetes/sdc/templates/sdc-cs.yaml
index 844bd20d35..d93ea2d7cf 100644
--- a/kubernetes/sdc/templates/sdc-cs.yaml
+++ b/kubernetes/sdc/templates/sdc-cs.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableSdcSdcCs }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -87,3 +88,4 @@ spec:
             path:  /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/logs
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/sdc/templates/sdc-es.yaml b/kubernetes/sdc/templates/sdc-es.yaml
index e322ff405a..aff280d838 100644
--- a/kubernetes/sdc/templates/sdc-es.yaml
+++ b/kubernetes/sdc/templates/sdc-es.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableSdcSdcEs }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -61,3 +62,4 @@ spec:
             path:  /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/logs
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/sdc/templates/sdc-fe.yaml b/kubernetes/sdc/templates/sdc-fe.yaml
index 56d62963c4..d81e567711 100644
--- a/kubernetes/sdc/templates/sdc-fe.yaml
+++ b/kubernetes/sdc/templates/sdc-fe.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableSdcSdcFe }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -122,3 +123,4 @@ spec:
             path:  /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/sdc-fe/FE_2_setup_configuration.rb
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/sdc/templates/sdc-kb.yaml b/kubernetes/sdc/templates/sdc-kb.yaml
index 0d77e42d97..1f6f6e8dbf 100644
--- a/kubernetes/sdc/templates/sdc-kb.yaml
+++ b/kubernetes/sdc/templates/sdc-kb.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableSdcSdcKb }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -79,3 +80,4 @@ spec:
             path:  /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/logs
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/sdc/templates/sdc-pv-pvc.yaml b/kubernetes/sdc/templates/sdc-pv-pvc.yaml
index d84d8f4a93..c8ce9531c2 100644
--- a/kubernetes/sdc/templates/sdc-pv-pvc.yaml
+++ b/kubernetes/sdc/templates/sdc-pv-pvc.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableSdcSdcCs }}
 apiVersion: v1
 kind: PersistentVolume
 metadata:
@@ -28,3 +29,4 @@ spec:
   selector:
     matchLabels:
       name: "{{ .Values.nsPrefix }}-sdc-cs-db"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/sdnc/templates/all-services.yaml b/kubernetes/sdnc/templates/all-services.yaml
index 687a6bb934..37c88ed515 100644
--- a/kubernetes/sdnc/templates/all-services.yaml
+++ b/kubernetes/sdnc/templates/all-services.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableSdncSdncDbhost }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -25,6 +26,7 @@ spec:
   selector:
     app: sdnc-dbhost
   clusterIP: None
+#{{ end }}
 ---
 apiVersion: v1
 kind: Service
@@ -39,6 +41,7 @@ spec:
   selector:
     app: sdnc-dbhost
   clusterIP: None
+#{{ if not .Values.disableSdncSdncDgbuilder }}
 ---
 apiVersion: v1
 kind: Service
@@ -56,6 +59,8 @@ spec:
   type: NodePort
   selector:
     app: sdnc-dgbuilder
+#{{ end }}
+#{{ if not .Values.disableSdncSdnc }}
 ---
 apiVersion: v1
 kind: Service
@@ -88,6 +93,8 @@ spec:
   type: NodePort
   selector:
     app: sdnc
+#{{ end }}
+#{{ if not .Values.disableSdncSdncPortal }}
 ---
 apiVersion: v1
 kind: Service
@@ -115,3 +122,4 @@ spec:
   type: NodePort
   selector:
     app: sdnc-portal
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/sdnc/templates/db-deployment.yaml b/kubernetes/sdnc/templates/db-deployment.yaml
index 7bc8a75214..e2723b5e45 100644
--- a/kubernetes/sdnc/templates/db-deployment.yaml
+++ b/kubernetes/sdnc/templates/db-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableSdncSdncDbhost }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -44,3 +45,4 @@ spec:
           claimName: sdnc-db
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/sdnc/templates/dgbuilder-deployment.yaml b/kubernetes/sdnc/templates/dgbuilder-deployment.yaml
index 0e2166e92a..2fb4650a50 100644
--- a/kubernetes/sdnc/templates/dgbuilder-deployment.yaml
+++ b/kubernetes/sdnc/templates/dgbuilder-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableSdncSdncDgbuilder }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -72,3 +73,4 @@ spec:
           path: /etc/localtime
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/sdnc/templates/sdnc-deployment.yaml b/kubernetes/sdnc/templates/sdnc-deployment.yaml
index 95c282b602..a9a9c0e155 100644
--- a/kubernetes/sdnc/templates/sdnc-deployment.yaml
+++ b/kubernetes/sdnc/templates/sdnc-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableSdncSdnc }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -102,3 +103,4 @@ spec:
             path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdnc/conf/admportal.json
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/sdnc/templates/sdnc-pv-pvc.yaml b/kubernetes/sdnc/templates/sdnc-pv-pvc.yaml
index f8fe394907..f45d8f817d 100644
--- a/kubernetes/sdnc/templates/sdnc-pv-pvc.yaml
+++ b/kubernetes/sdnc/templates/sdnc-pv-pvc.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableSdncSdncDbhost }}
 apiVersion: v1
 kind: PersistentVolume
 metadata:
@@ -28,3 +29,4 @@ spec:
   selector:
     matchLabels:
       name: "{{ .Values.nsPrefix }}-sdnc-db"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/sdnc/templates/web-deployment.yaml b/kubernetes/sdnc/templates/web-deployment.yaml
index 45e2e26df3..9ab224bad6 100644
--- a/kubernetes/sdnc/templates/web-deployment.yaml
+++ b/kubernetes/sdnc/templates/web-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableSdncSdncPortal }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -82,3 +83,4 @@ spec:
           path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdnc/conf/admportal.json
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/uui/templates/all-services.yaml b/kubernetes/uui/templates/all-services.yaml
index e768fe26ac..9135622116 100644
--- a/kubernetes/uui/templates/all-services.yaml
+++ b/kubernetes/uui/templates/all-services.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableUuiUui }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -5,6 +6,17 @@ metadata:
     app: uui
   name: uui
   namespace: "{{ .Values.nsPrefix }}-uui"
+  annotations:
+    msb.onap.org/service-info: '[
+      {
+          "serviceName": "usecaseui-gui",
+          "version": "v1",
+          "url": "/iui/usecaseui",
+          "protocol": "UI"
+          "port": "8080",
+          "visualRange":"1|0"
+      }
+      ]'
 spec:
   ports:
   - name: uui
@@ -13,3 +25,4 @@ spec:
   selector:
     app: uui
   type: NodePort
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/uui/templates/uui-deployment.yaml b/kubernetes/uui/templates/uui-deployment.yaml
index e23202a907..41d33b194e 100644
--- a/kubernetes/uui/templates/uui-deployment.yaml
+++ b/kubernetes/uui/templates/uui-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableUuiUui }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -32,3 +33,4 @@ spec:
           periodSeconds: 10
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/vfc/templates/all-services.yaml b/kubernetes/vfc/templates/all-services.yaml
index a54dc00b2c..cd3c9c9136 100755
--- a/kubernetes/vfc/templates/all-services.yaml
+++ b/kubernetes/vfc/templates/all-services.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableVfcVfcNslcm }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -24,7 +25,8 @@ spec:
   selector:
     app: vfc-nslcm
   type: NodePort
-
+#{{ end }}
+#{{ if not .Values.disableVfcVfcResmgr }}
 ---
 apiVersion: v1
 kind: Service
@@ -52,7 +54,8 @@ spec:
   selector:
     app: vfc-resmgr
   type: NodePort
-
+#{{ end }}
+#{{ if not .Values.disableVfcVfcGvnfmdriver }}
 ---
 apiVersion: v1
 kind: Service
@@ -80,7 +83,8 @@ spec:
   selector:
     app: vfc-gvnfmdriver
   type: NodePort
-
+#{{ end }}
+#{{ if not .Values.disableVfcVfcZtevmanagerdriver }}
 ---
 apiVersion: v1
 kind: Service
@@ -108,7 +112,8 @@ spec:
   selector:
     app: vfc-ztevmanagerdriver
   type: NodePort
-
+#{{ end }}
+#{{ if not .Values.disableVfcVfcHwvnfmdriver }}
 ---
 apiVersion: v1
 kind: Service
@@ -136,7 +141,8 @@ spec:
   selector:
     app: vfc-hwvnfmdriver
   type: NodePort
-
+#{{ end }}
+#{{ if not .Values.disableVfcVfcZtesdncdriver }}
 ---
 apiVersion: v1
 kind: Service
@@ -164,7 +170,8 @@ spec:
   selector:
     app: vfc-ztesdncdriver
   type: NodePort
-
+#{{ end }}
+#{{ if not .Values.disableVfcVfcJujudriver }}
 ---
 apiVersion: v1
 kind: Service
@@ -192,7 +199,8 @@ spec:
   selector:
     app: vfc-jujudriver
   type: NodePort
-
+#{{ end }}
+#{{ if not .Values.disableVfcVfcVnflcm }}
 ---
 apiVersion: v1
 kind: Service
@@ -220,7 +228,8 @@ spec:
   selector:
     app: vfc-vnflcm
   type: NodePort
-
+#{{ end }}
+#{{ if not .Values.disableVfcVfcVnfres }}
 ---
 apiVersion: v1
 kind: Service
@@ -248,7 +257,8 @@ spec:
   selector:
     app: vfc-vnfres
   type: NodePort
-
+#{{ end }}
+#{{ if not .Values.disableVfcVfcVnfmgr }}
 ---
 apiVersion: v1
 kind: Service
@@ -276,7 +286,8 @@ spec:
   selector:
     app: vfc-vnfmgr
   type: NodePort
-
+#{{ end }}
+#{{ if not .Values.disableVfcVfcEmsdriver }}
 ---
 apiVersion: v1
 kind: Service
@@ -304,6 +315,8 @@ spec:
   selector:
     app: vfc-emsdriver
   type: NodePort
+#{{ end }}
+#{{ if not .Values.disableVfcVfcWorkflow }}
 ---
 apiVersion: v1
 kind: Service
@@ -331,7 +344,8 @@ spec:
   selector:
     app: vfc-workflow
   type: NodePort
-
+#{{ end }}
+#{{ if not .Values.disableVfcVfcCatalog }}
 ---
 apiVersion: v1
 kind: Service
@@ -359,3 +373,4 @@ spec:
   selector:
     app: vfc-catalog
   type: NodePort
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/vfc/templates/vfc-catalog-deployment.yaml b/kubernetes/vfc/templates/vfc-catalog-deployment.yaml
index c20690ba93..1782e24807 100755
--- a/kubernetes/vfc/templates/vfc-catalog-deployment.yaml
+++ b/kubernetes/vfc/templates/vfc-catalog-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableVfcVfcCatalog }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -31,4 +32,5 @@ spec:
           periodSeconds: 10
         imagePullPolicy: "{{ .Values.pullPolicy }}"
       imagePullSecrets:
-      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-\ No newline at end of file
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/vfc/templates/vfc-emsdriver-deployment.yaml b/kubernetes/vfc/templates/vfc-emsdriver-deployment.yaml
index f8fa88ff69..6adc0dc833 100755
--- a/kubernetes/vfc/templates/vfc-emsdriver-deployment.yaml
+++ b/kubernetes/vfc/templates/vfc-emsdriver-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableVfcVfcEmsdriver }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -31,4 +32,5 @@ spec:
           periodSeconds: 10
         imagePullPolicy: "{{ .Values.pullPolicy }}"
       imagePullSecrets:
-      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-\ No newline at end of file
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/vfc/templates/vfc-gvnfmdriver-deployment.yaml b/kubernetes/vfc/templates/vfc-gvnfmdriver-deployment.yaml
index 4aa67e2edb..18558afada 100755
--- a/kubernetes/vfc/templates/vfc-gvnfmdriver-deployment.yaml
+++ b/kubernetes/vfc/templates/vfc-gvnfmdriver-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableVfcVfcGvnfmdriver }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -31,4 +32,5 @@ spec:
           periodSeconds: 10
         imagePullPolicy: "{{ .Values.pullPolicy }}"
       imagePullSecrets:
-      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-\ No newline at end of file
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/vfc/templates/vfc-hwvnfmdriver-deployment.yaml b/kubernetes/vfc/templates/vfc-hwvnfmdriver-deployment.yaml
index 9240695243..e9d3282ef7 100755
--- a/kubernetes/vfc/templates/vfc-hwvnfmdriver-deployment.yaml
+++ b/kubernetes/vfc/templates/vfc-hwvnfmdriver-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableVfcVfcHwvnfmdriver }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -31,4 +32,5 @@ spec:
           periodSeconds: 10
         imagePullPolicy: "{{ .Values.pullPolicy }}"
       imagePullSecrets:
-      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-\ No newline at end of file
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/vfc/templates/vfc-jujudriver-deployment.yaml b/kubernetes/vfc/templates/vfc-jujudriver-deployment.yaml
index 7ff923a256..28a3c1e6b6 100755
--- a/kubernetes/vfc/templates/vfc-jujudriver-deployment.yaml
+++ b/kubernetes/vfc/templates/vfc-jujudriver-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableVfcVfcJujudriver }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -31,4 +32,5 @@ spec:
           periodSeconds: 10
         imagePullPolicy: "{{ .Values.pullPolicy }}"
       imagePullSecrets:
-      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-\ No newline at end of file
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/vfc/templates/vfc-nslcm-deployment.yaml b/kubernetes/vfc/templates/vfc-nslcm-deployment.yaml
index 235c11c1e6..400a680a9a 100755
--- a/kubernetes/vfc/templates/vfc-nslcm-deployment.yaml
+++ b/kubernetes/vfc/templates/vfc-nslcm-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableVfcVfcNslcm }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -31,4 +32,5 @@ spec:
           periodSeconds: 10
         imagePullPolicy: "{{ .Values.pullPolicy }}"
       imagePullSecrets:
-      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-\ No newline at end of file
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/vfc/templates/vfc-resmgr-deployment.yaml b/kubernetes/vfc/templates/vfc-resmgr-deployment.yaml
index 6b7eb64a2b..2c6a895518 100755
--- a/kubernetes/vfc/templates/vfc-resmgr-deployment.yaml
+++ b/kubernetes/vfc/templates/vfc-resmgr-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableVfcVfcResmgr }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -31,4 +32,5 @@ spec:
           periodSeconds: 10
         imagePullPolicy: "{{ .Values.pullPolicy }}"
       imagePullSecrets:
-      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-\ No newline at end of file
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/vfc/templates/vfc-vnflcm-deployment.yaml b/kubernetes/vfc/templates/vfc-vnflcm-deployment.yaml
index 7d4a900224..0d8922973b 100755
--- a/kubernetes/vfc/templates/vfc-vnflcm-deployment.yaml
+++ b/kubernetes/vfc/templates/vfc-vnflcm-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableVfcVfcVnflcm }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -31,4 +32,5 @@ spec:
           periodSeconds: 10
         imagePullPolicy: "{{ .Values.pullPolicy }}"
       imagePullSecrets:
-      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-\ No newline at end of file
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/vfc/templates/vfc-vnfmgr-deployment.yaml b/kubernetes/vfc/templates/vfc-vnfmgr-deployment.yaml
index 24dbc19981..566c3cabbd 100755
--- a/kubernetes/vfc/templates/vfc-vnfmgr-deployment.yaml
+++ b/kubernetes/vfc/templates/vfc-vnfmgr-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableVfcVfcVnfmgr }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -31,4 +32,5 @@ spec:
           periodSeconds: 10
         imagePullPolicy: "{{ .Values.pullPolicy }}"
       imagePullSecrets:
-      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-\ No newline at end of file
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/vfc/templates/vfc-vnfres-deployment.yaml b/kubernetes/vfc/templates/vfc-vnfres-deployment.yaml
index 1d4f295c9b..50b52b1a77 100755
--- a/kubernetes/vfc/templates/vfc-vnfres-deployment.yaml
+++ b/kubernetes/vfc/templates/vfc-vnfres-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableVfcVfcVnfres }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -31,4 +32,5 @@ spec:
           periodSeconds: 10
         imagePullPolicy: "{{ .Values.pullPolicy }}"
       imagePullSecrets:
-      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-\ No newline at end of file
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/vfc/templates/vfc-workflow-deployment.yaml b/kubernetes/vfc/templates/vfc-workflow-deployment.yaml
index 1db80b9393..097986cdd0 100755
--- a/kubernetes/vfc/templates/vfc-workflow-deployment.yaml
+++ b/kubernetes/vfc/templates/vfc-workflow-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableVfcVfcWorkflow }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -31,4 +32,5 @@ spec:
           periodSeconds: 10
         imagePullPolicy: "{{ .Values.pullPolicy }}"
       imagePullSecrets:
-      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-\ No newline at end of file
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/vfc/templates/vfc-ztesdncdriver-deployment.yaml b/kubernetes/vfc/templates/vfc-ztesdncdriver-deployment.yaml
index 82e0bd703d..828e7b32b1 100755
--- a/kubernetes/vfc/templates/vfc-ztesdncdriver-deployment.yaml
+++ b/kubernetes/vfc/templates/vfc-ztesdncdriver-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableVfcVfcZtesdncdriver }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -31,4 +32,5 @@ spec:
           periodSeconds: 10
         imagePullPolicy: "{{ .Values.pullPolicy }}"
       imagePullSecrets:
-      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-\ No newline at end of file
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/vfc/templates/vfc-ztevmanagerdriver-deployment.yaml b/kubernetes/vfc/templates/vfc-ztevmanagerdriver-deployment.yaml
index 29aafd67f5..5559cd05ac 100755
--- a/kubernetes/vfc/templates/vfc-ztevmanagerdriver-deployment.yaml
+++ b/kubernetes/vfc/templates/vfc-ztevmanagerdriver-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableVfcVfcZtevmanagerdriver }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -31,4 +32,5 @@ spec:
           periodSeconds: 10
         imagePullPolicy: "{{ .Values.pullPolicy }}"
       imagePullSecrets:
-      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-\ No newline at end of file
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/vid/templates/all-services.yaml b/kubernetes/vid/templates/all-services.yaml
index 270aab9fc1..1aa2bb0a0b 100644
--- a/kubernetes/vid/templates/all-services.yaml
+++ b/kubernetes/vid/templates/all-services.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableVidVidMariadb }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -10,6 +11,8 @@ spec:
   selector:
     app: vid-mariadb
   clusterIP: None
+#{{ end }}
+#{{ if not .Values.disableVidVidServer }}
 ---
 apiVersion: v1
 kind: Service
@@ -26,3 +29,4 @@ spec:
   selector:
     app: vid-server
   type: NodePort
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/vid/templates/vid-mariadb-deployment.yaml b/kubernetes/vid/templates/vid-mariadb-deployment.yaml
index 9b585e246f..55ef5da872 100644
--- a/kubernetes/vid/templates/vid-mariadb-deployment.yaml
+++ b/kubernetes/vid/templates/vid-mariadb-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableVidVidMariadb }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -60,3 +61,4 @@ spec:
             path: /dockerdata-nfs/{{ .Values.nsPrefix }}/vid/vid/lf_config/vid-my.cnf
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/vid/templates/vid-pv-pvc.yaml b/kubernetes/vid/templates/vid-pv-pvc.yaml
index f568c7a74b..f513a87354 100644
--- a/kubernetes/vid/templates/vid-pv-pvc.yaml
+++ b/kubernetes/vid/templates/vid-pv-pvc.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableVidVidMariadb }}
 apiVersion: v1
 kind: PersistentVolume
 metadata:
@@ -28,3 +29,4 @@ spec:
   selector:
     matchLabels:
       name: "{{ .Values.nsPrefix }}-vid-db"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/vid/templates/vid-server-deployment.yaml b/kubernetes/vid/templates/vid-server-deployment.yaml
index ff341335a3..e8c7f55523 100644
--- a/kubernetes/vid/templates/vid-server-deployment.yaml
+++ b/kubernetes/vid/templates/vid-server-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableVidVidServer }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -131,3 +132,4 @@ spec:
             path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/vid/logback.xml
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/vnfsdk/templates/all-services.yaml b/kubernetes/vnfsdk/templates/all-services.yaml
index 1f11729667..c78dab8193 100644
--- a/kubernetes/vnfsdk/templates/all-services.yaml
+++ b/kubernetes/vnfsdk/templates/all-services.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableVnfsdkPostgres }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -12,6 +13,8 @@ spec:
   selector:
     app: postgres
   clusterIP: None
+#{{ end }}
+#{{ if not .Values.disableVnfsdkRefrepo }}
 ---
 apiVersion: v1
 kind: Service
@@ -28,3 +31,4 @@ spec:
   selector:
     app: refrepo
   type: NodePort
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/vnfsdk/templates/postgres-deployment.yaml b/kubernetes/vnfsdk/templates/postgres-deployment.yaml
index 76721d1eae..cdc2ba9572 100644
--- a/kubernetes/vnfsdk/templates/postgres-deployment.yaml
+++ b/kubernetes/vnfsdk/templates/postgres-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableVnfsdkPostgres }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -22,3 +23,4 @@ spec:
         name: "postgres"
       imagePullSecrets:
       - name: {{ .Values.nsPrefix }}-docker-registry-key
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/vnfsdk/templates/refrepo-deployment.yaml b/kubernetes/vnfsdk/templates/refrepo-deployment.yaml
index 3accb96967..82f5f172db 100644
--- a/kubernetes/vnfsdk/templates/refrepo-deployment.yaml
+++ b/kubernetes/vnfsdk/templates/refrepo-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableVnfsdkRefrepo }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -52,3 +53,4 @@ spec:
           periodSeconds: 10
       imagePullSecrets:
       - name: {{ .Values.nsPrefix }}-docker-registry-key
+#{{ end }}
+\ No newline at end of file