diff --git a/kubernetes/aai/resources/config/aai-data/environments/simpledemo.json b/kubernetes/aai/resources/config/aai-data/environments/simpledemo.json
index 99edba2..7b299f7 100644
--- a/kubernetes/aai/resources/config/aai-data/environments/simpledemo.json
+++ b/kubernetes/aai/resources/config/aai-data/environments/simpledemo.json
@@ -33,16 +33,16 @@
 		"PROJECT_HOME": "/opt/app/aai-traversal",
 		"LOGROOT": "/opt/aai/logroot",
 		"JAVA_HOME": "/usr/lib/jvm/java-8-openjdk-amd64",
-		"AAI_SERVER_URL_BASE": "https://aai-service.onap-aai:8443/aai/",
-		"AAI_SERVER_URL": "https://aai-service.onap-aai:8443/aai/v11/",
-		"AAI_GLOBAL_CALLBACK_URL": "https://aai-service.onap-aai:8443/aai/",
+		"AAI_SERVER_URL_BASE": "https://aai-servicei.{{.Values.nsPrefix}}:8443/aai/",
+		"AAI_SERVER_URL": "https://aai-service.{{.Values.nsPrefix}}:8443/aai/v11/",
+		"AAI_GLOBAL_CALLBACK_URL": "https://aai-service.{{.Values.nsPrefix}}:8443/aai/",
 		"AAI_TRUSTSTORE_FILENAME": "aai_keystore",
 		"AAI_TRUSTSTORE_PASSWD_X": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
 		"AAI_KEYSTORE_FILENAME": "aai_keystore",
 		"AAI_KEYSTORE_PASSWD_X": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
-		"APPLICATION_SERVERS": "aai-service.onap-aai",
+		"APPLICATION_SERVERS": "aai-service.{{.Values.nsPrefix}}",
 		"AAI_DMAAP_PROTOCOL": "http",
-		"AAI_DMAAP_HOST_PORT": "dmaap.onap-message-router:3904",
+		"AAI_DMAAP_HOST_PORT": "dmaap.{{.Values.nsPrefix}}:3904",
 		"AAI_DMAAP_TOPIC_NAME": "AAI-EVENT",
 		"AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_STATUS": "UNPROCESSED",
 		"AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_TYPE": "AAI-EVENT",
@@ -54,11 +54,11 @@
 		"AAI_NOTIFICATION_CURRENT_VERSION": "v11",
 		"RESOURCE_VERSION_ENABLE_FLAG": "true",
 		"TXN_HBASE_TABLE_NAME": "aailogging.dev",
-		"TXN_ZOOKEEPER_QUORUM": "hbase.onap-aai",
+		"TXN_ZOOKEEPER_QUORUM": "hbase.{{.Values.nsPrefix}}",
 		"TXN_ZOOKEEPER_PROPERTY_CLIENTPORT": "2181",
 		"TXN_HBASE_ZOOKEEPER_ZNODE_PARENT": "/hbase",
 		"AAI_WORKLOAD_PREFERRED_ROUTE_KEY": "MR1",
-		"STORAGE_HOSTNAME": "hbase.onap-aai",
+		"STORAGE_HOSTNAME": "hbase.{{.Values.nsPrefix}}",
 		"STORAGE_HBASE_TABLE": "aaigraph.dev",
 		"STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT": "/hbase",
 		"DB_CACHE_CLEAN_WAIT": "20",
@@ -85,16 +85,16 @@
 		"PROJECT_HOME": "/opt/app/aai-resources",
 		"LOGROOT": "/opt/aai/logroot",
 		"JAVA_HOME": "/usr/lib/jvm/java-8-openjdk-amd64",
-		"AAI_SERVER_URL_BASE": "https://aai-service.onap-aai:8443/aai/",
-		"AAI_SERVER_URL": "https://aai-service.onap-aai:8443/aai/v11/",
-		"AAI_GLOBAL_CALLBACK_URL": "https://aai-service.onap-aai:8443/aai/",
+		"AAI_SERVER_URL_BASE": "https://aai-service.{{.Values.nsPrefix}}:8443/aai/",
+		"AAI_SERVER_URL": "https://aai-service.{{.Values.nsPrefix}}:8443/aai/v11/",
+		"AAI_GLOBAL_CALLBACK_URL": "https://aai-service.{{.Values.nsPrefix}}:8443/aai/",
 		"AAI_TRUSTSTORE_FILENAME": "aai_keystore",
 		"AAI_TRUSTSTORE_PASSWD_X": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
 		"AAI_KEYSTORE_FILENAME": "aai_keystore",
 		"AAI_KEYSTORE_PASSWD_X": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
