diff --git a/xos-profiles/rcord-lite/requirements.yaml b/xos-profiles/rcord-lite/requirements.yaml
index ff949b5..31551dc 100644
--- a/xos-profiles/rcord-lite/requirements.yaml
+++ b/xos-profiles/rcord-lite/requirements.yaml
@@ -18,9 +18,6 @@
 - name: onos-service
   version: 0.1.0
   repository: file://../../xos-services/onos-service
-- name: addressmanager
-  version: 0.1.0
-  repository: file://../../xos-services/addressmanager
 - name: fabric
   version: 0.1.0
   repository: file://../../xos-services/fabric
diff --git a/xos-profiles/rcord-lite/values.yaml b/xos-profiles/rcord-lite/values.yaml
index 3a4974f..49084b6 100644
--- a/xos-profiles/rcord-lite/values.yaml
+++ b/xos-profiles/rcord-lite/values.yaml
@@ -39,11 +39,6 @@
 xosAdminPassword: letmein
 
 # Service-specific configuration.
-addressmanager:
-  serviceConfig:
-    accessor:
-      username: admin@opencord.org
-      password: letmein
 fabric:
   serviceConfig:
     accessor:
@@ -192,7 +187,8 @@
               name: ONOS_Fabric
               kind: platform
               no_container: true
-              rest_hostname: onos-fabric
+              rest_hostname: onos-fabric-ui
+              rest_port: 8181
         serviceattribute#fabric_network_cfg_json:
           type: tosca.nodes.ServiceAttribute
           requirements:
@@ -230,8 +226,6 @@
     tosca_definitions_version: tosca_simple_yaml_1_0
     description: Set up VOLT, AddressManager, and RCORD services
     imports:
-      - custom_types/addressmanagerservice.yaml
-      - custom_types/addresspool.yaml
       - custom_types/image.yaml
       - custom_types/network.yaml
       - custom_types/networkslice.yaml
@@ -249,6 +243,11 @@
       - custom_types/vsghwservice.yaml
     topology_template:
       node_templates:
+        service#ONOS_Fabric:
+          type: tosca.nodes.ONOSService
+          properties:
+              name: ONOS_Fabric
+              must-exist: true
         service#rcord:
           type: tosca.nodes.Service
           properties:
@@ -273,10 +272,6 @@
           type: tosca.nodes.VSGHWService
           properties:
             name: vsg-hw
-        service#addressmanager:
-          type: tosca.nodes.AddressManagerService
-          properties:
-            name: addressmanager
         volt_vsg-hw:
           type: tosca.nodes.ServiceDependency
           properties:
@@ -288,7 +283,7 @@
             - provider_service:
                 node: service#vsg-hw
                 relationship: tosca.relationships.BelongsToOne
-        vsg-hw_addressmanager:
+        onos_fabric_vsg-hw:
           type: tosca.nodes.ServiceDependency
           properties:
             connect_method: None
@@ -297,7 +292,7 @@
                 node: service#vsg-hw
                 relationship: tosca.relationships.BelongsToOne
             - provider_service:
-                node: service#addressmanager
+                node: service#ONOS_Fabric
                 relationship: tosca.relationships.BelongsToOne
 
   serviceGraphConstraints:
@@ -310,4 +305,4 @@
         constraints:
           type: tosca.nodes.ServiceGraphConstraint
           properties:
-            constraints: '[[null, "rcord"], [null, "volt"], ["addressmanager", "vsg-hw"]]'
+            constraints: '[[null, "rcord"], [null, "volt"], ["ONOS_Fabric", "vsg-hw"]]'