diff --git a/helm-charts/profile/bng-in-fabric/values.yaml b/helm-charts/profile/bng-in-fabric/values.yaml
index 529ada7..26afc5b 100644
--- a/helm-charts/profile/bng-in-fabric/values.yaml
+++ b/helm-charts/profile/bng-in-fabric/values.yaml
@@ -37,4 +37,4 @@
   kafkaService: "nem-core-kafka.default.svc.cluster.local"
 onos-service:
   kafkaService: "nem-core-kafka.default.svc.cluster.local:9092"
-  onosFabricRestService: "seba-substrate-onos-fabric-ui.default.svc.cluster.local"
+  onosFabricRestService: "onos-fabric-ui.default.svc.cluster.local"
diff --git a/helm-charts/profile/nem-att/values.yaml b/helm-charts/profile/nem-att/values.yaml
index 8482250..342556c 100644
--- a/helm-charts/profile/nem-att/values.yaml
+++ b/helm-charts/profile/nem-att/values.yaml
@@ -31,8 +31,8 @@
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
 
-onosFabricRestService: "seba-substrate-onos-fabric-ui.default.svc.cluster.local"
-onosVolthaRestService: "onos-voltha-ui.voltha.svc.cluster.local"
+onosFabricRestService: "onos-fabric-ui.default.svc.cluster.local"
+onosVolthaRestService: "onos-voltha-ui.default.svc.cluster.local"
 kafkaService: "nem-core-kafka.default.svc.cluster.local:9092"
 
 volt:
diff --git a/helm-charts/seba-substrate/values.yaml b/helm-charts/seba-substrate/values.yaml
index b3b78d9..97afe1e 100644
--- a/helm-charts/seba-substrate/values.yaml
+++ b/helm-charts/seba-substrate/values.yaml
@@ -36,9 +36,6 @@
   nameOverride: "onosv"
   fullnameOverride: "onos-voltha"
 
-  namespace: voltha
-  serviceAccountName: voltha-serviceaccount
-
   onosImage: 'voltha/voltha-onos:latest'
 
   services:
@@ -66,6 +63,9 @@
 
 # from configs/onos-fabric.yaml
 onos-fabric:
+  nameOverride: "onosf"
+  fullnameOverride: "onos-fabric"
+
   services:
     openflowServiceType: NodePort
     ovsdbServiceType: NodePort
@@ -83,4 +83,3 @@
   onos_env:
     - name: ONOS_APPS
       value: "openflow"
-