diff --git a/quickstart/101-cosmos-db-aad-rbac/main.tf b/quickstart/101-cosmos-db-aad-rbac/main.tf
index dea815c7..06bc93dc 100644
--- a/quickstart/101-cosmos-db-aad-rbac/main.tf
+++ b/quickstart/101-cosmos-db-aad-rbac/main.tf
@@ -1,7 +1,11 @@
 data "azurerm_client_config" "current" {}
 
+locals {
+  current_user_object_id = coalesce(var.msi_id, data.azurerm_client_config.current.object_id)
+}
+
 resource "azurerm_resource_group" "example" {
-  name     = var.resource_group_name
+  name     = "${random_pet.prefix.id}-rg"
   location = var.location
 }
 
@@ -81,6 +85,10 @@ resource "azurerm_cosmosdb_sql_role_assignment" "example" {
   resource_group_name = azurerm_resource_group.example.name
   account_name        = azurerm_cosmosdb_account.example.name
   role_definition_id  = azurerm_cosmosdb_sql_role_definition.example.id
-  principal_id        = data.azurerm_client_config.current.object_id
+  principal_id        = local.current_user_object_id
   scope               = "/subscriptions/${data.azurerm_client_config.current.subscription_id}/resourceGroups/${azurerm_resource_group.example.name}/providers/Microsoft.DocumentDB/databaseAccounts/${azurerm_cosmosdb_account.example.name}"
+}
+
+resource "random_pet" "prefix" {
+  prefix = var.name_prefix
 }
\ No newline at end of file
diff --git a/quickstart/101-cosmos-db-aad-rbac/providers.tf b/quickstart/101-cosmos-db-aad-rbac/providers.tf
index 47306772..e008ccca 100644
--- a/quickstart/101-cosmos-db-aad-rbac/providers.tf
+++ b/quickstart/101-cosmos-db-aad-rbac/providers.tf
@@ -1,8 +1,14 @@
 terraform {
+  required_version = ">= 1.0"
+
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = ">=3.0.0"
+      version = ">=3.0, < 4.0"
+    }
+    random = {
+      source  = "hashicorp/random"
+      version = ">= 3.0"
     }
   }
 }
diff --git a/quickstart/101-cosmos-db-aad-rbac/variables.tf b/quickstart/101-cosmos-db-aad-rbac/variables.tf
index 5a11979f..7bf21f8c 100644
--- a/quickstart/101-cosmos-db-aad-rbac/variables.tf
+++ b/quickstart/101-cosmos-db-aad-rbac/variables.tf
@@ -1,30 +1,43 @@
-variable "resource_group_name" {
+variable "name_prefix" {
   type        = string
-  description = "Resource group name"
+  default     = "101-cosmos-db-aad-rbac"
+  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 "msi_id" {
+  type        = string
+  default     = null
+  description = "If you're executing the test with user assigned identity, please pass the identity principal id to this variable."
+}
+
+
 variable "throughput" {
   type        = number
+  default     = 400
   description = "Cosmos db database throughput"
   validation {
     condition     = var.throughput >= 400 && var.throughput <= 1000000
@@ -38,5 +51,6 @@ variable "throughput" {
 
 variable "sql_container_name" {
   type        = string
+  default     = "default-sql-container-name"
   description = "SQL API container name."
 }