diff --git a/quickstart/201-postgresql-fs-db/main.tf b/quickstart/201-postgresql-fs-db/main.tf
index 8ef98163..cbf8f7a1 100644
--- a/quickstart/201-postgresql-fs-db/main.tf
+++ b/quickstart/201-postgresql-fs-db/main.tf
@@ -1,21 +1,22 @@
-resource "random_pet" "rg-name" {
+resource "random_pet" "name_prefix" {
   prefix = var.name_prefix
+  length = 1
 }
 
 resource "azurerm_resource_group" "default" {
-  name     = random_pet.rg-name.id
+  name     = random_pet.name_prefix.id
   location = var.location
 }
 
 resource "azurerm_virtual_network" "default" {
-  name                = "${var.name_prefix}-vnet"
+  name                = "${random_pet.name_prefix.id}-vnet"
   location            = azurerm_resource_group.default.location
   resource_group_name = azurerm_resource_group.default.name
   address_space       = ["10.0.0.0/16"]
 }
 
 resource "azurerm_network_security_group" "default" {
-  name                = "${var.name_prefix}-nsg"
+  name                = "${random_pet.name_prefix.id}-nsg"
   location            = azurerm_resource_group.default.location
   resource_group_name = azurerm_resource_group.default.name
 
@@ -33,7 +34,7 @@ resource "azurerm_network_security_group" "default" {
 }
 
 resource "azurerm_subnet" "default" {
-  name                 = "${var.name_prefix}-subnet"
+  name                 = "${random_pet.name_prefix.id}-subnet"
   virtual_network_name = azurerm_virtual_network.default.name
   resource_group_name  = azurerm_resource_group.default.name
   address_prefixes     = ["10.0.2.0/24"]
@@ -58,28 +59,32 @@ resource "azurerm_subnet_network_security_group_association" "default" {
 }
 
 resource "azurerm_private_dns_zone" "default" {
-  name                = "${var.name_prefix}-pdz.postgres.database.azure.com"
+  name                = "${random_pet.name_prefix.id}-pdz.postgres.database.azure.com"
   resource_group_name = azurerm_resource_group.default.name
 
   depends_on = [azurerm_subnet_network_security_group_association.default]
 }
 
 resource "azurerm_private_dns_zone_virtual_network_link" "default" {
-  name                  = "${var.name_prefix}-pdzvnetlink.com"
+  name                  = "${random_pet.name_prefix.id}-pdzvnetlink.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 "random_password" "pass" {
+  length = 20
+}
+
 resource "azurerm_postgresql_flexible_server" "default" {
-  name                   = "${var.name_prefix}-server"
+  name                   = "${random_pet.name_prefix.id}-server"
   resource_group_name    = azurerm_resource_group.default.name
   location               = azurerm_resource_group.default.location
   version                = "13"
   delegated_subnet_id    = azurerm_subnet.default.id
   private_dns_zone_id    = azurerm_private_dns_zone.default.id
   administrator_login    = "adminTerraform"
-  administrator_password = "QAZwsx123"
+  administrator_password = random_password.pass.result
   zone                   = "1"
   storage_mb             = 32768
   sku_name               = "GP_Standard_D2s_v3"
diff --git a/quickstart/201-postgresql-fs-db/output.tf b/quickstart/201-postgresql-fs-db/output.tf
deleted file mode 100644
index 4290ac52..00000000
--- a/quickstart/201-postgresql-fs-db/output.tf
+++ /dev/null
@@ -1,11 +0,0 @@
-output "resource_group_name" {
-    value = azurerm_resource_group.default.name
-}
-
-output "azurerm_postgresql_flexible_server" {
-    value = azurerm_postgresql_flexible_server.default.name
-}
-
-output "postgresql_flexible_server_database_name" {
-    value = azurerm_postgresql_flexible_server_database.default.name
-}
diff --git a/quickstart/201-postgresql-fs-db/outputs.tf b/quickstart/201-postgresql-fs-db/outputs.tf
new file mode 100644
index 00000000..4a598436
--- /dev/null
+++ b/quickstart/201-postgresql-fs-db/outputs.tf
@@ -0,0 +1,16 @@
+output "resource_group_name" {
+  value = azurerm_resource_group.default.name
+}
+
+output "azurerm_postgresql_flexible_server" {
+  value = azurerm_postgresql_flexible_server.default.name
+}
+
+output "postgresql_flexible_server_database_name" {
+  value = azurerm_postgresql_flexible_server_database.default.name
+}
+
+output "postgresql_flexible_server_admin_password" {
+  sensitive = true
+  value     = azurerm_postgresql_flexible_server.default.administrator_password
+}
\ No newline at end of file
diff --git a/quickstart/201-postgresql-fs-db/postgresql-fs-db.tf b/quickstart/201-postgresql-fs-db/postgresql-fs-db.tf
index de3f2cd1..6041eb60 100644
--- a/quickstart/201-postgresql-fs-db/postgresql-fs-db.tf
+++ b/quickstart/201-postgresql-fs-db/postgresql-fs-db.tf
@@ -1,5 +1,5 @@
 resource "azurerm_postgresql_flexible_server_database" "default" {
-  name      = "${var.name_prefix}-db"
+  name      = "${random_pet.name_prefix.id}-db"
   server_id = azurerm_postgresql_flexible_server.default.id
   collation = "en_US.UTF8"
   charset   = "UTF8"
diff --git a/quickstart/201-postgresql-fs-db/providers.tf b/quickstart/201-postgresql-fs-db/providers.tf
index 6fb32c2b..1968f92d 100644
--- a/quickstart/201-postgresql-fs-db/providers.tf
+++ b/quickstart/201-postgresql-fs-db/providers.tf
@@ -1,10 +1,14 @@
 terraform {
   required_version = ">=1.0"
-  
+
   required_providers {
     azurerm = {
-      source = "hashicorp/azurerm"
-      version = "~>2.0"
+      source  = "hashicorp/azurerm"
+      version = "~>3.0"
+    }
+    random = {
+      source  = "hashicorp/random"
+      version = ">= 3.4.0"
     }
   }
 }