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