diff --git a/roles/cord-profile/templates/ecord-services.yaml.j2 b/roles/cord-profile/templates/ecord-services.yaml.j2
index 03c4207..7a8ec71 100644
--- a/roles/cord-profile/templates/ecord-services.yaml.j2
+++ b/roles/cord-profile/templates/ecord-services.yaml.j2
@@ -104,7 +104,7 @@
         view_url: /admin/vEG/vegservice/$id$/
         backend_network_label: hpc_client
         public_key: { get_artifact: [ SELF, pubkey, LOCAL_FILE] }
-        private_key_fn: /opt/cord_profile/key_import/veg_rsa
+        private_key_fn: /opt/xos/services/veg/keys/veg_rsa
 #       node_label: label_veg
         replaces: service_veg
       artifacts:
@@ -141,7 +141,7 @@
       properties:
         visibility: private
         translation: none
-        vtn_kind: VEG
+        vtn_kind: VSG
 
     # Networks required by the CORD setup
     {{ site_name }}_veg-access:
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 8420b61..e0c7ffb 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
@@ -96,7 +96,7 @@
             relationship: tosca.relationships.MemberOfService
 
     My vEG:
-      type: tosca.nodes.Tenant
+      type: tosca.nodes.VEGTenant
       properties:
         service_specific_id: 123
       requirements:
@@ -108,9 +108,11 @@
             relationship: tosca.relationships.BelongsToTenant
 
     My vEE:
-      type: tosca.nodes.Tenant
+      type: tosca.nodes.VEEServiceInstance
       properties:
         service_specific_id: 123
+        s_tag: 123
+        c_tag: 123
       requirements:
         - provider_service:
             node: service#vee
diff --git a/scripts/clean_openstack.sh b/scripts/clean_openstack.sh
index 051a141..0d51ddf 100755
--- a/scripts/clean_openstack.sh
+++ b/scripts/clean_openstack.sh
@@ -46,6 +46,7 @@
 cleanup_network wan_network
 cleanup_network mysite_vcpe-private
 cleanup_network mysite_vsg-access
+cleanup_network mysite_veg-access
 cleanup_network management
 cleanup_network management_hosts
 
@@ -65,5 +66,6 @@
 neutron net-delete management || true
 neutron net-delete management_hosts || true
 neutron net-delete mysite_vsg-access || true
+neutron net-delete mysite_veg-access || true
 neutron net-delete public || true
 neutron net-delete exampleservice_network || true