diff --git a/xos-profiles/comac/Chart.yaml b/xos-profiles/comac/Chart.yaml
index 251b056..ccbab52 100644
--- a/xos-profiles/comac/Chart.yaml
+++ b/xos-profiles/comac/Chart.yaml
@@ -17,7 +17,7 @@
 name: comac
 description: A Helm chart for the "COMAC" profile
 icon: https://guide.opencord.org/logos/cord.svg
-version: 0.0.7
+version: 0.0.8
 
 # xosproject/tosca-loader version
 appVersion: 1.3.1
diff --git a/xos-profiles/comac/templates/_tosca.tpl b/xos-profiles/comac/templates/_tosca.tpl
index 35cc204..792f152 100644
--- a/xos-profiles/comac/templates/_tosca.tpl
+++ b/xos-profiles/comac/templates/_tosca.tpl
@@ -302,10 +302,14 @@
 {{- define "comac.serviceGraphTosca" -}}
 tosca_definitions_version: tosca_simple_yaml_1_0
 imports:
+{{- if .Values.fabric.enabled }}
   - custom_types/fabricservice.yaml
+{{- end }}
   - custom_types/mcordsubscriberservice.yaml
   - custom_types/onosservice.yaml
+{{- if .Values.vrouter.enabled }}
   - custom_types/vrouterservice.yaml
+{{- end }}
 {{- if .Values.progran.enabled }}
   - custom_types/progranservice.yaml
 {{- end }}
@@ -328,17 +332,20 @@
         name: onos
         must-exist: true
 
+{{ if .Values.fabric.enabled }}
     service#fabric:
       type: tosca.nodes.FabricService
       properties:
         name: fabric
         must-exist: true
-
+{{ end }}
+{{ if .Values.vrouter.enabled }}
     service#vrouter:
       type: tosca.nodes.VRouterService
       properties:
         name: vrouter
         must-exist: true
+{{ end }}
 
     service#mcord:
       type: tosca.nodes.MCordSubscriberService
@@ -402,6 +409,7 @@
       properties:
         name: cdn-remote
 
+{{ if .Values.fabric.enabled }}
     service_dependency#onos-fabric_fabric:
       type: tosca.nodes.ServiceDependency
       properties:
@@ -414,6 +422,7 @@
             node: service#onos
             relationship: tosca.relationships.BelongsToOne
 
+{{ if .Values.vrouter.enabled }}
     service_dependency#vrouter_fabric:
       type: tosca.nodes.ServiceDependency
       properties:
@@ -425,6 +434,8 @@
         - provider_service:
             node: service#fabric
             relationship: tosca.relationships.BelongsToOne
+{{ end }}
+{{ end }}
 
 {{- if .Values.residentialService.enabled }}
     service_dependency#rcord_volt: