diff --git a/profile_manifests/mcord.yml b/profile_manifests/mcord.yml
index 8294e95..ae3043a 100644
--- a/profile_manifests/mcord.yml
+++ b/profile_manifests/mcord.yml
@@ -71,18 +71,18 @@
   - name: fabric
     path: orchestration/xos_services/fabric
     synchronizer: true
-#  - name: vbbu
-#    path: orchestration/xos_services/vbbu
-#    keypair: mcord_rsa
-#    synchronizer: true
-#  - name: vmme
-#    path: orchestration/xos_services/vmme
-#    keypair: mcord_rsa
-#    synchronizer: true
-#  - name: vsgw
-#    path: orchestration/xos_services/vsgw
-#    keypair: mcord_rsa
-#    synchronizer: true
+  - name: vbbu
+    path: orchestration/xos_services/vbbu
+    keypair: mcord_rsa
+    synchronizer: true
+  - name: vmme
+    path: orchestration/xos_services/vmme
+    keypair: mcord_rsa
+    synchronizer: true
+  - name: vsgw
+    path: orchestration/xos_services/vsgw
+    keypair: mcord_rsa
+    synchronizer: true
 #  - name: vpgwc
 #    path: orchestration/xos_services/vpgwc
 #    keypair: mcord_rsa
diff --git a/roles/cord-profile/templates/mcord-services.yaml.j2 b/roles/cord-profile/templates/mcord-services.yaml.j2
index ec623fb..4b59558 100644
--- a/roles/cord-profile/templates/mcord-services.yaml.j2
+++ b/roles/cord-profile/templates/mcord-services.yaml.j2
@@ -6,7 +6,9 @@
    - custom_types/xos.yaml
    - custom_types/vmme.yaml
    - custom_types/vbbu.yaml
-   - custom_types/vpgwc.yaml
+   - custom_types/vsgw.yaml
+#   - custom_types/vhss.yaml
+#   - custom_types/vpgwc.yaml
 
 topology_template:
   node_templates:
@@ -63,8 +65,14 @@
       properties:
           view_url: /admin/vbbu/vbbuservice/$id$/
 
-    service#vpgwc:
-      type: tosca.nodes.VPGWCService
+#    service#vpgwc:
+#      type: tosca.nodes.VPGWCService
+#      properties:
+#          view_url: /admin/vpgwc/vpgwcservice/$id$/
+#          kind: vEPC
+
+    service#vsgw:
+      type: tosca.nodes.VSGWService
       properties:
-          view_url: /admin/vpgwc/vpgwcservice/$id$/
+          view_url: /admin/vsgw/vsgwservice/$id$/
           kind: vEPC