diff --git a/Makefile b/Makefile
index ccd8225e..b166dd7b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 BIN_NAME=terraform-provider-instaclustr
 
-VERSION=2.0.152
+VERSION=2.0.153
 
 FULL_BIN_NAME="${BIN_NAME}_v${VERSION}"
 SHASUM_NAME="${BIN_NAME}_${VERSION}_SHA256SUMS"
diff --git a/docs/data-sources/clickhouse_cluster_v2_instance.md b/docs/data-sources/clickhouse_cluster_v2_instance.md
index e20cbb39..5d5938ba 100644
--- a/docs/data-sources/clickhouse_cluster_v2_instance.md
+++ b/docs/data-sources/clickhouse_cluster_v2_instance.md
@@ -33,7 +33,7 @@ The following terms are used to describe attributes in the schema of this data s
 <br>Status of the cluster.<br><br>
 *___clickhouse_version___*<br>
 <ins>Type</ins>: string, read-only<br>
-<ins>Constraints</ins>: pattern: `[0-9]+\.[0-9]+\.[0-9]+`<br><br>Version of ClickHouse to run on the cluster. Available versions: <ul> <li>`23.8.14`</li> </ul><br><br>
+<ins>Constraints</ins>: pattern: `[0-9]+\.[0-9]+\.[0-9]+`<br><br>Version of ClickHouse to run on the cluster. Available versions: <ul> <li>`23.8.16`</li> <li>`24.8.2`</li> </ul><br><br>
 *___id___*<br>
 <ins>Type</ins>: string, read-only<br>
 <br>ID of the cluster.<br><br>
@@ -181,7 +181,7 @@ Defines information about the S3 bucket to be used for remote storage.<br>
 ### Read-only attributes
 *___prefix___*<br>
 <ins>Type</ins>: string, read-only<br>
-<br>S3 prefix to use when storing data in the S3 bucket. The default prefix format is `<cluster_id>-data/`<br><br>
+<ins>Constraints</ins>: pattern: `^[a-zA-Z\d\-_]{1,100}$`<br><br>By default data in the S3 bucket will be stored in a folder named after the cluster's ID. If a prefix is provided, data will be stored in `<prefix>/<cluster_id>` instead<br><br>
 *___s3_bucket_name___*<br>
 <ins>Type</ins>: string, read-only<br>
 <br>S3 bucket name for ClickHouse remote storage<br><br>
diff --git a/docs/data-sources/postgresql_cluster_v2_instance.md b/docs/data-sources/postgresql_cluster_v2_instance.md
index 99be7f8e..621b96c7 100644
--- a/docs/data-sources/postgresql_cluster_v2_instance.md
+++ b/docs/data-sources/postgresql_cluster_v2_instance.md
@@ -48,7 +48,7 @@ The following terms are used to describe attributes in the schema of this data s
 <ins>Constraints</ins>: pattern: `[a-zA-Z0-9][a-zA-Z0-9_-]*`<br><br>Name of the cluster.<br><br>
 *___postgresql_version___*<br>
 <ins>Type</ins>: string, read-only<br>
