diff --git a/infrastructure/cloudshell/terraform-template.tfvars b/infrastructure/cloudshell/terraform-template.tfvars
index c38764da..f08e5ebc 100644
--- a/infrastructure/cloudshell/terraform-template.tfvars
+++ b/infrastructure/cloudshell/terraform-template.tfvars
@@ -27,6 +27,7 @@ deploy_monitoring    = true
 
 data_project_id              = "${MAJ_MDS_PROJECT_ID}"
 destination_data_location    = "${MAJ_MDS_DATA_LOCATION}"
+property_id                  = "${MAJ_GA4_PROPERTY_ID}"
 data_processing_project_id   = "${MAJ_MDS_DATAFORM_PROJECT_ID}"
 source_ga4_export_project_id = "${MAJ_GA4_EXPORT_PROJECT_ID}"
 source_ga4_export_dataset    = "${MAJ_GA4_EXPORT_DATASET}"
diff --git a/python/ga4_setup/setup.py b/python/ga4_setup/setup.py
index 03204812..658f1650 100644
--- a/python/ga4_setup/setup.py
+++ b/python/ga4_setup/setup.py
@@ -513,9 +513,14 @@ def entry():
 
   if args.ga4_resource == "check_property_type":
     property = get_property(configuration)
-    result = {
-      'supported': f"{property.property_type == property.property_type.PROPERTY_TYPE_ORDINARY}"
-    }
+    is_property_supported = set((property.property_type.PROPERTY_TYPE_ORDINARY, property.property_type.PROPERTY_TYPE_SUBPROPERTY, property.property_type.PROPERTY_TYPE_ROLLUP))
+    
+    result = {}
+    if property.property_type in is_property_supported:
+      result = {'supported': "True"}
+    else:
+      result = {'supported': "False"}
+
     print(json.dumps(result))
 
   # python setup.py --ga4_resource=custom_events