-		"APPLICATION_SERVERS": "aai-service.onap-aai",
+		"APPLICATION_SERVERS": "aai-service.{{.Values.nsPrefix}}",
 		"AAI_DMAAP_PROTOCOL": "http",
-		"AAI_DMAAP_HOST_PORT": "dmaap.onap-message-router:3904",
+		"AAI_DMAAP_HOST_PORT": "dmaap.{{.Values.nsPrefix}}:3904",
 		"AAI_DMAAP_TOPIC_NAME": "AAI-EVENT",
 		"AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_STATUS": "UNPROCESSED",
 		"AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_TYPE": "AAI-EVENT",
@@ -106,11 +106,11 @@
 		"AAI_NOTIFICATION_CURRENT_VERSION": "v11",
 		"RESOURCE_VERSION_ENABLE_FLAG": "true",
 		"TXN_HBASE_TABLE_NAME": "aailogging.dev",
-		"TXN_ZOOKEEPER_QUORUM": "hbase.onap-aai",
+		"TXN_ZOOKEEPER_QUORUM": "hbase.{{.Values.nsPrefix}}",
 		"TXN_ZOOKEEPER_PROPERTY_CLIENTPORT": "2181",
 		"TXN_HBASE_ZOOKEEPER_ZNODE_PARENT": "/hbase",
 		"AAI_WORKLOAD_PREFERRED_ROUTE_KEY": "MR1",
-		"STORAGE_HOSTNAME": "hbase.onap-aai",
+		"STORAGE_HOSTNAME": "hbase.{{.Values.nsPrefix}}",
 		"STORAGE_HBASE_TABLE": "aaigraph.dev",
 		"STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT": "/hbase",
 		"DB_CACHE_CLEAN_WAIT": "20",
diff --git a/kubernetes/aai/resources/config/data-router/dynamic/routes/entity-event.route b/kubernetes/aai/resources/config/data-router/dynamic/routes/entity-event.route
index 81e1cf9..293688e 100644
--- a/kubernetes/aai/resources/config/data-router/dynamic/routes/entity-event.route
+++ b/kubernetes/aai/resources/config/data-router/dynamic/routes/entity-event.route
@@ -1,4 +1,4 @@
 <route xmlns="http://camel.apache.org/schema/spring" trace="true">
-  <from uri="event-bus:mybus/?eventTopic=AAI-EVENT&amp;groupName=datarouter&amp;groupId=datarouter&amp;url=http://dmaap.onap-message-router:3904"/>
+  <from uri="event-bus:mybus/?eventTopic=AAI-EVENT&amp;groupName=datarouter&amp;groupId=datarouter&amp;url=http://dmaap.{{.Values.nsPrefix}}:3904"/>
   <to uri="bean:entityEventPolicy?method=process"/>
 </route>
diff --git a/kubernetes/aai/resources/config/haproxy/haproxy.cfg b/kubernetes/aai/resources/config/haproxy/haproxy.cfg
index d777327..6e6f489 100644
--- a/kubernetes/aai/resources/config/haproxy/haproxy.cfg
+++ b/kubernetes/aai/resources/config/haproxy/haproxy.cfg
@@ -95,7 +95,7 @@
         balance roundrobin
         http-request set-header X-Forwarded-Port %[src_port]
         http-response set-header Strict-Transport-Security max-age=16000000;\ includeSubDomains;\ preload;
-        server aai-resources.onap-aai  aai-resources.onap-aai:8447  port 8447 ssl verify none
+        server aai-resources.{{.Values.nsPrefix}}  aai-resources.{{.Values.nsPrefix}}:8447  port 8447 ssl verify none
 
 #######################
 # BACKEND 8446#########