-<ins>Constraints</ins>: pattern: `[0-9]+\.[0-9]+\.[0-9]+`<br><br>Version of Postgresql to run on the cluster. Available versions: <ul> <li>`15.7.0`</li> <li>`16.3.0`</li> <li>`14.12.0`</li> </ul><br><br>
+<ins>Constraints</ins>: pattern: `[0-9]+\.[0-9]+\.[0-9]+`<br><br>Version of Postgresql to run on the cluster. Available versions: <ul> <li>`15.8.0`</li> <li>`16.4.0`</li> <li>`14.13.0`</li> </ul><br><br>
 *___resize_settings___*<br>
 <ins>Type</ins>: nested block, read-only, see [resize_settings](#nested--resize_settings) for nested schema<br>
 <br>Settings to determine how resize requests will be performed for the cluster.<br><br>
@@ -244,7 +244,7 @@ List of non-deleted nodes in the data centre<br>
 <ins>Constraints</ins>: allowed values: [ `TRANSACTION`, `SESSION`, `STATEMENT` ]<br><br>Creates PgBouncer with the selected mode, see [PgBouncer pool modes] (https://www.instaclustr.com/support/documentation/postgresql-add-ons/using-pgbouncer/)<br><br>
 *___pg_bouncer_version___*<br>
 <ins>Type</ins>: string, read-only<br>
-<ins>Constraints</ins>: pattern: `[0-9]+\.[0-9]+\.[0-9]+`<br><br>Version of Pg Bouncer to run on the cluster. Available versions: <ul> <li>`1.22.0`</li> <li>`1.22.1`</li> </ul><br><br>
+<ins>Constraints</ins>: pattern: `[0-9]+\.[0-9]+\.[0-9]+`<br><br>Version of Pg Bouncer to run on the cluster. Available versions: <ul> <li>`1.23.1`</li> </ul><br><br>
 <a id="nested--resize_settings"></a>
 ## Nested schema for `resize_settings`
 Settings to determine how resize requests will be performed for the cluster.<br>
diff --git a/docs/resources/clickhouse_cluster_v2.md b/docs/resources/clickhouse_cluster_v2.md
index ec8ee3f9..836a93de 100644
--- a/docs/resources/clickhouse_cluster_v2.md
+++ b/docs/resources/clickhouse_cluster_v2.md
@@ -56,7 +56,7 @@ The following terms are used to describe attributes in the schema of this resour
 <ins>Constraints</ins>: allowed values: [ `PRODUCTION`, `NON_PRODUCTION` ]<br><br>SLA Tier of the cluster. Non-production clusters may receive lower priority support and reduced SLAs. Production tier is not available when using Developer class nodes. See [SLA Tier](https://www.instaclustr.com/support/documentation/useful-information/sla-tier/) for more information.<br><br>
 *___clickhouse_version___*<br>
 <ins>Type</ins>: string, required, immutable<br>
-<ins>Constraints</ins>: pattern: `[0-9]+\.[0-9]+\.[0-9]+`<br><br>Version of ClickHouse to run on the cluster. Available versions: <ul> <li>`23.8.14`</li> </ul><br><br>
+<ins>Constraints</ins>: pattern: `[0-9]+\.[0-9]+\.[0-9]+`<br><br>Version of ClickHouse to run on the cluster. Available versions: <ul> <li>`23.8.16`</li> <li>`24.8.2`</li> </ul><br><br>
 *___name___*<br>
 <ins>Type</ins>: string, required, immutable<br>
 <ins>Constraints</ins>: pattern: `[a-zA-Z0-9][a-zA-Z0-9_-]*`<br><br>Name of the cluster.<br><br>
@@ -218,7 +218,7 @@ Defines information about the S3 bucket to be used for remote storage.<br>
 ### Input attributes - Optional
 *___prefix___*<br>
 <ins>Type</ins>: string, optional, immutable<br>
-<br>S3 prefix to use when storing data in the S3 bucket. The default prefix format is `<cluster_id>-data/`<br><br>
+<ins>Constraints</ins>: pattern: `^[a-zA-Z\d\-_]{1,100}$`<br><br>By default data in the S3 bucket will be stored in a folder named after the cluster's ID. If a prefix is provided, data will be stored in `<prefix>/<cluster_id>` instead<br><br>
 <a id="nested--tiered_storage"></a>
 ## Nested schema for `tiered_storage`
 Enable Tiered Storage for ClickHouse<br>
diff --git a/docs/resources/postgresql_cluster_v2.md b/docs/resources/postgresql_cluster_v2.md
index 335cfe7d..bceacca3 100644
--- a/docs/resources/postgresql_cluster_v2.md
+++ b/docs/resources/postgresql_cluster_v2.md
@@ -55,7 +55,7 @@ The following terms are used to describe attributes in the schema of this resour
 <ins>Constraints</ins>: pattern: `[a-zA-Z0-9][a-zA-Z0-9_-]*`<br><br>Name of the cluster.<br><br>
 *___postgresql_version___*<br>
 <ins>Type</ins>: string, required, immutable<br>
-<ins>Constraints</ins>: pattern: `[0-9]+\.[0-9]+\.[0-9]+`<br><br>Version of Postgresql to run on the cluster. Available versions: <ul> <li>`15.7.0`</li> <li>`16.3.0`</li> <li>`14.12.0`</li> </ul><br><br>
+<ins>Constraints</ins>: pattern: `[0-9]+\.[0-9]+\.[0-9]+`<br><br>Version of Postgresql to run on the cluster. Available versions: <ul> <li>`15.8.0`</li> <li>`16.4.0`</li> <li>`14.13.0`</li> </ul><br><br>
 *___private_network_cluster___*<br>
 <ins>Type</ins>: boolean, required, immutable<br>
 <br>Creates the cluster with private network only, see [Private Network Clusters](https://www.instaclustr.com/support/documentation/useful-information/private-network-clusters/).<br><br>
@@ -270,7 +270,7 @@ List of non-deleted nodes in the data centre<br>
 <ins>Constraints</ins>: allowed values: [ `TRANSACTION`, `SESSION`, `STATEMENT` ]<br><br>Creates PgBouncer with the selected mode, see [PgBouncer pool modes] (https://www.instaclustr.com/support/documentation/postgresql-add-ons/using-pgbouncer/)<br><br>
 *___pg_bouncer_version___*<br>
 <ins>Type</ins>: string, required, immutable<br>
-<ins>Constraints</ins>: pattern: `[0-9]+\.[0-9]+\.[0-9]+`<br><br>Version of Pg Bouncer to run on the cluster. Available versions: <ul> <li>`1.22.0`</li> <li>`1.22.1`</li> </ul><br><br>
+<ins>Constraints</ins>: pattern: `[0-9]+\.[0-9]+\.[0-9]+`<br><br>Version of Pg Bouncer to run on the cluster. Available versions: <ul> <li>`1.23.1`</li> </ul><br><br>
 <a id="nested--resize_settings"></a>
 ## Nested schema for `resize_settings`
 Settings to determine how resize requests will be performed for the cluster.<br>