diff --git a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/README.md b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/README.md
index 583838506..6bcf407cf 100644
--- a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/README.md
+++ b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/README.md
@@ -4,11 +4,11 @@ languages:
 - java
 products:
 - azure-service-bus
-name: Sending and Receiving Message by Azure Service Bus (Queue) And Jms in Spring Boot Application
-description: This sample demonstrates how to send and receive message by Azure Service Bus (queue) and JMS in Spring Boot application.
+name: Sending and Receiving Message by Azure Service Bus (Queue) And Jms in Spring Boot Application without Password
+description: This sample demonstrates how to send and receive message by Azure Service Bus (queue) and JMS in Spring Boot application without password.
 ---
 
-# Sending and Receiving Message by Azure Service Bus (Queue) And Jms in Spring Boot Application
+# Sending and Receiving Message by Azure Service Bus (Queue) And Jms in Spring Boot Application without Password
 
 This sample project demonstrates how to use Spring JMS for Azure Service Bus Queue via Spring Boot Starter `spring-cloud-azure-starter-servicebus-jms`.
 
@@ -140,7 +140,7 @@ terraform\setup_env.ps1
 If you want to run the sample in debug mode, you can save the output value.
 
 ```shell
-SERVICEBUS_NAMESPACE_CONNECTION_STRING=...
+SERVICEBUS_NAMESPACE_NAME=...
 PRICING_TIER=...
 ```
 
diff --git a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/src/main/resources/application.yaml b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/src/main/resources/application.yaml
index 06804e564..f6e96ba8c 100644
--- a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/src/main/resources/application.yaml
+++ b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/src/main/resources/application.yaml
@@ -1,5 +1,6 @@
 spring:
   jms:
     servicebus:
-      connection-string: ${SERVICEBUS_NAMESPACE_CONNECTION_STRING}
+      namespace: ${SERVICEBUS_NAMESPACE_NAME}
+      passwordless-enabled: true
       pricing-tier: ${PRICING_TIER}
diff --git a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/main.tf b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/main.tf
index aebba3351..8b86c1288 100644
--- a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/main.tf
+++ b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/main.tf
@@ -66,3 +66,12 @@ resource "azurerm_servicebus_queue" "queue" {
   requires_session      = false
   default_message_ttl   = "P14D"
 }
