diff --git a/mcord/Makefile b/mcord/Makefile
index 3d54b62..18bb90a 100644
--- a/mcord/Makefile
+++ b/mcord/Makefile
@@ -23,12 +23,15 @@
 	sudo cp id_rsa.pub key_import/vBBU_rsa.pub
 	sudo cp id_rsa key_import/vPGWC_rsa
 	sudo cp id_rsa.pub key_import/vPGWC_rsa.pub
+	sudo cp id_rsa key_import/vSGW_rsa
+	sudo cp id_rsa.pub key_import/vSGW_rsa.pub
 	sudo cp id_rsa key_import/onos_rsa
 	sudo cp id_rsa key_import/onos_rsa.pub
 	$(RUN_TOSCA_BOOTSTRAP) $(LIBRARY_DIR)/ng-xos-lib/ng-xos-lib-onboard.yaml
 	$(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/openstack/xos/openstack-onboard.yaml
 	$(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/vBBU/xos/vBBU-onboard.yaml
 	$(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/vPGWC/xos/vPGWC-onboard.yaml
+	$(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/vSGW/xos/vSGW-onboard.yaml
 	$(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/vtn/xos/vtn-onboard.yaml
 	$(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/onos-service/xos/onos-onboard.yaml
 	# $(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/fabric/xos/\fabric-onboard.yaml
@@ -37,6 +40,7 @@
 	bash $(COMMON_DIR)/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) services/ng-xos-lib
 	bash $(COMMON_DIR)/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) services/vbbu
 	bash $(COMMON_DIR)/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) services/vpgwc
+	bash $(COMMON_DIR)/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) services/vsgw
 	bash $(COMMON_DIR)/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) services/vtn
 	bash $(COMMON_DIR)/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) services/onos
 	# bash $(COMMON_DIR)/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) services/fabric
diff --git a/mcord/mcord.yaml b/mcord/mcord.yaml
index d561242..0e0b8d4 100644
--- a/mcord/mcord.yaml
+++ b/mcord/mcord.yaml
@@ -112,6 +112,25 @@
                 default: New vPGWc Component 
                 description: Just a message 
 
+    tosca.nodes.VSGWTenant:
+        derived_from: tosca.nodes.Root
+        description: >
+            A Tenant of the VSGW Service
+        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
+                default: New vSGW Tenant
+                description: Just a message
+
 topology_template:
   node_templates:
     vBBU:
@@ -138,6 +157,18 @@
       artifacts:
           pubkey: /opt/xos/services/vpgwc/keys/vPGWC_rsa.pub
 
+    vSGW:
+      type: tosca.nodes.MCORDService
+      requirements:
+      properties:
+          kind: vEPC
+          icon_url: /static/mCordServices/service_server.png
+          view_url: /admin/vsgw/vsgwtenant
+          public_key: { get_artifact: [ SELF, pubkey, LOCAL_FILE] }
+          private_key_fn: /opt/xos/services/vsgw/keys/vSGW_rsa
+      artifacts:
+          pubkey: /opt/xos/services/vsgw/keys/vSGW_rsa.pub
+
     m1.xlarge:
       type: tosca.nodes.Flavor
 
@@ -317,6 +348,29 @@
               relationship: tosca.relationships.ConnectsToNetwork
       properties:
           network: noauto
+
+    mysite_vsgw_slice1:
+      description: vSGW Service Slice 1
+      type: tosca.nodes.Slice
+      requirements:
+          - vSGW:
+              node: vSGW
+              relationship: tosca.relationships.MemberOfService
+          - site:
+              node: mysite
+              relationship: tosca.relationships.MemberOfSite
+          - default_image:
+                node: trusty-server-multi-nic
+                relationship: tosca.relationships.DefaultImage
+          - default_flavor:
+                node: m1.xlarge
+                relationship: tosca.relationships.DefaultFlavor
+          - management:
+              node: management
+              relationship: tosca.relationships.ConnectsToNetwork
+      properties:
+          network: noauto
+
 #default_node: compute10
 
 #    mysite_VPGWC_Component: