diff --git a/roles/cord-profile/templates/ecord-services.yaml.j2 b/roles/cord-profile/templates/ecord-services.yaml.j2
index 9362aed..03c4207 100644
--- a/roles/cord-profile/templates/ecord-services.yaml.j2
+++ b/roles/cord-profile/templates/ecord-services.yaml.j2
@@ -1,4 +1,3 @@
-
 {#
 Copyright 2017-present Open Networking Foundation
 
@@ -15,7 +14,6 @@
 limitations under the License.
 #}
 
-
 tosca_definitions_version: tosca_simple_yaml_1_0
 
 description: Just enough Tosca to get the vEG slice running on the CORD POD, created by platform-install
@@ -23,7 +21,7 @@
 imports:
    - custom_types/xos.yaml
    - custom_types/veg.yaml
-   - custom_types/vnodlocal.yaml
+   - custom_types/addressmanager.yaml
 
 topology_template:
   node_templates:
@@ -83,6 +81,16 @@
         gateway_ip: 10.8.1.1
         gateway_mac: a4:23:05:06:01:01
 
+    service#addressmanager:
+      type: tosca.nodes.AddressManagerService
+      requirements:
+        - addresses_veg:
+            node: addresses_veg
+            relationship: tosca.relationships.ProvidesAddresses
+        - addresses_public:
+            node: addresses_public
+            relationship: tosca.relationships.ProvidesAddresses
+
     label_veg:
       type: tosca.nodes.NodeLabel
 
@@ -125,7 +133,7 @@
             node: service#vrouter
             relationship: tosca.relationships.UsedByService
       properties:
-        dependencies: org.onosproject.vrouter
+        dependencies: org.onosproject.fpm
         autogenerate: vrouter-network-cfg
 
     template#veg:
@@ -135,11 +143,6 @@
         translation: none
         vtn_kind: VEG
 
-    service#vnodlocal:
-      type: tosca.nodes.VNodLocalService
-      properties:
-      requirements:
-
     # Networks required by the CORD setup
     {{ site_name }}_veg-access:
       type: tosca.nodes.network.Network
@@ -181,3 +184,53 @@
             node: image#vsg-1.1
             relationship: tosca.relationships.DefaultImage
 
+    in#lanside:
+      type: tosca.nodes.InterfaceType
+      properties:
+         direction: in
+
+    out#lanside:
+      type: tosca.nodes.InterfaceType
+      properties:
+         direction: out
+
+    in#wanside:
+      type: tosca.nodes.InterfaceType
+      properties:
+         direction: in
+
+    out#wanside:
+      type: tosca.nodes.InterfaceType
+      properties:
+         direction: out
+
+    veg_lanside:
+      type: tosca.nodes.ServiceInterface
+      requirements:
+        - service:
+            node: service#veg
+            relationship: tosca.relationships.MemberOfService
+        - interface:
+            node: in#lanside
+            relationship: tosca.relationships.IsType
+
+    veg_wanside:
+      type: tosca.nodes.ServiceInterface
+      requirements:
+        - service:
+            node: service#veg
+            relationship: tosca.relationships.MemberOfService
+        - interface:
+            node: out#wanside
+            relationship: tosca.relationships.IsType
+
+    addressmanager_wanside:
+      type: tosca.nodes.ServiceInterface
+      requirements:
+        - service:
+            node: service#addressmanager
+            relationship: tosca.relationships.MemberOfService
+        - interface:
+            node: in#wanside
+            relationship: tosca.relationships.IsType
+
diff --git a/roles/cord-profile/templates/vee-service.yaml.j2 b/roles/cord-profile/templates/vee-service.yaml.j2
index 7a113c4..5b4f49f 100644
--- a/roles/cord-profile/templates/vee-service.yaml.j2
+++ b/roles/cord-profile/templates/vee-service.yaml.j2
@@ -22,7 +22,6 @@
    - custom_types/xos.yaml
    - custom_types/vee.yaml
    - custom_types/veg.yaml
-   - custom_types/vnodlocal.yaml
 
 description: vee services, generated by platform-install
 
@@ -46,23 +45,12 @@
       artifacts:
         pubkey: /opt/xos/services/veg/keys/veg_rsa.pub
 
-    service#vnodlocal:
-      type: tosca.nodes.VNodLocalService
-      properties:
-        no-delete: true
-        no-create: true
-        no-update: true
-      requirements:
-
     service#vee:
       type: tosca.nodes.VEEService
       requirements:
           - veg_tenant:
               node: service#veg
               relationship: tosca.relationships.TenantOfService
-          - vnodlocal_tenant:
-              node: service#vnodlocal
-              relationship: tosca.relationships.TenantOfService
       properties:
         view_url: /admin/vEE/veeservice/$id$/
 
diff --git a/roles/create-lxd/library/host_dns_check.py b/roles/create-lxd/library/host_dns_check.py
index c8b3e17..2dc267e 100755
--- a/roles/create-lxd/library/host_dns_check.py
+++ b/roles/create-lxd/library/host_dns_check.py
@@ -89,5 +89,6 @@
 # Output the results
 print json.dumps(result)
 
-if result["failed"]:
+if 'failed' in result:
     sys.exit(1)
+
diff --git a/roles/test-ecord-subscriber-config/templates/test-ecord-subscriber.yaml.j2 b/roles/test-ecord-subscriber-config/templates/test-ecord-subscriber.yaml.j2
index f7eb1ed..a5c9aeb 100644
--- a/roles/test-ecord-subscriber-config/templates/test-ecord-subscriber.yaml.j2
+++ b/roles/test-ecord-subscriber-config/templates/test-ecord-subscriber.yaml.j2
@@ -1,4 +1,3 @@
-
 {#
 Copyright 2017-present Open Networking Foundation
 
@@ -15,7 +14,6 @@
 limitations under the License.
 #}
 
-
 tosca_definitions_version: tosca_simple_yaml_1_0
 
 description: Creates a CORD test subscriber, created by platform-install
@@ -24,7 +22,6 @@
    - custom_types/xos.yaml
    - custom_types/vee.yaml
    - custom_types/veg.yaml
-   - custom_types/vnodlocal.yaml
 
 topology_template:
   node_templates:
@@ -66,14 +63,6 @@
         no-create: true
         no-update: true
 
-    service#vnodlocal:
-      type: tosca.nodes.VNodLocalService
-      properties:
-        no-delete: true
-        no-create: true
-        no-update: true
-      requirements:
-
 # Test subscriber
 
     # Let's add a user who can be administrator of the household
@@ -117,13 +106,9 @@
         - provider_service:
             node: service#veg
             relationship: tosca.relationships.MemberOfService
-            node: service#vnodlocal
-            relationship: tosca.relationships.MemberOfService
         - subscriber_tenant:
             node: service#vee
             relationship: tosca.relationships.BelongsToTenant
-            node: service#vnodlocal
-            relationship: tosca.relationships.BelongsToTenant
         - subscriber:
             node: My Enterprise
             relationship: tosca.relationships.BelongsToSubscriber