diff --git a/xos/tosca/custom_types/macros.m4 b/xos/tosca/custom_types/macros.m4
new file mode 100644
index 0000000..78ef38c
--- /dev/null
+++ b/xos/tosca/custom_types/macros.m4
@@ -0,0 +1,83 @@
+# Note: Tosca derived_from isn't working the way I think it should, it's not
+#    inheriting from the parent template. Until we get that figured out, use
+#    m4 macros do our inheritance
+
+define(xos_base_props,
+            no-delete:
+                type: boolean
+                default: false
+                description: Do not allow Tosca to delete this object
+            no-create:
+                type: boolean
+                default: false
+                description: Do not allow Tosca to create this object
+            no-update:
+                type: boolean
+                default: false
+                description: Do not allow Tosca to update this object
+            replaces:
+                type: string
+                required: false
+                descrption: Replaces/renames this object)
+# Service
+define(xos_base_service_caps,
+            scalable:
+                type: tosca.capabilities.Scalable
+            service:
+                type: tosca.capabilities.xos.Service)
+define(xos_base_service_props,
+            kind:
+                type: string
+                default: generic
+                description: Type of service.
+            view_url:
+                type: string
+                required: false
+                description: URL to follow when icon is clicked in the Service Directory.
+            icon_url:
+                type: string
+                required: false
+                description: ICON to display in the Service Directory.
+            enabled:
+                type: boolean
+                default: true
+            published:
+                type: boolean
+                default: true
+                description: If True then display this Service in the Service Directory.
+            public_key:
+                type: string
+                required: false
+                description: Public key to install into Instances to allows Services to SSH into them.
+            private_key_fn:
+                type: string
+                required: false
+                description: Location of private key file
+            versionNumber:
+                type: string
+                required: false
+                description: Version number of Service.)
+# Subscriber
+define(xos_base_subscriber_caps,
+            subscriber:
+                type: tosca.capabilities.xos.Subscriber)
+define(xos_base_subscriber_props,
+            kind:
+                type: string
+                default: generic
+                description: Kind of subscriber
+            service_specific_id:
+                type: string
+                required: false
+                description: Service specific ID opaque to XOS but meaningful to service)
+define(xos_base_tenant_props,
+            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)
+
+# end m4 macros
\ No newline at end of file
diff --git a/xos/tosca/custom_types/vpgwu.m4 b/xos/tosca/custom_types/vpgwu.m4
new file mode 100644
index 0000000..b94b377
--- /dev/null
+++ b/xos/tosca/custom_types/vpgwu.m4
@@ -0,0 +1,33 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+# compile this with "m4 vpgwu.m4 > vpgwu.yaml"
+
+# include macros
+include(macros.m4)
+
+node_types:
+    tosca.nodes.VPGWUService:
+        derived_from: tosca.nodes.Root
+        description: >
+            CORD - The vPGWU Service
+        capabilities:
+            xos_base_service_caps
+        properties:
+            xos_base_props
+            xos_base_service_props
+
+    tosca.nodes.VPGWUTenant:
+        derived_from: tosca.nodes.Root
+        description: >
+            CORD - The vPGWU Tenant
+        properties:
+            xos_base_tenant_props
+            display_message:
+                type: string
+                required: false
+            s5s8_pgw_tag:
+                type: string
+                required: false
+            image_name:
+                type: string
+                required: false
diff --git a/xos/tosca/custom_types/vpgwu.yaml b/xos/tosca/custom_types/vpgwu.yaml
new file mode 100644
index 0000000..af366e8
--- /dev/null
+++ b/xos/tosca/custom_types/vpgwu.yaml
@@ -0,0 +1,101 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+# compile this with "m4 vpgwu.m4 > vpgwu.yaml"
+
+# include macros
+# Note: Tosca derived_from isn't working the way I think it should, it's not
+#    inheriting from the parent template. Until we get that figured out, use
+#    m4 macros do our inheritance
+
+
+# Service
+
+
+# Subscriber
+
+
+
+
+# end m4 macros
+
+node_types:
+    tosca.nodes.VPGWUService:
+        derived_from: tosca.nodes.Root
+        description: >
+            CORD - The vPGWU Service
+        capabilities:
+            scalable:
+                type: tosca.capabilities.Scalable
+            service:
+                type: tosca.capabilities.xos.Service
+        properties:
+            no-delete:
+                type: boolean
+                default: false
+                description: Do not allow Tosca to delete this object
+            no-create:
+                type: boolean
+                default: false
+                description: Do not allow Tosca to create this object
+            no-update:
+                type: boolean
+                default: false
+                description: Do not allow Tosca to update this object
+            replaces:
+                type: string
+                required: false
+                descrption: Replaces/renames this object
+            kind:
+                type: string
+                default: generic
+                description: Type of service.
+            view_url:
+                type: string
+                required: false
+                description: URL to follow when icon is clicked in the Service Directory.
+            icon_url:
+                type: string
+                required: false
+                description: ICON to display in the Service Directory.
+            enabled:
+                type: boolean
+                default: true
+            published:
+                type: boolean
+                default: true
+                description: If True then display this Service in the Service Directory.
+            public_key:
+                type: string
+                required: false
+                description: Public key to install into Instances to allows Services to SSH into them.
+            private_key_fn:
+                type: string
+                required: false
+                description: Location of private key file
+            versionNumber:
+                type: string
+                required: false
+                description: Version number of Service.
+
+    tosca.nodes.VPGWUTenant:
+        derived_from: tosca.nodes.Root
+        description: >
+            CORD - The vPGWU 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
+            display_message:
+                type: string
+                required: false
+            s5s8_pgw_tag:
+                type: string
+                required: false
+            image_name:
+                type: string
+                required: false
diff --git a/xos/tosca/resources/vpgwuservice.py b/xos/tosca/resources/vpgwuservice.py
new file mode 100644
index 0000000..fbfad88
--- /dev/null
+++ b/xos/tosca/resources/vpgwuservice.py
@@ -0,0 +1,7 @@
+from service import XOSService
+from services.vpgwu.models import VPGWUService
+
+class XOSVPGWUService(XOSService):
+    provides = "tosca.nodes.VPGWUService"
+    xos_model = VPGWUService
+    copyin_props = ["view_url", "icon_url", "enabled", "published", "public_key", "private_key_fn", "versionNumber"]
\ No newline at end of file
diff --git a/xos/tosca/resources/vpgwutenant.py b/xos/tosca/resources/vpgwutenant.py
new file mode 100644
index 0000000..06cbd42
--- /dev/null
+++ b/xos/tosca/resources/vpgwutenant.py
@@ -0,0 +1,31 @@
+from xosresource import XOSResource
+from core.models import Tenant, Service
+from services.vpgwu.models import VPGWUTenant
+
+class XOSVPGWUTenant(XOSResource):
+    provides = "tosca.nodes.VPGWUTenant"
+    xos_model = VPGWUTenant
+    name_field = None
+    copyin_props = ["s5s8_pgw_tag", "display_message", "image_name"]
+
+    def get_xos_args(self, throw_exception=True):
+        args = super(XOSVPGWUTenant, self).get_xos_args()
+
+        provider_name = self.get_requirement("tosca.relationships.TenantOfService", throw_exception=True)
+        if provider_name:
+            args["provider_service"] = self.get_xos_object(Service, throw_exception=True, name=provider_name)
+
+        return args
+
+    def get_existing_objs(self):
+        args = self.get_xos_args(throw_exception=False)
+        provider_service = args.get("provider", None)
+        if provider_service:
+            return [self.get_xos_object(provider_service=provider_service)]
+        return []
+
+    def postprocess(self, obj):
+        pass
+
+    def can_delete(self, obj):
+        return super(XOSVPGWUTenant, self).can_delete(obj)