diff --git a/mavenrepo/templates/repo-service.yaml b/mavenrepo/templates/repo-service.yaml
index e649804..f9ba1d8 100644
--- a/mavenrepo/templates/repo-service.yaml
+++ b/mavenrepo/templates/repo-service.yaml
@@ -16,7 +16,6 @@
 kind: Service
 metadata:
   name: {{ template "mavenrepo.fullname" . }}-http
-  namespace: {{ .Values.namespace }}
   labels:
     app: {{ template "mavenrepo.name" . }}
     chart: {{ template "mavenrepo.chart" . }}
diff --git a/mavenrepo/values.yaml b/mavenrepo/values.yaml
index 913ea5d..9dc7975 100644
--- a/mavenrepo/values.yaml
+++ b/mavenrepo/values.yaml
@@ -16,3 +16,6 @@
 
 mavenRepoImage: 'opencord/mavenrepo:latest'
 imagePullPolicy: Always
+
+nameOverride: ""
+fullnameOverride: ""
diff --git a/xos-profiles/att-workflow/templates/_tosca.tpl b/xos-profiles/att-workflow/templates/_tosca.tpl
index 5158c0a..310a4d5 100644
--- a/xos-profiles/att-workflow/templates/_tosca.tpl
+++ b/xos-profiles/att-workflow/templates/_tosca.tpl
@@ -172,10 +172,10 @@
         connect_method: none
       requirements:
         - subscriber_service:
-            node: service#ONOS_Fabric
+            node: service#fabric
             relationship: tosca.relationships.BelongsToOne
         - provider_service:
-            node: service#fabric
+            node: service#ONOS_Fabric
             relationship: tosca.relationships.BelongsToOne
 
     service_dependency#rcord_volt:
diff --git a/xos-profiles/rcord-lite/templates/_tosca.tpl b/xos-profiles/rcord-lite/templates/_tosca.tpl
index 4ecb462..613fd7e 100644
--- a/xos-profiles/rcord-lite/templates/_tosca.tpl
+++ b/xos-profiles/rcord-lite/templates/_tosca.tpl
@@ -116,10 +116,10 @@
         connect_method: none
       requirements:
         - subscriber_service:
-            node: service#ONOS_Fabric
+            node: service#fabric
             relationship: tosca.relationships.BelongsToOne
         - provider_service:
-            node: service#fabric
+            node: service#ONOS_Fabric
             relationship: tosca.relationships.BelongsToOne
 
     service_dependency#rcord_volt: