diff --git a/dataplex-quickstart-labs/00-resources/scripts/airflow/chicago-crimes-analytics/bq_lineage_pipeline.py b/dataplex-quickstart-labs/00-resources/scripts/airflow/chicago-crimes-analytics/bq_lineage_pipeline.py
index 2e310a99..9549664a 100644
--- a/dataplex-quickstart-labs/00-resources/scripts/airflow/chicago-crimes-analytics/bq_lineage_pipeline.py
+++ b/dataplex-quickstart-labs/00-resources/scripts/airflow/chicago-crimes-analytics/bq_lineage_pipeline.py
@@ -21,7 +21,7 @@
   EXTRACT(DAYOFWEEK FROM date) AS case_day_of_week_nbr,
   FORMAT_DATE('%A',date) AS case_day_of_week_name
 FROM
-  oda_raw_zone.crimes_raw;
+  oda_raw_zone.chicago_crimes_raw;
 """
 
 TREND_BY_YEAR = f"""
@@ -140,4 +140,4 @@
         }
     )
   
-start >> curate_chicago_crimes >> [trend_by_year, trend_by_month, trend_by_day, trend_by_hour] >> end
\ No newline at end of file
+start >> curate_chicago_crimes >> [trend_by_year, trend_by_month, trend_by_day, trend_by_hour] >> end
diff --git a/dataplex-quickstart-labs/00-resources/terraform/main.tf b/dataplex-quickstart-labs/00-resources/terraform/main.tf
index 9813da2a..b47d412d 100644
--- a/dataplex-quickstart-labs/00-resources/terraform/main.tf
+++ b/dataplex-quickstart-labs/00-resources/terraform/main.tf
@@ -726,12 +726,21 @@ resource "google_dataproc_metastore_service" "datalake_metastore" {
     module.administrator_role_grants,
     time_sleep.sleep_after_network_and_storage_steps
   ]
+
+  timeouts {
+    create = "75m"
+  }
 }
 
 /******************************************
 12. Cloud Composer
 ******************************************/
 
+provider "google-beta" {
+  project = local.project_id
+  region  = local.location
+}
+
 resource "google_composer_environment" "create_cloud_composer_env" {
   name   = "oda-${local.project_nbr}-cc2"
   region = local.location