diff --git a/openmetadata-docs/content/v1.0.x/connectors/database/bigquery/index.md b/openmetadata-docs/content/v1.0.x/connectors/database/bigquery/index.md
index 9191efac5c0..ab7a2dcc1a7 100644
--- a/openmetadata-docs/content/v1.0.x/connectors/database/bigquery/index.md
+++ b/openmetadata-docs/content/v1.0.x/connectors/database/bigquery/index.md
@@ -103,6 +103,13 @@ link="/connectors/database/bigquery/roles"
   / %}
 {% /tilesContainer %}
 
+{% note %}
+If you are using BigQuery and have sharded tables, you might want to consider using partitioned tables instead. Partitioned tables allow you to efficiently query data by date or other criteria, without having to manage multiple tables. Partitioned tables also have lower storage and query costs than sharded tables. 
+You can learn more about the benefits of partitioned tables [here](https://cloud.google.com/bigquery/docs/partitioned-tables#dt_partition_shard). 
+If you want to convert your existing sharded tables to partitioned tables, you can follow the steps in this [guide](https://cloud.google.com/bigquery/docs/creating-partitioned-tables#convert-date-sharded-tables).
+This will help you simplify your data management and optimize your performance in BigQuery.
+{% /note %}
+
 ## Metadata Ingestion
 
 {% stepsContainer %}
diff --git a/openmetadata-docs/content/v1.1.x/connectors/database/bigquery/index.md b/openmetadata-docs/content/v1.1.x/connectors/database/bigquery/index.md
index 6f9d19b342a..4455285fbf1 100644
--- a/openmetadata-docs/content/v1.1.x/connectors/database/bigquery/index.md
+++ b/openmetadata-docs/content/v1.1.x/connectors/database/bigquery/index.md
@@ -84,6 +84,13 @@ link="/connectors/database/bigquery/roles"
   / %}
 {% /tilesContainer %}
 
+{% note %}
+If you are using BigQuery and have sharded tables, you might want to consider using partitioned tables instead. Partitioned tables allow you to efficiently query data by date or other criteria, without having to manage multiple tables. Partitioned tables also have lower storage and query costs than sharded tables. 
+You can learn more about the benefits of partitioned tables [here](https://cloud.google.com/bigquery/docs/partitioned-tables#dt_partition_shard). 
+If you want to convert your existing sharded tables to partitioned tables, you can follow the steps in this [guide](https://cloud.google.com/bigquery/docs/creating-partitioned-tables#convert-date-sharded-tables).
+This will help you simplify your data management and optimize your performance in BigQuery.
+{% /note %}
+
 ## Metadata Ingestion
 
 {% partial
diff --git a/openmetadata-docs/content/v1.2.x-SNAPSHOT/connectors/database/bigquery/index.md b/openmetadata-docs/content/v1.2.x-SNAPSHOT/connectors/database/bigquery/index.md
index b8ba739e084..081cd6b78f7 100644
--- a/openmetadata-docs/content/v1.2.x-SNAPSHOT/connectors/database/bigquery/index.md
+++ b/openmetadata-docs/content/v1.2.x-SNAPSHOT/connectors/database/bigquery/index.md
@@ -84,6 +84,14 @@ link="/connectors/database/bigquery/roles"
   / %}
 {% /tilesContainer %}
 
+
+{% note %}
+If you are using BigQuery and have sharded tables, you might want to consider using partitioned tables instead. Partitioned tables allow you to efficiently query data by date or other criteria, without having to manage multiple tables. Partitioned tables also have lower storage and query costs than sharded tables. 
+You can learn more about the benefits of partitioned tables [here](https://cloud.google.com/bigquery/docs/partitioned-tables#dt_partition_shard). 
+If you want to convert your existing sharded tables to partitioned tables, you can follow the steps in this [guide](https://cloud.google.com/bigquery/docs/creating-partitioned-tables#convert-date-sharded-tables).
+This will help you simplify your data management and optimize your performance in BigQuery.
+{% /note %}
+
 ## Metadata Ingestion
 
 {% partial
@@ -143,6 +151,7 @@ If you want to use [ADC authentication](https://cloud.google.com/docs/authentica
 the GCP credentials empty. This is why they are not marked as required.
 {% /note %}
 
+
 {% partial file="/v1.2/connectors/database/advanced-configuration.md" /%}
 
 {% /extraContent %}