diff --git a/src/Arcus.Templates.ServiceBus.Queue/Program.cs b/src/Arcus.Templates.ServiceBus.Queue/Program.cs
index 53a10e54..57352834 100644
--- a/src/Arcus.Templates.ServiceBus.Queue/Program.cs
+++ b/src/Arcus.Templates.ServiceBus.Queue/Program.cs
@@ -44,7 +44,7 @@ public static async Task<int> Main(string[] args)
             }
             finally
             {
-                await Log.CloseAndFlushAsync();
+                Log.CloseAndFlush();
             }
 #else
             CreateHostBuilder(args)
@@ -82,7 +82,7 @@ public static IHostBuilder CreateHostBuilder(string[] args)
                            services.AddAssemblyAppVersion<Program>();
                            
 #endif
-                           services.AddServiceBusQueueMessagePump("ARCUS_SERVICEBUS_CONNECTIONSTRING")
+                           services.AddServiceBusQueueMessagePump(secretProvider => secretProvider.GetRawSecretAsync("ARCUS_SERVICEBUS_CONNECTIONSTRING"))
                                    .WithServiceBusMessageHandler<EmptyMessageHandler, EmptyMessage>();
                            
                            services.AddTcpHealthProbes("ARCUS_HEALTH_PORT");
diff --git a/src/Arcus.Templates.ServiceBus.Topic/Program.cs b/src/Arcus.Templates.ServiceBus.Topic/Program.cs
index 9883a93a..725e4a7b 100644
--- a/src/Arcus.Templates.ServiceBus.Topic/Program.cs
+++ b/src/Arcus.Templates.ServiceBus.Topic/Program.cs
@@ -43,8 +43,8 @@ public static async Task<int> Main(string[] args)
                 return 1;
             }
             finally
-            {
-                await Log.CloseAndFlushAsync();
+            { 
+                Log.CloseAndFlush();
             }
 #else
             IHost host = CreateHostBuilder(args).Build();
@@ -81,7 +81,7 @@ public static IHostBuilder CreateHostBuilder(string[] args)
                            services.AddAssemblyAppVersion<Program>();
                            
 #endif
-                           services.AddServiceBusTopicMessagePump("Receive-All", "ARCUS_SERVICEBUS_CONNECTIONSTRING")
+                           services.AddServiceBusTopicMessagePump("Receive-All", secretProvider => secretProvider.GetRawSecretAsync("ARCUS_SERVICEBUS_CONNECTIONSTRING"))
                                    .WithServiceBusMessageHandler<EmptyMessageHandler, EmptyMessage>();
                            
                            services.AddTcpHealthProbes("ARCUS_HEALTH_PORT");