diff --git a/xos/tosca/custom_types/vbbu.m4 b/xos/tosca/custom_types/vbbu.m4
index 8d6dd7a..9e455aa 100644
--- a/xos/tosca/custom_types/vbbu.m4
+++ b/xos/tosca/custom_types/vbbu.m4
@@ -15,4 +15,17 @@
         properties:
             xos_base_props
             xos_base_service_props
+            service_message:
+                type: string
+                required: false
+            
+    tosca.nodes.VBBUTenant:
+        derived_from: tosca.nodes.Root
+        description: >
+            VBBU Tenant
+        properties:
+            xos_base_tenant_props
+            tenant_message:
+                type: string
+                required: false
 
diff --git a/xos/tosca/custom_types/vbbu.yaml b/xos/tosca/custom_types/vbbu.yaml
index de1a3bb..7dc507d 100644
--- a/xos/tosca/custom_types/vbbu.yaml
+++ b/xos/tosca/custom_types/vbbu.yaml
@@ -78,4 +78,24 @@
                 type: string
                 required: false
                 description: Version number of Service.
+            service_message:
+                type: string
+                required: false
+            
+    tosca.nodes.VBBUTenant:
+        derived_from: tosca.nodes.Root
+        description: >
+            VBBU Tenant
+        properties:
+            kind:
+                type: string
+                default: generic
+                description: Kind of tenant
+            service_specific_id:
+                type: string
+                required: false
+                description: Service specific ID opaque to XOS but meaningful to service
+            tenant_message:
+                type: string
+                required: false