@@ -105,7 +105,7 @@
         balance roundrobin
         http-request set-header X-Forwarded-Port %[src_port]
         http-response set-header Strict-Transport-Security max-age=16000000;\ includeSubDomains;\ preload;
-        server aai-traversal.onap-aai aai-traversal.onap-aai:8446  port 8446 ssl verify none
+        server aai-traversal.{{.Values.nsPrefix}} aai-traversal.{{.Values.nsPrefix}}:8446  port 8446 ssl verify none
 
 listen IST_AAI_STATS
         mode http
diff --git a/kubernetes/aai/resources/config/log/filebeat/filebeat.yml b/kubernetes/aai/resources/config/log/filebeat/filebeat.yml
index f316b86..89c6932 100644
--- a/kubernetes/aai/resources/config/log/filebeat/filebeat.yml
+++ b/kubernetes/aai/resources/config/log/filebeat/filebeat.yml
@@ -21,7 +21,7 @@
   #List of logstash server ip addresses with port number.
   #But, in our case, this will be the loadbalancer IP address.
   #For the below property to work the loadbalancer or logstash should expose 5044 port to listen the filebeat events or port in the property should be changed appropriately.
-  hosts: ["logstash.onap-log:5044"]
+  hosts: ["logstash.{{.Values.nsPrefix}}:5044"]
   #If enable will do load balancing among availabe Logstash, automatically.
   loadbalance: true
 
diff --git a/kubernetes/aai/resources/config/model-loader/appconfig/model-loader.properties b/kubernetes/aai/resources/config/model-loader/appconfig/model-loader.properties
index 58b80d8..5d61fba 100644
--- a/kubernetes/aai/resources/config/model-loader/appconfig/model-loader.properties
+++ b/kubernetes/aai/resources/config/model-loader/appconfig/model-loader.properties
@@ -1,6 +1,6 @@
 # Model Loader Distribution Client Configuration
 ml.distribution.ACTIVE_SERVER_TLS_AUTH=false
-ml.distribution.ASDC_ADDRESS=sdc-be.onap-sdc:8443
+ml.distribution.ASDC_ADDRESS=sdc-be.{{.Values.nsPrefix}}:8443
 ml.distribution.CONSUMER_GROUP=aai-ml-group
 ml.distribution.CONSUMER_ID=aai-ml
 ml.distribution.ENVIRONMENT_NAME=AUTO
@@ -13,7 +13,7 @@
 ml.distribution.ARTIFACT_TYPES=MODEL_INVENTORY_PROFILE,MODEL_QUERY_SPEC,VNF_CATALOG
 
 # Model Loader AAI REST Client Configuration
-ml.aai.BASE_URL=https://aai-service.onap-aai:8443
+ml.aai.BASE_URL=https://aai-service.{{.Values.nsPrefix}}:8443
 ml.aai.MODEL_URL=/aai/v10/service-design-and-creation/models/model/
 ml.aai.NAMED_QUERY_URL=/aai/v10/service-design-and-creation/named-queries/named-query/
 ml.aai.VNF_IMAGE_URL=/aai/v8/service-design-and-creation/vnf-images
diff --git a/kubernetes/aai/resources/config/search-data-service/appconfig/elastic-search.properties b/kubernetes/aai/resources/config/search-data-service/appconfig/elastic-search.properties
index 006fc6e..c19667a 100644
--- a/kubernetes/aai/resources/config/search-data-service/appconfig/elastic-search.properties
+++ b/kubernetes/aai/resources/config/search-data-service/appconfig/elastic-search.properties
@@ -1,5 +1,5 @@
 # ElasticSearch Configuration
 
 es.cluster-name=ES_AAI
-es.ip-address=elasticsearch.onap-aai
+es.ip-address=aai-elasticsearch.{{.Values.nsPrefix}}
 es.http-port=9200
diff --git a/kubernetes/aai/resources/config/sparky-be/appconfig/aai.properties b/kubernetes/aai/resources/config/sparky-be/appconfig/aai.properties
index 3b45428..aaca346 100644
--- a/kubernetes/aai/resources/config/sparky-be/appconfig/aai.properties
+++ b/kubernetes/aai/resources/config/sparky-be/appconfig/aai.properties
@@ -6,7 +6,7 @@
 #
 # The ip address/hostname and port to the desired AAI instance
 #
