diff --git a/quickstart/101-cosmos-db-analyticalstore/main.tf b/quickstart/101-cosmos-db-analyticalstore/main.tf
index ebd6dc5b..82701870 100644
--- a/quickstart/101-cosmos-db-analyticalstore/main.tf
+++ b/quickstart/101-cosmos-db-analyticalstore/main.tf
@@ -1,5 +1,5 @@
 resource "azurerm_resource_group" "example" {
-  name     = var.resource_group_name
+  name     = "${random_pet.random_prefix.id}-rg"
   location = var.location
 }
 
@@ -34,7 +34,7 @@ resource "azurerm_cosmosdb_sql_database" "example" {
   throughput          = var.throughput
 }
 
-resource "azurerm_cosmosdb_sql_container" "example" {
+resource "azurerm_cosmosdb_sql_container" "main" {
   name                   = var.sql_container_name
   resource_group_name    = azurerm_resource_group.example.name
   account_name           = azurerm_cosmosdb_account.example.name
@@ -64,3 +64,7 @@ resource "azurerm_cosmosdb_sql_container" "example" {
     paths = ["/definition/idlong", "/definition/idshort"]
   }
 }
+
+resource "random_pet" "random_prefix" {
+  prefix = var.name_prefix
+}
\ No newline at end of file
diff --git a/quickstart/101-cosmos-db-analyticalstore/providers.tf b/quickstart/101-cosmos-db-analyticalstore/providers.tf
index 47306772..843e9af0 100644
--- a/quickstart/101-cosmos-db-analyticalstore/providers.tf
+++ b/quickstart/101-cosmos-db-analyticalstore/providers.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = ">=3.0.0"
+      version = ">=3.0, < 4.0"
     }
   }
 }
diff --git a/quickstart/101-cosmos-db-analyticalstore/variables.tf b/quickstart/101-cosmos-db-analyticalstore/variables.tf
index 2f6392be..54a1b0dc 100644
--- a/quickstart/101-cosmos-db-analyticalstore/variables.tf
+++ b/quickstart/101-cosmos-db-analyticalstore/variables.tf
@@ -1,30 +1,36 @@
-variable "resource_group_name" {
+variable "name_prefix" {
   type        = string
-  description = "Resource group name"
+  default     = "101-cosmos-db-analyticalstore"
+  description = "Prefix for resource group name"
 }
 
 variable "location" {
   type        = string
+  default     = "westus"
   description = "Resource group location"
 }
 
 variable "cosmosdb_account_name" {
   type        = string
+  default     = "default-account-name"
   description = "Cosmos db account name"
 }
 
 variable "cosmosdb_account_location" {
   type        = string
+  default     = "westus"
   description = "Cosmos db account location"
 }
 
 variable "cosmosdb_sqldb_name" {
   type        = string
+  default     = "default-sqldb-name"
   description = "value"
 }
 
 variable "throughput" {
   type        = number
+  default     = 400
   description = "Cosmos db database throughput"
   validation {
     condition     = var.throughput >= 400 && var.throughput <= 1000000
@@ -38,10 +44,12 @@ variable "throughput" {
 
 variable "sql_container_name" {
   type        = string
+  default     = "default-sql-container-name"
   description = "SQL API container name."
 }
 
 variable "analytical_storage_ttl" {
   type        = number
+  default     = 0
   description = "Analytical Storage TTL in seconds."
 }
\ No newline at end of file