diff --git a/src/AzureCloudServiceBus/AzureCloudServiceBusResource.cs b/src/AzureCloudServiceBus/AzureCloudServiceBusResource.cs
index 5f19be31..8123682f 100644
--- a/src/AzureCloudServiceBus/AzureCloudServiceBusResource.cs
+++ b/src/AzureCloudServiceBus/AzureCloudServiceBusResource.cs
@@ -1,8 +1,8 @@
-using System;
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Text;
+using System.Text;
 using System.Threading.Tasks;
 using Microsoft.Azure.ServiceBus;
 using Squadron.AzureCloud;
@@ -10,12 +10,12 @@
 using Xunit.Abstractions;
 using Xunit.Sdk;
 
-namespace Squadron
+namespace Squadron
 {
     /// <summary>
-    /// Defines a Azure Cloud ServiceBus namespace 
+    /// Defines a Azure Cloud ServiceBus namespace
     /// </summary>
-    /// <typeparam name="TOptions">Option to initialize the resource</typeparam>
+    /// <typeparam name="TOptions">Option to initialize the resource</typeparam>
     public class AzureCloudServiceBusResource<TOptions>
             : AzureResource<TOptions>, IAsyncLifetime
         where TOptions : AzureCloudServiceBusOptions,
@@ -26,10 +26,10 @@ public class AzureCloudServiceBusResource<TOptions>
         private ServiceBusModel _serviceBusModel;
         private readonly IMessageSink _messageSink;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AzureCloudServiceBusResource{TOptions}"/> class.
-        /// </summary>
-        /// <param name="messageSink">The message sink.</param>
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AzureCloudServiceBusResource{TOptions}"/> class.
+        /// </summary>
+        /// <param name="messageSink">The message sink.</param>
         public AzureCloudServiceBusResource(IMessageSink messageSink)
         {
             _messageSink = messageSink;
@@ -54,11 +54,11 @@ public ITopicClient GetTopicClient(string name,
         }
 
 
-        /// <summary>
-        /// Creates a new topic
-        /// </summary>
-        /// <param name="configure">The builder.</param>
-        /// <returns>Client to access the created topic</returns>
+        /// <summary>
+        /// Creates a new topic
+        /// </summary>
+        /// <param name="configure">The builder.</param>
+        /// <returns>Client to access the created topic</returns>
         public async Task<ITopicClient> CreateTopicAsync(Action<ServiceBusTopicBuilder> configure)
         {
             var builder = ServiceBusTopicBuilder.New();
@@ -133,9 +133,9 @@ private string GetQueue(string name)
             return queue.CreatedName;
         }
 
-        /// <summary>
-        /// Initialize the resource
-        /// </summary>
+        /// <summary>
+        /// Initialize the resource
+        /// </summary>
         public override async Task InitializeAsync()
         {
             await base.InitializeAsync();
@@ -149,7 +149,7 @@ public override async Task InitializeAsync()
         }
 
         private void BuildOptions()
-        {
+        {
             var builder = ServiceBusOptionsBuilder.New();
             var options = new TOptions();
             options.Configure(builder);
@@ -158,7 +158,7 @@ private void BuildOptions()
         }
 
         private void InitializeServiceBusManager()
-        {
+        {
             _serviceBusManager = new ServiceBusManager(
                     AzureConfig.Credentials,
                     new AzureResourceIdentifier
@@ -170,17 +170,22 @@ private void InitializeServiceBusManager()
         }
 
         private async Task PrepareNamespaceAsync()
-        {
+        {
             if (_serviceBusModel.Namespace == null)
             {
                 _serviceBusModel.ProvisioningMode = ServiceBusProvisioningMode.CreateAndDelete;
                 _serviceBusModel.Namespace = await
-                    _serviceBusManager.CreateNamespaceAsync(AzureConfig.DefaultLocation);
+                    _serviceBusManager.CreateRandomNamespaceAsync(AzureConfig.DefaultLocation);
+            }
+            else if (_serviceBusModel.ProvisioningMode == ServiceBusProvisioningMode.CreateIfNotExists)
+            {
+                _serviceBusModel.Namespace = await
+                    _serviceBusManager.CreateNamespaceIfNotExistsAsync(AzureConfig.DefaultLocation, _serviceBusModel.Namespace);
             }
         }
 
         private async Task PrepareQueuesAsync()
-        {
+        {
             foreach (ServiceBusQueueModel queue in _serviceBusModel.Queues)
             {
                 if (_serviceBusModel.ProvisioningMode == ServiceBusProvisioningMode.UseExisting)
@@ -196,7 +201,7 @@ private async Task PrepareQueuesAsync()
         }
 
         private async Task PrepareTopicsAsync()
-        {
+        {
             foreach (ServiceBusTopicModel topic in _serviceBusModel.Topics)
             {
                 _messageSink.OnMessage(
@@ -220,8 +225,8 @@ private async Task<string> CreateTopicAsync(ServiceBusTopicModel topic)
         }
 
         /// <summary>
-        /// Cleans up the resource
-        /// </summary>
+        /// Cleans up the resource
+        /// </summary>
         public async Task DisposeAsync()
         {
             try
@@ -248,5 +253,5 @@ public async Task DisposeAsync()
                 //do not fail test
             }
         }
-    }
-}
+    }
+}
diff --git a/src/AzureCloudServiceBus/Model/ServiceBusModel.cs b/src/AzureCloudServiceBus/Model/ServiceBusModel.cs
index 22ea1503..92544f46 100644
--- a/src/AzureCloudServiceBus/Model/ServiceBusModel.cs
+++ b/src/AzureCloudServiceBus/Model/ServiceBusModel.cs
@@ -4,60 +4,65 @@
 
 namespace Squadron
 {
-    /// <summary>
-    /// Azure ServiceBus model
-    /// </summary>
-    public class ServiceBusModel 
+    /// <summary>
+    /// Azure ServiceBus model
+    /// </summary>
+    public class ServiceBusModel
     {
-        /// <summary>
-        /// Gets or sets the namespace.
-        /// </summary>
-        /// <value>
-        /// The namespace.
-        /// </value>
+        /// <summary>
+        /// Gets or sets the namespace.
+        /// </summary>
+        /// <value>
+        /// The namespace.
+        /// </value>
         public string Namespace { get; set; }
 
-        /// <summary>
-        /// Gets or sets the topics.
-        /// </summary>
-        /// <value>
-        /// The topics.
-        /// </value>
+        /// <summary>
+        /// Gets or sets the topics.
+        /// </summary>
+        /// <value>
+        /// The topics.
+        /// </value>
         public List<ServiceBusTopicModel> Topics { get; set; }
             = new List<ServiceBusTopicModel>();
 
-        /// <summary>
-        /// Gets or sets the queues.
-        /// </summary>
-        /// <value>
-        /// The queues.
-        /// </value>
+        /// <summary>
+        /// Gets or sets the queues.
+        /// </summary>
+        /// <value>
+        /// The queues.
+        /// </value>
         public List<ServiceBusQueueModel> Queues { get; set; }
             = new List<ServiceBusQueueModel>();
 
-        /// <summary>
-        /// Gets or sets the provisioning mode.
-        /// </summary>
-        /// <value>
-        /// The provisioning mode.
-        /// </value>
+        /// <summary>
+        /// Gets or sets the provisioning mode.
+        /// </summary>
+        /// <value>
+        /// The provisioning mode.
+        /// </value>
         internal ServiceBusProvisioningMode ProvisioningMode { get; set; }
             = ServiceBusProvisioningMode.UseExisting;
     }
 
-    /// <summary>
-    /// Defines ServiceBUs provisioning modes
-    /// </summary>
+    /// <summary>
+    /// Defines ServiceBUs provisioning modes
+    /// </summary>
     internal enum ServiceBusProvisioningMode
     {
-        /// <summary>
-        /// The uan existing Azure resource
-        /// </summary>
+        /// <summary>
+        /// The uan existing Azure resource
+        /// </summary>
         UseExisting,
 
-        /// <summary>
-        /// Provision and delete resource
-        /// </summary>
-        CreateAndDelete
+        /// <summary>
+        /// Provision and delete resource
+        /// </summary>
+        CreateAndDelete,
+
+        /// <summary>
+        /// Create or update resource
+        /// </summary>
+        CreateIfNotExists
     }
 }
diff --git a/src/AzureCloudServiceBus/ServiceBusManager.cs b/src/AzureCloudServiceBus/ServiceBusManager.cs
index 36223056..331a6f2a 100644
--- a/src/AzureCloudServiceBus/ServiceBusManager.cs
+++ b/src/AzureCloudServiceBus/ServiceBusManager.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Text;
+using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.Azure.Management.ServiceBus;
 using Microsoft.Azure.Management.ServiceBus.Models;
@@ -38,11 +38,47 @@ private async Task EnsureAuthenticatedAsync()
             }
         }
 
-        internal async Task<string> CreateNamespaceAsync(string location)
+        internal async Task<string> CreateRandomNamespaceAsync(string location)
         {
             await EnsureAuthenticatedAsync();
 
             var ns = $"squadron-{Guid.NewGuid().ToString("N").Substring(8)}";
+            return await CreateNamespaceAsync(location, ns);
+        }
+
+        internal async Task<string> CreateNamespaceIfNotExistsAsync(string location, string serviceBusNamespace)
+        {
+            await EnsureAuthenticatedAsync();
+
+            if (await CheckServiceBusNamespaceExists(serviceBusNamespace) == false)
+                return await CreateNamespaceAsync(location, serviceBusNamespace);
+
+            _identifier.Name = serviceBusNamespace;
+            return serviceBusNamespace;
+        }
+
+        private async Task<bool> CheckServiceBusNamespaceExists(string serviceBusNamespace)
+        {
+            var serviceBusNamespaces = new List<SBNamespace>();
+
+            var listByResourceGroupAsync = await _client.Namespaces.ListByResourceGroupAsync(_identifier.ResourceGroupName);
+            serviceBusNamespaces.AddRange(listByResourceGroupAsync);
+
+            var nextPageLink = listByResourceGroupAsync.NextPageLink;
+            while (nextPageLink != null)
+            {
+                listByResourceGroupAsync = await _client.Namespaces.ListByResourceGroupNextAsync(nextPageLink);
+                nextPageLink = listByResourceGroupAsync.Any(x => x.Name == serviceBusNamespace) ?
+                    null :
+                    listByResourceGroupAsync.NextPageLink;
+                serviceBusNamespaces.AddRange(listByResourceGroupAsync);
+            }
+
+            return serviceBusNamespaces.Any(x => x.Name == serviceBusNamespace);
+        }
+
+        private async Task<string> CreateNamespaceAsync(string location, string ns)
+        {
             var pars = new SBNamespace
             {
                 Sku = new SBSku(SkuName.Standard),
@@ -50,7 +86,7 @@ internal async Task<string> CreateNamespaceAsync(string location)
             };
 
             SBNamespace res = await _client.Namespaces
-                    .CreateOrUpdateAsync(_identifier.ResourceGroupName, ns, pars);
+                .CreateOrUpdateAsync(_identifier.ResourceGroupName, ns, pars);
 
             _identifier.Name = res.Name;
             return res.Name;
diff --git a/src/AzureCloudServiceBus/ServiceBusOptionsBuilder.cs b/src/AzureCloudServiceBus/ServiceBusOptionsBuilder.cs
index d2c60d6b..8112c21f 100644
--- a/src/AzureCloudServiceBus/ServiceBusOptionsBuilder.cs
+++ b/src/AzureCloudServiceBus/ServiceBusOptionsBuilder.cs
@@ -4,19 +4,19 @@
 
 namespace Squadron
 {
-    /// <summary>
-    /// ServiceBusOptions builder
-    /// </summary>
+    /// <summary>
+    /// ServiceBusOptions builder
+    /// </summary>
     public class ServiceBusOptionsBuilder : AzureResourceOptionsBuilder
     {
         private ServiceBusModel _model = new ServiceBusModel();
         private List<ServiceBusTopicBuilder> _topics = new List<ServiceBusTopicBuilder>();
         private List<ServiceBusQueueBuilder> _queues = new List<ServiceBusQueueBuilder>();
 
-        /// <summary>
-        /// Creates a new empty builder
-        /// </summary>
-        /// <returns></returns>
+        /// <summary>
+        /// Creates a new empty builder
+        /// </summary>
+        /// <returns></returns>
         public static ServiceBusOptionsBuilder New() => new ServiceBusOptionsBuilder();
 
 
@@ -26,23 +26,37 @@ private ServiceBusOptionsBuilder()
 
         }
 
-        /// <summary>
-        /// Namespace
-        /// </summary>
-        /// <param name="ns">The namespace.</param>
-        /// <returns></returns>
+        /// <summary>
+        /// Namespace
+        /// </summary>
+        /// <param name="ns">The namespace.</param>
+        /// <returns></returns>
         public ServiceBusOptionsBuilder Namespace(string ns)
+        {
+            return Namespace(ns, createIfNotExists: false);
+        }
+
+        /// <summary>
+        /// Namespace
+        /// </summary>
+        /// <param name="ns">The namespace.</param>
+        /// <param name="createIfNotExists">creates namespace if doesn't exist.</param>
+        /// <returns></returns>
+        public ServiceBusOptionsBuilder Namespace(string ns, bool createIfNotExists)
         {
             _model.Namespace = ns;
+            _model.ProvisioningMode = createIfNotExists
+                ? ServiceBusProvisioningMode.CreateIfNotExists
+                : ServiceBusProvisioningMode.UseExisting;
             return this;
         }
 
 
-        /// <summary>
-        /// Adds a topic.
-        /// </summary>
-        /// <param name="name">The topic name.</param>
-        /// <returns></returns>
+        /// <summary>
+        /// Adds a topic.
+        /// </summary>
+        /// <param name="name">The topic name.</param>
+        /// <returns></returns>
         public ServiceBusTopicBuilder AddTopic(string name)
         {
             var topicBuilder = ServiceBusTopicBuilder.New(name);
@@ -51,11 +65,11 @@ public ServiceBusTopicBuilder AddTopic(string name)
         }
 
 
-        /// <summary>
-        /// Adds a queue.
-        /// </summary>
-        /// <param name="name">The queue name.</param>
-        /// <returns></returns>
+        /// <summary>
+        /// Adds a queue.
+        /// </summary>
+        /// <param name="name">The queue name.</param>
+        /// <returns></returns>
         public ServiceBusQueueBuilder AddQueue(string name)
         {
             var queueBuilder = new ServiceBusQueueBuilder(name);
@@ -64,10 +78,10 @@ public ServiceBusQueueBuilder AddQueue(string name)
         }
 
 
-        /// <summary>
-        /// Builds the options
-        /// </summary>
-        /// <returns></returns>
+        /// <summary>
+        /// Builds the options
+        /// </summary>
+        /// <returns></returns>
         public ServiceBusModel Build()
         {
             foreach (ServiceBusTopicBuilder tb in _topics)