diff --git a/samples/key-vault-csi-driver/user-assigned-managed-identity/03-create-role-assignment.sh b/samples/key-vault-csi-driver/user-assigned-managed-identity/03-create-role-assignment.sh
index 0843f2b..8398601 100755
--- a/samples/key-vault-csi-driver/user-assigned-managed-identity/03-create-role-assignment.sh
+++ b/samples/key-vault-csi-driver/user-assigned-managed-identity/03-create-role-assignment.sh
@@ -52,8 +52,8 @@ fi
 # Get the name of the Azure Key Vault Secrets Provider identity from the resourceId
 KV_IDENTITY_NAME=$(basename $KV_IDENTITY_RESOURCE_ID)
 
-# Assign the Key Vault Secrets User role to the managed identity on the key vault
-ROLE="Key Vault Secrets User"
+# Assign the Key Vault Administrator role to the managed identity on the node resource group
+ROLE="Key Vault Administrator"
 MANAGED_IDENTITY_NAME="$KV_IDENTITY_NAME"
 PRINCIPAL_ID="$KV_IDENTITY_OBJECT_ID"
 SCOPE_ID="$KEY_VAULT_ID"
diff --git a/samples/key-vault-csi-driver/workload-identity/03-create-managed-identity.sh b/samples/key-vault-csi-driver/workload-identity/03-create-managed-identity.sh
index 3286ae8..5c6dfe2 100755
--- a/samples/key-vault-csi-driver/workload-identity/03-create-managed-identity.sh
+++ b/samples/key-vault-csi-driver/workload-identity/03-create-managed-identity.sh
@@ -98,8 +98,9 @@ else
   exit
 fi
 
-# Assign the Key Vault Secrets User role to the managed identity on the key vault
-ROLE="Key Vault Secrets User"
+# Assign the Key Vault Administrator role to the managed identity on the node resource group
+ROLE="Key Vault Administrator"
+PRINCIPAL_ID="$PRINCIPAL_ID"
 SCOPE_ID="$KEY_VAULT_ID"
 SCOPE_NAME="$KEY_VAULT_NAME"
 SCOPE_TYPE="key vault"
diff --git a/samples/web-app-postgresql-flexible-server/scripts/01-deploy-resources.sh b/samples/web-app-postgresql-flexible-server/scripts/01-deploy-resources.sh
index b66f44c..955cf4b 100755
--- a/samples/web-app-postgresql-flexible-server/scripts/01-deploy-resources.sh
+++ b/samples/web-app-postgresql-flexible-server/scripts/01-deploy-resources.sh
@@ -92,8 +92,8 @@ fi
 echo "Ensuring firewall rule [$FIREWALL_RULE_NAME] exists on PostgreSQL flexible server [$PG_SERVER_NAME]..."
 az postgres flexible-server firewall-rule create \
 	--resource-group "$RESOURCE_GROUP_NAME" \
-	--name "$PG_SERVER_NAME" \
-	--rule-name "$FIREWALL_RULE_NAME" \
+	--server-name "$PG_SERVER_NAME" \
+	--name "$FIREWALL_RULE_NAME" \
 	--start-ip-address 0.0.0.0 \
 	--end-ip-address 255.255.255.255 \
 	--only-show-errors 1>/dev/null
@@ -101,7 +101,7 @@ az postgres flexible-server firewall-rule create \
 # Create the PostgreSQL database
 echo "Checking if PostgreSQL database [$PG_DATABASE_NAME] exists..."
 az postgres flexible-server db show \
-	--database-name "$PG_DATABASE_NAME" \
+	--name "$PG_DATABASE_NAME" \
 	--server-name "$PG_SERVER_NAME" \
 	--resource-group "$RESOURCE_GROUP_NAME" \
 	--only-show-errors &>/dev/null
@@ -109,7 +109,7 @@ az postgres flexible-server db show \
 if [[ $? != 0 ]]; then
 	echo "Creating PostgreSQL database [$PG_DATABASE_NAME]..."
 	az postgres flexible-server db create \
-		--database-name "$PG_DATABASE_NAME" \
+		--name "$PG_DATABASE_NAME" \
 		--server-name "$PG_SERVER_NAME" \
 		--resource-group "$RESOURCE_GROUP_NAME" \
 		--charset UTF8 \