diff --git a/quickstart/101-attestation-provider/providers.tf b/quickstart/101-attestation-provider/providers.tf
index 6bd52554..04123ebc 100644
--- a/quickstart/101-attestation-provider/providers.tf
+++ b/quickstart/101-attestation-provider/providers.tf
@@ -12,3 +12,8 @@ terraform {
 provider "azurerm" {
   features {}
 }
+
+random = {
+  source = "hashicorp/random"
+  version = "~>3.0"
+}
diff --git a/quickstart/101-resource-group/providers.tf b/quickstart/101-resource-group/providers.tf
index 6bd52554..04123ebc 100644
--- a/quickstart/101-resource-group/providers.tf
+++ b/quickstart/101-resource-group/providers.tf
@@ -12,3 +12,8 @@ terraform {
 provider "azurerm" {
   features {}
 }
+
+random = {
+  source = "hashicorp/random"
+  version = "~>3.0"
+}
diff --git a/quickstart/201-k8s-cluster-with-tf-and-aks/outputs.tf b/quickstart/201-k8s-cluster-with-tf-and-aks/outputs.tf
index 52632b91..478852b0 100644
--- a/quickstart/201-k8s-cluster-with-tf-and-aks/outputs.tf
+++ b/quickstart/201-k8s-cluster-with-tf-and-aks/outputs.tf
@@ -3,27 +3,27 @@ output "resource_group_name" {
 }
 
 output "client_key" {
-  value     = azurerm_kubernetes_cluster.k8s.kube_config.0.client_key
+  value     = azurerm_kubernetes_cluster.k8s.kube_config[0].client_key
   sensitive = true
 }
 
 output "client_certificate" {
-  value     = azurerm_kubernetes_cluster.k8s.kube_config.0.client_certificate
+  value     = azurerm_kubernetes_cluster.k8s.kube_config[0].client_certificate
   sensitive = true
 }
 
 output "cluster_ca_certificate" {
-  value     = azurerm_kubernetes_cluster.k8s.kube_config.0.cluster_ca_certificate
+  value     = azurerm_kubernetes_cluster.k8s.kube_config[0].cluster_ca_certificate
   sensitive = true
 }
 
 output "cluster_username" {
-  value     = azurerm_kubernetes_cluster.k8s.kube_config.0.username
+  value     = azurerm_kubernetes_cluster.k8s.kube_config[0].username
   sensitive = true
 }
 
 output "cluster_password" {
-  value     = azurerm_kubernetes_cluster.k8s.kube_config.0.password
+  value     = azurerm_kubernetes_cluster.k8s.kube_config[0].password
   sensitive = true
 }
 
diff --git a/quickstart/201-k8s-cluster-with-tf-and-aks/providers.tf b/quickstart/201-k8s-cluster-with-tf-and-aks/providers.tf
index cbe3e719..965241cd 100644
--- a/quickstart/201-k8s-cluster-with-tf-and-aks/providers.tf
+++ b/quickstart/201-k8s-cluster-with-tf-and-aks/providers.tf
@@ -12,3 +12,8 @@ terraform {
 provider "azurerm" {
   features {}
 }
+
+random = {
+  source = "hashicorp/random"
+  version = "~>3.0"
+}
diff --git a/quickstart/201-mysql-fs-db/main.tf b/quickstart/201-mysql-fs-db/main.tf
index 9ebacf65..9f6c3960 100644
--- a/quickstart/201-mysql-fs-db/main.tf
+++ b/quickstart/201-mysql-fs-db/main.tf
@@ -22,21 +22,22 @@ resource "random_password" "password" {
   upper            = true
   lower            = true
   special          = true
+  numeric          = false
   override_special = "_"
 }
 
 # Manages the Virtual Network
 resource "azurerm_virtual_network" "default" {
   name                = "vnet-${random_string.name.result}"
-  location            = azurerm_resource_group.default.location
-  resource_group_name = azurerm_resource_group.default.name
+  location            = azurerm_resource_group.rg.location
+  resource_group_name = azurerm_resource_group.rg.name
   address_space       = ["10.0.0.0/16"]
 }
 
 # Manages the Subnet
 resource "azurerm_subnet" "default" {
   name                 = "subnet-${random_string.name.result}"
-  resource_group_name  = azurerm_resource_group.default.name
+  resource_group_name  = azurerm_resource_group.rg.name
   virtual_network_name = azurerm_virtual_network.default.name
   address_prefixes     = ["10.0.2.0/24"]
   service_endpoints    = ["Microsoft.Storage"]
@@ -57,7 +58,7 @@ resource "azurerm_subnet" "default" {
 # Enables you to manage Private DNS zones within Azure DNS
 resource "azurerm_private_dns_zone" "default" {
   name                = "${random_string.name.result}.mysql.database.azure.com"
-  resource_group_name = azurerm_resource_group.default.name
+  resource_group_name = azurerm_resource_group.rg.name
 }
 
 # Enables you to manage Private DNS zone Virtual Network Links
@@ -65,14 +66,14 @@ resource "azurerm_private_dns_zone_virtual_network_link" "default" {
   name                  = "mysqlfsVnetZone${random_string.name.result}.com"
   private_dns_zone_name = azurerm_private_dns_zone.default.name
   virtual_network_id    = azurerm_virtual_network.default.id
-  resource_group_name   = azurerm_resource_group.default.name
+  resource_group_name   = azurerm_resource_group.rg.name
 }
 
 # Manages the MySQL Flexible Server
 resource "azurerm_mysql_flexible_server" "default" {
   name                         = "mysqlfs-${random_string.name.result}"
-  resource_group_name          = azurerm_resource_group.default.name
-  location                     = azurerm_resource_group.default.location
+  resource_group_name          = azurerm_resource_group.rg.name
+  location                     = azurerm_resource_group.rg.location
   administrator_login          = random_string.name.result
   administrator_password       = random_password.password.result
   zone                         = "1"
diff --git a/quickstart/201-mysql-fs-db/mysql-fs-db.tf b/quickstart/201-mysql-fs-db/mysql-fs-db.tf
index 7be11190..51598667 100644
--- a/quickstart/201-mysql-fs-db/mysql-fs-db.tf
+++ b/quickstart/201-mysql-fs-db/mysql-fs-db.tf
@@ -1,7 +1,7 @@
-// Manages the MySQL Flexible Server Database
+# Manages the MySQL Flexible Server Database
 resource "azurerm_mysql_flexible_database" "default" {
   name                = "mysqlfsdb_${random_string.name.result}"
-  resource_group_name = azurerm_resource_group.default.name
+  resource_group_name = azurerm_resource_group.rg.name
   server_name         = azurerm_mysql_flexible_server.default.name
   charset             = "utf8"
   collation           = "utf8_unicode_ci"
diff --git a/quickstart/201-mysql-fs-db/outputs.tf b/quickstart/201-mysql-fs-db/outputs.tf
index a4c7915b..dca1b176 100644
--- a/quickstart/201-mysql-fs-db/outputs.tf
+++ b/quickstart/201-mysql-fs-db/outputs.tf
@@ -1,5 +1,5 @@
 output "resource_group_name" {
-  value = azurerm_resource_group.default.name
+  value = azurerm_resource_group.rg.name
 }
 
 output "azurerm_mysql_flexible_server" {
diff --git a/quickstart/201-mysql-fs-db/providers.tf b/quickstart/201-mysql-fs-db/providers.tf
index cbe3e719..965241cd 100644
--- a/quickstart/201-mysql-fs-db/providers.tf
+++ b/quickstart/201-mysql-fs-db/providers.tf
@@ -12,3 +12,8 @@ terraform {
 provider "azurerm" {
   features {}
 }
+
+random = {
+  source = "hashicorp/random"
+  version = "~>3.0"
+}