+
+data "azurerm_client_config" "current" {
+}
+
+resource "azurerm_role_assignment" "role_servicebus_data_owner" {
+  scope                = azurerm_servicebus_namespace.servicebus_namespace.id
+  role_definition_name = "Azure Service Bus Data Owner"
+  principal_id         = data.azurerm_client_config.current.object_id
+}
diff --git a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/outputs.tf b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/outputs.tf
index 1c40d05b0..50c9eaba5 100644
--- a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/outputs.tf
+++ b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/outputs.tf
@@ -1,7 +1,6 @@
-output "SERVICEBUS_NAMESPACE_CONNECTION_STRING" {
-  value       = azurerm_servicebus_namespace.servicebus_namespace.default_primary_connection_string
-  description = "The connection_string of servicebus namespace."
-  sensitive   = true
+output "SERVICEBUS_NAMESPACE_NAME" {
+  value       = azurerm_servicebus_namespace.servicebus_namespace.name
+  description = "The name of service bus namespace."
 }
 
 output "PRICING_TIER" {
diff --git a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/setup_env.ps1 b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/setup_env.ps1
index 42a68c424..9242dbdd8 100644
--- a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/setup_env.ps1
+++ b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/setup_env.ps1
@@ -1,5 +1,5 @@
-$env:SERVICEBUS_NAMESPACE_CONNECTION_STRING=$(terraform -chdir=terraform output -raw SERVICEBUS_NAMESPACE_CONNECTION_STRING)
+$env:SERVICEBUS_NAMESPACE_NAME=$(terraform -chdir=terraform output -raw SERVICEBUS_NAMESPACE_NAME)
 $env:PRICING_TIER=$(terraform -chdir=terraform output -raw PRICING_TIER)
 
-echo SERVICEBUS_NAMESPACE_CONNECTION_STRING=$env:SERVICEBUS_NAMESPACE_CONNECTION_STRING
+echo SERVICEBUS_NAMESPACE_NAME=$env:SERVICEBUS_NAMESPACE_NAME
 echo PRICING_TIER=$env:PRICING_TIER
diff --git a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/setup_env.sh b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/setup_env.sh
index 25b0b945e..e7828fbd0 100644
--- a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/setup_env.sh
+++ b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/setup_env.sh
@@ -1,5 +1,5 @@
-export SERVICEBUS_NAMESPACE_CONNECTION_STRING=$(terraform -chdir=./terraform output -raw SERVICEBUS_NAMESPACE_CONNECTION_STRING)
+export SERVICEBUS_NAMESPACE_NAME=$(terraform -chdir=./terraform output -raw SERVICEBUS_NAMESPACE_NAME)
 export PRICING_TIER=$(terraform -chdir=./terraform output -raw PRICING_TIER)
 
-echo SERVICEBUS_NAMESPACE_CONNECTION_STRING=$SERVICEBUS_NAMESPACE_CONNECTION_STRING
+echo SERVICEBUS_NAMESPACE_NAME=$SERVICEBUS_NAMESPACE_NAME
 echo PRICING_TIER=$PRICING_TIER
diff --git a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/README.md b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/README.md
index 80baacd4b..b3db21d67 100644
--- a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/README.md
+++ b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/README.md
@@ -140,7 +140,7 @@ terraform\setup_env.ps1
 If you want to run the sample in debug mode, you can save the output value.
 
 ```shell
-SERVICEBUS_NAMESPACE_CONNECTION_STRING=...
+SERVICEBUS_NAMESPACE_NAME=...
 PRICING_TIER=...
 ```
 
diff --git a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/src/main/resources/application.yaml b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/src/main/resources/application.yaml
index 85392ac4c..7924d1355 100644
--- a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/src/main/resources/application.yaml
+++ b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/src/main/resources/application.yaml
@@ -1,6 +1,7 @@
 spring:
   jms:
     servicebus:
-      connection-string: ${SERVICEBUS_NAMESPACE_CONNECTION_STRING}
+      namespace: ${SERVICEBUS_NAMESPACE_NAME}
+      passwordless-enabled: true
       pricing-tier: ${PRICING_TIER}
       topic-client-id: topic-client-id
diff --git a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/main.tf b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/main.tf
index bd16c4192..30aa444c0 100644
--- a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/main.tf
+++ b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/main.tf
@@ -66,3 +66,13 @@ resource "azurerm_servicebus_subscription" "application" {
 
   max_delivery_count  = 1
 }
+
+
+data "azurerm_client_config" "current" {
+}
+
+resource "azurerm_role_assignment" "role_servicebus_data_owner" {
+  scope                = azurerm_servicebus_namespace.servicebus_namespace.id
+  role_definition_name = "Azure Service Bus Data Owner"
+  principal_id         = data.azurerm_client_config.current.object_id
+}
diff --git a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/outputs.tf b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/outputs.tf
index 1c40d05b0..15b6ee76e 100644
--- a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/outputs.tf
+++ b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/outputs.tf
@@ -1,7 +1,6 @@
-output "SERVICEBUS_NAMESPACE_CONNECTION_STRING" {
-  value       = azurerm_servicebus_namespace.servicebus_namespace.default_primary_connection_string
-  description = "The connection_string of servicebus namespace."
-  sensitive   = true
+output "SERVICEBUS_NAMESPACE_NAME" {
+  value       = azurerm_servicebus_namespace.servicebus_namespace.name
+  description = "The name of Service Bus namespace."
 }
 
 output "PRICING_TIER" {
diff --git a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/setup_env.ps1 b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/setup_env.ps1
index 42a68c424..9242dbdd8 100644
--- a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/setup_env.ps1
+++ b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/setup_env.ps1
@@ -1,5 +1,5 @@
-$env:SERVICEBUS_NAMESPACE_CONNECTION_STRING=$(terraform -chdir=terraform output -raw SERVICEBUS_NAMESPACE_CONNECTION_STRING)
+$env:SERVICEBUS_NAMESPACE_NAME=$(terraform -chdir=terraform output -raw SERVICEBUS_NAMESPACE_NAME)
 $env:PRICING_TIER=$(terraform -chdir=terraform output -raw PRICING_TIER)
 
-echo SERVICEBUS_NAMESPACE_CONNECTION_STRING=$env:SERVICEBUS_NAMESPACE_CONNECTION_STRING
+echo SERVICEBUS_NAMESPACE_NAME=$env:SERVICEBUS_NAMESPACE_NAME
 echo PRICING_TIER=$env:PRICING_TIER
diff --git a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/setup_env.sh b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/setup_env.sh
index 25b0b945e..e7828fbd0 100644
--- a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/setup_env.sh
+++ b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/setup_env.sh
@@ -1,5 +1,5 @@
-export SERVICEBUS_NAMESPACE_CONNECTION_STRING=$(terraform -chdir=./terraform output -raw SERVICEBUS_NAMESPACE_CONNECTION_STRING)
+export SERVICEBUS_NAMESPACE_NAME=$(terraform -chdir=./terraform output -raw SERVICEBUS_NAMESPACE_NAME)
 export PRICING_TIER=$(terraform -chdir=./terraform output -raw PRICING_TIER)
 
-echo SERVICEBUS_NAMESPACE_CONNECTION_STRING=$SERVICEBUS_NAMESPACE_CONNECTION_STRING
+echo SERVICEBUS_NAMESPACE_NAME=$SERVICEBUS_NAMESPACE_NAME
 echo PRICING_TIER=$PRICING_TIER