-aai.rest.host=aai-service.onap-aai
+aai.rest.host=aai-service.{{.Values.nsPrefix}}
 aai.rest.port=8443
 
 ############################## REST ##############################
@@ -84,4 +84,4 @@
 aai.taskProcessor.maxConcurrentWorkers=5
 aai.taskProcessor.transactionRateControllerEnabled=false
 aai.taskProcessor.numSamplesPerThreadForRunningAverage=100
-aai.taskProcessor.targetTPS=100
\ No newline at end of file
+aai.taskProcessor.targetTPS=100
diff --git a/kubernetes/aai/resources/config/sparky-be/appconfig/elasticsearch.properties b/kubernetes/aai/resources/config/sparky-be/appconfig/elasticsearch.properties
index 82b5af3..99aea27 100644
--- a/kubernetes/aai/resources/config/sparky-be/appconfig/elasticsearch.properties
+++ b/kubernetes/aai/resources/config/sparky-be/appconfig/elasticsearch.properties
@@ -7,7 +7,7 @@
 # The ip address/hostname and port to the desired AAI instance
 # For development it's recommended to use a local instance of ES
 #
-elasticsearch.ipAddress=elasticsearch.onap-aai
+elasticsearch.ipAddress=aai-elasticsearch.{{.Values.nsPrefix}}
 elasticsearch.httpPort=9200
 elasticsearch.javaApiPort=8443
 
@@ -69,4 +69,4 @@
 elasticsearch.taskProcessor.transactionRateControllerEnabled=false
 elasticsearch.taskProcessor.numSamplesPerThreadForRunningAverage=100
 elasticsearch.taskProcessor.targetTPS=100
-elasticsearch.clusterName=ES_AAI_LOCALHOST
\ No newline at end of file
+elasticsearch.clusterName=ES_AAI_LOCALHOST
diff --git a/kubernetes/aai/resources/config/sparky-be/appconfig/portal/portal.properties b/kubernetes/aai/resources/config/sparky-be/appconfig/portal/portal.properties
index 33d91cf..9014736 100644
--- a/kubernetes/aai/resources/config/sparky-be/appconfig/portal/portal.properties
+++ b/kubernetes/aai/resources/config/sparky-be/appconfig/portal/portal.properties
@@ -7,10 +7,10 @@
 
 # Instance of ECOMP Portal where the app has been on-boarded
 # use insecure http for dev purposes to avoid self-signed certificate
-ecomp_rest_url = http://portalapps.onap-portal:8989/ONAPPORTAL/auxapi
+ecomp_rest_url = http://portalapps.{{.Values.nsPrefix}}:8989/ONAPPORTAL/auxapi
 
 # Standard global logon page
-ecomp_redirect_url = http://portalapps.onap-portal:8989/ONAPPORTAL/login.htm
+ecomp_redirect_url = http://portalapps.{{.Values.nsPrefix}}:8989/ONAPPORTAL/login.htm
 
 # Name of cookie to extract on login request
 csp_cookie_name = EPService
diff --git a/kubernetes/aai/resources/config/sparky-be/appconfig/search-service.properties b/kubernetes/aai/resources/config/sparky-be/appconfig/search-service.properties
index 5f4985a..57e3475 100644
--- a/kubernetes/aai/resources/config/sparky-be/appconfig/search-service.properties
+++ b/kubernetes/aai/resources/config/sparky-be/appconfig/search-service.properties
@@ -6,7 +6,7 @@
 #
 # The ip address/hostname and port to the desired Search Data Service instance
 #
-search-service.ipAddress=search-data-service.onap-aai
+search-service.ipAddress=search-data-service.{{.Values.nsPrefix}}
 search-service.httpPort=9509
 
 ############################## Indexes ##############################
@@ -29,4 +29,4 @@
 ############################## Certs ##############################
 search-service.ssl.cert-name=client-cert-onap.p12
 search-service.ssl.keystore-password=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
-search-service.ssl.keystore=tomcat_keystore
\ No newline at end of file
+search-service.ssl.keystore=tomcat_keystore