diff --git a/GitHubExtension.sln b/GitHubExtension.sln
index 8e7e8aa..77241d7 100644
--- a/GitHubExtension.sln
+++ b/GitHubExtension.sln
@@ -40,8 +40,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{A371
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitHubExtension.Test", "test\GitHubExtension\GitHubExtension.Test.csproj", "{D8EFDB34-7019-4807-AE97-1B50891F345D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevHome.Logging", "src\Logging\DevHome.Logging.csproj", "{FEEEDA62-F746-4160-A3A8-1EE74137F8AB}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{E4D6AB24-08F6-4352-9BB8-8E92148DA618}"
 	ProjectSection(SolutionItems) = preProject
 		test\scripts\CleanDevHome.ps1 = test\scripts\CleanDevHome.ps1
@@ -195,26 +193,6 @@ Global
 		{D8EFDB34-7019-4807-AE97-1B50891F345D}.Release|x64.Build.0 = Release|x64
 		{D8EFDB34-7019-4807-AE97-1B50891F345D}.Release|x86.ActiveCfg = Release|x86
 		{D8EFDB34-7019-4807-AE97-1B50891F345D}.Release|x86.Build.0 = Release|x86
-		{FEEEDA62-F746-4160-A3A8-1EE74137F8AB}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{FEEEDA62-F746-4160-A3A8-1EE74137F8AB}.Debug|Any CPU.Build.0 = Debug|x64
-		{FEEEDA62-F746-4160-A3A8-1EE74137F8AB}.Debug|ARM.ActiveCfg = Debug|x64
-		{FEEEDA62-F746-4160-A3A8-1EE74137F8AB}.Debug|ARM.Build.0 = Debug|x64
-		{FEEEDA62-F746-4160-A3A8-1EE74137F8AB}.Debug|arm64.ActiveCfg = Debug|arm64
-		{FEEEDA62-F746-4160-A3A8-1EE74137F8AB}.Debug|arm64.Build.0 = Debug|arm64
-		{FEEEDA62-F746-4160-A3A8-1EE74137F8AB}.Debug|x64.ActiveCfg = Debug|x64
-		{FEEEDA62-F746-4160-A3A8-1EE74137F8AB}.Debug|x64.Build.0 = Debug|x64
-		{FEEEDA62-F746-4160-A3A8-1EE74137F8AB}.Debug|x86.ActiveCfg = Debug|x86
-		{FEEEDA62-F746-4160-A3A8-1EE74137F8AB}.Debug|x86.Build.0 = Debug|x86
-		{FEEEDA62-F746-4160-A3A8-1EE74137F8AB}.Release|Any CPU.ActiveCfg = Release|x64
-		{FEEEDA62-F746-4160-A3A8-1EE74137F8AB}.Release|Any CPU.Build.0 = Release|x64
-		{FEEEDA62-F746-4160-A3A8-1EE74137F8AB}.Release|ARM.ActiveCfg = Release|x64
-		{FEEEDA62-F746-4160-A3A8-1EE74137F8AB}.Release|ARM.Build.0 = Release|x64
-		{FEEEDA62-F746-4160-A3A8-1EE74137F8AB}.Release|arm64.ActiveCfg = Release|arm64
-		{FEEEDA62-F746-4160-A3A8-1EE74137F8AB}.Release|arm64.Build.0 = Release|arm64
-		{FEEEDA62-F746-4160-A3A8-1EE74137F8AB}.Release|x64.ActiveCfg = Release|x64
-		{FEEEDA62-F746-4160-A3A8-1EE74137F8AB}.Release|x64.Build.0 = Release|x64
-		{FEEEDA62-F746-4160-A3A8-1EE74137F8AB}.Release|x86.ActiveCfg = Release|x86
-		{FEEEDA62-F746-4160-A3A8-1EE74137F8AB}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -227,7 +205,6 @@ Global
 		{8E1764CB-2FFC-4F23-9FC0-BDE84E519319} = {5BDF2709-4299-49C3-B971-B10747F2925D}
 		{A371A158-E88C-48D1-9397-22844DDC2EF4} = {10E87373-ADA7-408F-9879-0F6BF101BE87}
 		{D8EFDB34-7019-4807-AE97-1B50891F345D} = {429CEDBA-88C4-4315-9EA1-50AB6DF8855C}
-		{FEEEDA62-F746-4160-A3A8-1EE74137F8AB} = {5BDF2709-4299-49C3-B971-B10747F2925D}
 		{E4D6AB24-08F6-4352-9BB8-8E92148DA618} = {429CEDBA-88C4-4315-9EA1-50AB6DF8855C}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml
index 3af0ea2..d5c8b0a 100644
--- a/build/azure-pipelines.yml
+++ b/build/azure-pipelines.yml
@@ -20,7 +20,7 @@ parameters:
     - release
 
 variables:
-  MSIXVersion: '0.1200'
+  MSIXVersion: '0.1300'
   solution: '**/GitHubExtension.sln'
   appxPackageDir: 'AppxPackages'
   testOutputArtifactDir: 'TestResults'
diff --git a/build/scripts/CreateBuildInfo.ps1 b/build/scripts/CreateBuildInfo.ps1
index 53b8a5e..7481b1f 100644
--- a/build/scripts/CreateBuildInfo.ps1
+++ b/build/scripts/CreateBuildInfo.ps1
@@ -5,7 +5,7 @@ Param(
 )
 
 $Major = "0"
-$Minor = "12"
+$Minor = "13"
 $Patch = "99" # default to 99 for local builds
 
 $versionSplit = $Version.Split(".");
diff --git a/src/GitHubExtension/Client/GithubClientProvider.cs b/src/GitHubExtension/Client/GithubClientProvider.cs
index bc53d0b..3d05ee9 100644
--- a/src/GitHubExtension/Client/GithubClientProvider.cs
+++ b/src/GitHubExtension/Client/GithubClientProvider.cs
@@ -1,15 +1,19 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using DevHome.Logging.Helpers;
 using GitHubExtension.DeveloperId;
 using Microsoft.Windows.DevHome.SDK;
 using Octokit;
+using Serilog;
 
 namespace GitHubExtension.Client;
 
 public class GitHubClientProvider
 {
+    private static readonly Lazy<ILogger> _log = new(() => Serilog.Log.ForContext("SourceContext", nameof(GitHubClientProvider)));
+
+    private static readonly ILogger Log = _log.Value;
+
     private readonly GitHubClient publicRepoClient;
 
     private static readonly object InstanceLock = new();
@@ -66,18 +70,18 @@ public async Task<GitHubClient> GetClientForLoggedInDeveloper(bool logRateLimit
         GitHubClient client;
         if (devIds == null || !devIds.Any())
         {
-            Log.Logger()?.ReportInfo($"No logged in developer, using public GitHub client.");
+            Log.Information($"No logged in developer, using public GitHub client.");
             client = Instance.GetClient();
         }
         else
         {
-            Log.Logger()?.ReportInfo($"Using authenticated user: {devIds.First().LoginId}");
+            Log.Information($"Using authenticated user: {devIds.First().LoginId}");
             client = devIds.First().GitHubClient;
         }
 
         if (client == null)
         {
-            Log.Logger()?.ReportError($"Failed creating GitHubClient.");
+            Log.Error($"Failed creating GitHubClient.");
             return client!;
         }
 
@@ -86,11 +90,11 @@ public async Task<GitHubClient> GetClientForLoggedInDeveloper(bool logRateLimit
             try
             {
                 var miscRateLimit = await client.RateLimit.GetRateLimits();
-                Log.Logger()?.ReportInfo($"Rate Limit:  Remaining: {miscRateLimit.Resources.Core.Remaining}  Total: {miscRateLimit.Resources.Core.Limit}  Resets: {miscRateLimit.Resources.Core.Reset.ToStringInvariant()}");
+                Log.Information($"Rate Limit:  Remaining: {miscRateLimit.Resources.Core.Remaining}  Total: {miscRateLimit.Resources.Core.Limit}  Resets: {miscRateLimit.Resources.Core.Reset}");
             }
             catch (Exception ex)
             {
-                Log.Logger()?.ReportError($"Rate limiting not enabled for server.", ex);
+                Log.Error(ex, $"Rate limiting not enabled for server.");
             }
         }
 
diff --git a/src/GitHubExtension/Client/Validation.cs b/src/GitHubExtension/Client/Validation.cs
index 24f14d5..d731b91 100644
--- a/src/GitHubExtension/Client/Validation.cs
+++ b/src/GitHubExtension/Client/Validation.cs
@@ -3,12 +3,17 @@
 
 using GitHubExtension.DataModel;
 using Octokit;
+using Serilog;
 
 namespace GitHubExtension.Client;
 
 // Validation layer to help parsing GitHub URL.
 public static class Validation
 {
+    private static readonly Lazy<ILogger> _log = new(() => Serilog.Log.ForContext("SourceContext", nameof(Validation)));
+
+    private static readonly ILogger Log = _log.Value;
+
     private static bool IsValidHttpUri(string uriString, out Uri? uri)
     {
         return Uri.TryCreate(uriString, UriKind.Absolute, out uri) &&
@@ -17,7 +22,7 @@ private static bool IsValidHttpUri(string uriString, out Uri? uri)
 
     public static bool IsValidGitHubURL(Uri uri)
     {
-        return IsValidGitHubComURL(uri) || IsValidGitHubEnterpriseServerURL(uri);
+        return IsValidGitHubComURL(uri) || (IsValidGitHubEnterpriseServerURL(uri) && IsReachableGitHubEnterpriseServerURL(uri).Result);
     }
 
     public static bool IsValidGitHubComURL(Uri uri)
@@ -25,7 +30,7 @@ public static bool IsValidGitHubComURL(Uri uri)
         // Valid GitHub URL has three segments.  The first is '/'.
         if (uri.Segments.Length < 3 || (!uri.Host.Equals("github.com", StringComparison.OrdinalIgnoreCase) && !uri.Host.Equals("www.github.com", StringComparison.OrdinalIgnoreCase)))
         {
-            Log.Logger()?.ReportDebug($"{uri.OriginalString} is not a valid GitHub uri");
+            Log.Debug($"{uri.OriginalString} is not a valid GitHub uri");
             return false;
         }
 
@@ -39,7 +44,7 @@ public static bool IsValidGitHubEnterpriseServerURL(Uri server)
         // https://docs.github.com/en/enterprise-server@3.10/admin/configuration/configuring-network-settings/configuring-the-hostname-for-your-instance
         if (server.Segments.Length < 3)
         {
-            Log.Logger()?.ReportDebug($"{server.OriginalString} is not a valid GHES repo uri");
+            Log.Debug($"{server.OriginalString} is not a valid GHES repo uri");
             return false;
         }
 
@@ -56,7 +61,7 @@ public static bool IsValidGitHubURL(string url)
         // Above link shows a work around.
         if (!IsValidHttpUri(url, out parsedUri) || url == null || parsedUri == null)
         {
-            Log.Logger()?.ReportDebug($"{url} is not a valid http uri");
+            Log.Debug($"{url} is not a valid http uri");
             return false;
         }
 
@@ -227,13 +232,13 @@ public static async Task<bool> IsReachableGitHubEnterpriseServerURL(Uri server)
             var probeResult = await new EnterpriseProbe(new ProductHeaderValue(Constants.DEV_HOME_APPLICATION_NAME)).Probe(server);
             if (probeResult != EnterpriseProbeResult.Ok)
             {
-                Log.Logger()?.ReportError($"EnterpriseServer {server.AbsoluteUri} is not reachable");
+                Log.Error($"EnterpriseServer {server.AbsoluteUri} is not reachable");
                 return false;
             }
         }
         catch (Exception ex)
         {
-            Log.Logger()?.ReportError($"EnterpriseServer {server.AbsoluteUri} could not be probed.", ex);
+            Log.Error(ex, $"EnterpriseServer {server.AbsoluteUri} could not be probed.");
             return false;
         }
 
diff --git a/src/GitHubExtension/DataManager/DataUpdater.cs b/src/GitHubExtension/DataManager/DataUpdater.cs
index a2b9f5d..35c6a4f 100644
--- a/src/GitHubExtension/DataManager/DataUpdater.cs
+++ b/src/GitHubExtension/DataManager/DataUpdater.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+using Serilog;
+
 namespace GitHubExtension.DataManager;
 
 public class DataUpdater : IDisposable
@@ -8,6 +10,7 @@ public class DataUpdater : IDisposable
     // This is the default interval the timer will run. It is not the interval that we necessarily do work.
     private static readonly TimeSpan TimerUpdateInterval = TimeSpan.FromSeconds(5);
 
+    private readonly ILogger _logger;
     private readonly PeriodicTimer _timer;
     private readonly Func<Task> _action;
     private CancellationTokenSource _cancelSource;
@@ -17,6 +20,7 @@ public class DataUpdater : IDisposable
 
     public DataUpdater(TimeSpan interval, Func<Task> action)
     {
+        _logger = Log.Logger.ForContext("SourceContext", nameof(DataUpdater));
         _timer = new PeriodicTimer(interval);
         _cancelSource = new CancellationTokenSource();
         _started = false;
@@ -64,7 +68,7 @@ protected virtual void Dispose(bool disposing)
     {
         if (!disposed)
         {
-            DataModel.Log.Logger()?.ReportDebug(ToString(), "Disposing of all Disposable resources.");
+            _logger.Debug("Disposing of all updater resources.");
 
             if (disposing)
             {
diff --git a/src/GitHubExtension/DataManager/GitHubDataManager.cs b/src/GitHubExtension/DataManager/GitHubDataManager.cs
index 36141fe..6883728 100644
--- a/src/GitHubExtension/DataManager/GitHubDataManager.cs
+++ b/src/GitHubExtension/DataManager/GitHubDataManager.cs
@@ -5,12 +5,17 @@
 using GitHubExtension.DataManager;
 using GitHubExtension.DataModel;
 using GitHubExtension.Helpers;
+using Serilog;
 using Windows.Storage;
 
 namespace GitHubExtension;
 
 public partial class GitHubDataManager : IGitHubDataManager, IDisposable
 {
+    private static readonly Lazy<ILogger> _log = new(() => Serilog.Log.ForContext("SourceContext", nameof(GitHubDataManager)));
+
+    private static readonly ILogger Log = _log.Value;
+
     public static event DataManagerUpdateEventHandler? OnUpdate;
 
     private static readonly string LastUpdatedKeyName = "LastUpdated";
@@ -28,8 +33,6 @@ public partial class GitHubDataManager : IGitHubDataManager, IDisposable
     private static readonly TimeSpan LastObservedDeleteSpan = TimeSpan.FromMinutes(6);
     private static readonly long CheckSuiteIdDependabot = 29110;
 
-    private static readonly string Name = nameof(GitHubDataManager);
-
     private DataStore DataStore { get; set; }
 
     public DataStoreOptions DataStoreOptions { get; private set; }
@@ -44,7 +47,7 @@ public partial class GitHubDataManager : IGitHubDataManager, IDisposable
         }
         catch (Exception e)
         {
-            Log.Logger()?.ReportError(Name, "Failed creating GitHubDataManager", e);
+            Log.Error(e, "Failed creating GitHubDataManager");
             Environment.FailFast(e.Message, e);
             return null;
         }
@@ -250,7 +253,7 @@ private async Task UpdateDataStoreAsync(DataStoreOperationParameters parameters,
         }
         catch (Exception ex)
         {
-            Log.Logger()?.ReportError(Name, $"Failed Updating DataStore for: {parameters}", ex);
+            Log.Error(ex, $"Failed Updating DataStore for: {parameters}");
             tx.Rollback();
 
             // Rethrow so clients can catch/display an error UX.
@@ -258,7 +261,7 @@ private async Task UpdateDataStoreAsync(DataStoreOperationParameters parameters,
         }
 
         tx.Commit();
-        Log.Logger()?.ReportInfo(Name, $"Updated datastore: {parameters}");
+        Log.Information($"Updated datastore: {parameters}");
     }
 
     // Wrapper for the targeted repository update pattern.
@@ -298,22 +301,22 @@ private async Task UpdateDataForRepositoryAsync(DataStoreOperationParameters par
                     {
                         case Octokit.NotFoundException:
                             // A private repository will come back as "not found" by the GitHub API when an unauthorized account cannot even view it.
-                            Log.Logger()?.ReportDebug(Name, $"DeveloperId {devId.LoginId} did not find {parameters.Owner}/{parameters.RepositoryName}");
+                            Log.Debug($"DeveloperId {devId.LoginId} did not find {parameters.Owner}/{parameters.RepositoryName}");
                             continue;
 
                         case Octokit.RateLimitExceededException:
-                            Log.Logger()?.ReportDebug(Name, $"DeveloperId {devId.LoginId} rate limit exceeded.");
+                            Log.Debug($"DeveloperId {devId.LoginId} rate limit exceeded.");
                             throw;
 
                         case Octokit.ForbiddenException:
                             // This can happen most commonly with SAML-enabled organizations.
                             // The user may have access but the org blocked the application.
-                            Log.Logger()?.ReportDebug(Name, $"DeveloperId {devId.LoginId} was forbidden access to {parameters.Owner}/{parameters.RepositoryName}");
+                            Log.Debug($"DeveloperId {devId.LoginId} was forbidden access to {parameters.Owner}/{parameters.RepositoryName}");
                             throw;
 
                         default:
                             // If it's some other error like abuse detection, abort and do not continue.
-                            Log.Logger()?.ReportDebug(Name, $"Unhandled Octokit API error for {devId.LoginId} and {parameters.Owner} / {parameters.RepositoryName}");
+                            Log.Debug($"Unhandled Octokit API error for {devId.LoginId} and {parameters.Owner} / {parameters.RepositoryName}");
                             throw;
                     }
                 }
@@ -331,13 +334,13 @@ private async Task UpdateDataForRepositoryAsync(DataStoreOperationParameters par
         catch (Exception ex)
         {
             // This is for catching any other unexpected error as well as any we throw.
-            Log.Logger()?.ReportError(Name, $"Failed trying update data for repository: {parameters.Owner}/{parameters.RepositoryName}", ex);
+            Log.Error(ex, $"Failed trying update data for repository: {parameters.Owner}/{parameters.RepositoryName}");
             tx.Rollback();
             throw;
         }
 
         tx.Commit();
-        Log.Logger()?.ReportInfo(Name, $"Updated datastore: {parameters}");
+        Log.Information($"Updated datastore: {parameters}");
     }
 
     // Find all pull requests the developer, and update them.
@@ -348,7 +351,7 @@ private async Task UpdatePullRequestsForLoggedInDeveloperIdsAsync(DataStoreOpera
         if (devIds is null || !devIds.Any())
         {
             // This may not be an error if the user has not yet logged in with a DevId.
-            Log.Logger()?.ReportInfo(Name, "Called to update all pull requests for a user with no logged in developer.");
+            Log.Information("Called to update all pull requests for a user with no logged in developer.");
             return;
         }
 
@@ -405,7 +408,7 @@ private async Task UpdatePullRequestsForLoggedInDeveloperIdsAsync(DataStoreOpera
                     // the UI to query it to attempt to resolve any issues discovered in the main
                     // app UX, such as via a user prompt that tells them not all of their data
                     // could be accessed.
-                    Log.Logger()?.ReportWarn(Name, $"Forbidden exception while trying to query repository {repoFullName}: {ex.Message}");
+                    Log.Warning($"Forbidden exception while trying to query repository {repoFullName}: {ex.Message}");
                     continue;
                 }
 
@@ -445,7 +448,7 @@ private async Task UpdatePullRequestsForLoggedInDeveloperIdsAsync(DataStoreOpera
                                 continue;
                             }
 
-                            Log.Logger()?.ReportDebug($"Suite: {suite.App.Name} - {suite.App.Id} - {suite.App.Owner.Login}  Conclusion: {suite.Conclusion}  Status: {suite.Status}");
+                            Log.Verbose($"Suite: {suite.App.Name} - {suite.App.Id} - {suite.App.Owner.Login}  Conclusion: {suite.Conclusion}  Status: {suite.Status}");
                             CheckSuite.GetOrCreateByOctokitCheckSuite(DataStore, suite);
                         }
                     }
@@ -454,10 +457,10 @@ private async Task UpdatePullRequestsForLoggedInDeveloperIdsAsync(DataStoreOpera
                         // Octokit can sometimes fail unexpectedly or have bugs. Should that occur here, we
                         // will not stop processing all pull requests and instead skip  over getting the PR
                         // checks information for this particular pull request.
-                        Log.Logger()?.ReportError($"Error updating Check Status for Pull Request #{octoPull.Number}: {e.Message}");
+                        Log.Error($"Error updating Check Status for Pull Request #{octoPull.Number}: {e.Message}");
 
                         // Put the full stack trace in debug if this occurs to reduce log spam.
-                        Log.Logger()?.ReportDebug($"Error updating Check Status for Pull Request #{octoPull.Number}.", e);
+                        Log.Debug(e, $"Error updating Check Status for Pull Request #{octoPull.Number}.");
                     }
 
                     var commitCombinedStatus = await devId.GitHubClient.Repository.Status.GetCombined(dsRepository.InternalId, dsPullRequest.HeadSha);
@@ -480,14 +483,14 @@ private async Task UpdatePullRequestsForLoggedInDeveloperIdsAsync(DataStoreOpera
                         // Octokit can sometimes fail unexpectedly or have bugs. Should that occur here, we
                         // will not stop processing all pull requests and instead skip  over getting the PR
                         // review information for this particular pull request.
-                        Log.Logger()?.ReportError($"Error updating Reviews for Pull Request #{octoPull.Number}: {e.Message}");
+                        Log.Error($"Error updating Reviews for Pull Request #{octoPull.Number}: {e.Message}");
 
                         // Put the full stack trace in debug if this occurs to reduce log spam.
-                        Log.Logger()?.ReportDebug($"Error updating Reviews for Pull Request #{octoPull.Number}.", e);
+                        Log.Debug(e, $"Error updating Reviews for Pull Request #{octoPull.Number}.");
                     }
                 }
 
-                Log.Logger()?.ReportDebug(Name, $"Updated developer pull requests for {repoFullName}.");
+                Log.Debug($"Updated developer pull requests for {repoFullName}.");
             }
 
             // After we update for this developer, remove all pull requests for this developer that
@@ -501,7 +504,7 @@ private async Task UpdatePullRequestsForLoggedInDeveloperIdsAsync(DataStoreOpera
     private async Task<Repository> UpdateRepositoryAsync(string owner, string repositoryName, Octokit.GitHubClient? client = null)
     {
         client ??= await GitHubClientProvider.Instance.GetClientForLoggedInDeveloper(true);
-        Log.Logger()?.ReportInfo(Name, $"Updating repository: {owner}/{repositoryName}");
+        Log.Information($"Updating repository: {owner}/{repositoryName}");
         var octokitRepository = await client.Repository.Get(owner, repositoryName);
         return Repository.GetOrCreateByOctokitRepository(DataStore, octokitRepository);
     }
@@ -513,7 +516,7 @@ private async Task UpdatePullRequestsAsync(Repository repository, Octokit.GitHub
         options ??= RequestOptions.RequestOptionsDefault();
         client ??= await GitHubClientProvider.Instance.GetClientForLoggedInDeveloper(true);
         var user = await client.User.Current();
-        Log.Logger()?.ReportInfo(Name, $"Updating pull requests for: {repository.FullName} and user: {user.Login}");
+        Log.Information($"Updating pull requests for: {repository.FullName} and user: {user.Login}");
         var octoPulls = await client.PullRequest.GetAllForRepository(repository.InternalId, options.PullRequestRequest, options.ApiOptions);
         foreach (var pull in octoPulls)
         {
@@ -536,7 +539,7 @@ private async Task UpdatePullRequestsAsync(Repository repository, Octokit.GitHub
                         continue;
                     }
 
-                    Log.Logger()?.ReportDebug($"Suite: {suite.App.Name} - {suite.App.Id} - {suite.App.Owner.Login}  Conclusion: {suite.Conclusion}  Status: {suite.Status}");
+                    Log.Verbose($"Suite: {suite.App.Name} - {suite.App.Id} - {suite.App.Owner.Login}  Conclusion: {suite.Conclusion}  Status: {suite.Status}");
                     CheckSuite.GetOrCreateByOctokitCheckSuite(DataStore, suite);
                 }
             }
@@ -545,10 +548,10 @@ private async Task UpdatePullRequestsAsync(Repository repository, Octokit.GitHub
                 // Octokit can sometimes fail unexpectedly or have bugs. Should that occur here, we
                 // will not stop processing all pull requests and instead skip  over getting the PR
                 // checks information for this particular pull request.
-                Log.Logger()?.ReportError($"Error updating Check Status for Pull Request #{pull.Number}: {e.Message}");
+                Log.Error($"Error updating Check Status for Pull Request #{pull.Number}: {e.Message}");
 
                 // Put the full stack trace in debug if this occurs to reduce log spam.
-                Log.Logger()?.ReportDebug($"Error updating Check Status for Pull Request #{pull.Number}.", e);
+                Log.Debug(e, $"Error updating Check Status for Pull Request #{pull.Number}.");
             }
 
             var commitCombinedStatus = await client.Repository.Status.GetCombined(repository.InternalId, dsPullRequest.HeadSha);
@@ -578,7 +581,7 @@ private void ProcessReview(PullRequest pullRequest, Octokit.PullRequestReview oc
         // Ignore comments or pending state.
         if (string.IsNullOrEmpty(newReview.State) || newReview.State == "Commented")
         {
-            Log.Logger()?.ReportDebug(Name, "Notifications", $"Ignoring review for {pullRequest}. State: {newReview.State}");
+            Log.Debug($"Ignoring review for {pullRequest}. State: {newReview.State}");
             return;
         }
 
@@ -586,7 +589,7 @@ private void ProcessReview(PullRequest pullRequest, Octokit.PullRequestReview oc
         if (existingReview == null || (existingReview.State != newReview.State))
         {
             // We assume that the logged in developer created this pull request.
-            Log.Logger()?.ReportInfo(Name, "Notifications", $"Creating NewReview Notification for {pullRequest}. State: {newReview.State}");
+            Log.Information($"Creating NewReview Notification for {pullRequest}. State: {newReview.State}");
             Notification.Create(DataStore, newReview, NotificationType.NewReview);
         }
     }
@@ -601,13 +604,13 @@ private void CreatePullRequestStatus(PullRequest pullRequest)
 
         if (ShouldCreateCheckFailureNotification(curStatus, prevStatus))
         {
-            Log.Logger()?.ReportInfo(Name, "Notifications", $"Creating CheckRunFailure Notification for {curStatus}");
+            Log.Information($"Creating CheckRunFailure Notification for {curStatus}");
             Notification.Create(DataStore, curStatus, NotificationType.CheckRunFailed);
         }
 
         if (ShouldCreateCheckSucceededNotification(curStatus, prevStatus))
         {
-            Log.Logger()?.ReportDebug(Name, "Notifications", $"Creating CheckRunSuccess Notification for {curStatus}");
+            Log.Debug($"Creating CheckRunSuccess Notification for {curStatus}");
             Notification.Create(DataStore, curStatus, NotificationType.CheckRunSucceeded);
         }
     }
@@ -684,7 +687,7 @@ private async Task UpdateIssuesAsync(Repository repository, Octokit.GitHubClient
     {
         options ??= RequestOptions.RequestOptionsDefault();
         client ??= await GitHubClientProvider.Instance.GetClientForLoggedInDeveloper(true);
-        Log.Logger()?.ReportInfo(Name, $"Updating issues for: {repository.FullName}");
+        Log.Information($"Updating issues for: {repository.FullName}");
 
         // Since we are only interested in issues and for a specific repository, we will override
         // these two properties. All other properties the caller can specify however they see fit.
@@ -694,7 +697,7 @@ private async Task UpdateIssuesAsync(Repository repository, Octokit.GitHubClient
         var issuesResult = await client.Search.SearchIssues(options.SearchIssuesRequest);
         if (issuesResult == null)
         {
-            Log.Logger()?.ReportDebug($"No issues found.");
+            Log.Debug($"No issues found.");
             return;
         }
 
@@ -702,11 +705,11 @@ private async Task UpdateIssuesAsync(Repository repository, Octokit.GitHubClient
         Search? search = null;
         if (!string.IsNullOrEmpty(options.SearchIssuesRequest.Term))
         {
-            Log.Logger()?.ReportDebug($"Term = {options.SearchIssuesRequest.Term}");
+            Log.Debug($"Term = {options.SearchIssuesRequest.Term}");
             search = Search.GetOrCreate(DataStore, options.SearchIssuesRequest.Term, repository.Id);
         }
 
-        Log.Logger()?.ReportDebug(Name, $"Results contain {issuesResult.Items.Count} issues.");
+        Log.Debug($"Results contain {issuesResult.Items.Count} issues.");
         foreach (var issue in issuesResult.Items)
         {
             var dsIssue = Issue.GetOrCreateByOctokitIssue(DataStore, issue, repository.Id);
@@ -738,16 +741,16 @@ private async Task UpdateReleasesAsync(Repository repository, Octokit.GitHubClie
         options.ApiOptions.PageSize = 10;
 
         client ??= await GitHubClientProvider.Instance.GetClientForLoggedInDeveloper(true);
-        Log.Logger()?.ReportInfo(Name, $"Updating releases for: {repository.FullName}");
+        Log.Information($"Updating releases for: {repository.FullName}");
 
         var releasesResult = await client.Repository.Release.GetAll(repository.InternalId, options.ApiOptions);
         if (releasesResult == null)
         {
-            Log.Logger()?.ReportDebug($"No releases found.");
+            Log.Debug($"No releases found.");
             return;
         }
 
-        Log.Logger()?.ReportDebug(Name, $"Results contain {releasesResult.Count} releases.");
+        Log.Debug($"Results contain {releasesResult.Count} releases.");
         foreach (var release in releasesResult)
         {
             if (release.Draft)
@@ -788,7 +791,7 @@ private string[] GetOwnerAndRepositoryNameFromFullName(string fullName)
         var nameSplit = fullName.Split(new[] { '/' });
         if (nameSplit.Length != 2 || string.IsNullOrEmpty(nameSplit[0]) || string.IsNullOrEmpty(nameSplit[1]))
         {
-            Log.Logger()?.ReportError(Name, $"Invalid repository full name: {fullName}");
+            Log.Error($"Invalid repository full name: {fullName}");
             throw new ArgumentException($"Invalid repository full name: {fullName}");
         }
 
@@ -844,7 +847,7 @@ protected virtual void Dispose(bool disposing)
     {
         if (!disposed)
         {
-            Log.Logger()?.ReportDebug(Name, "Disposing of all Disposable resources.");
+            Log.Debug("Disposing of all Disposable resources.");
 
             if (disposing)
             {
diff --git a/src/GitHubExtension/DataManager/GitHubDataManagerUpdate.cs b/src/GitHubExtension/DataManager/GitHubDataManagerUpdate.cs
index 1082f6f..f493d04 100644
--- a/src/GitHubExtension/DataManager/GitHubDataManagerUpdate.cs
+++ b/src/GitHubExtension/DataManager/GitHubDataManagerUpdate.cs
@@ -27,7 +27,7 @@ public static async Task Update()
         }
         catch (Exception ex)
         {
-            Log.Logger()?.ReportError(Name, "Update", "Update failed unexpectedly.", ex);
+            Log.Error(ex, "Update failed unexpectedly.");
         }
 
         lastUpdateTime = DateTime.Now;
@@ -35,7 +35,7 @@ public static async Task Update()
 
     private static async Task UpdateDeveloperPullRequests()
     {
-        Log.Logger()?.ReportDebug(Name, "Update", $"Executing UpdateDeveloperPullRequests");
+        Log.Debug($"Executing UpdateDeveloperPullRequests");
         using var dataManager = CreateInstance() ?? throw new DataStoreInaccessibleException("GitHubDataManager is null.");
         await dataManager.UpdatePullRequestsForLoggedInDeveloperIdsAsync();
 
@@ -73,7 +73,7 @@ private static void SendUpdateEvent(object? source, DataManagerUpdateKind kind,
         {
             info ??= string.Empty;
             context ??= Array.Empty<string>();
-            Log.Logger()?.ReportInfo(Name, $"Sending Update Event: {kind}  Info: {info}  Context: {string.Join(",", context)}");
+            Log.Information($"Sending Update Event: {kind}  Info: {info}  Context: {string.Join(",", context)}");
             OnUpdate.Invoke(source, new DataManagerUpdateEventArgs(kind, info, context));
         }
     }
diff --git a/src/GitHubExtension/DataManager/GitHubSearchManger.cs b/src/GitHubExtension/DataManager/GitHubSearchManger.cs
index 7e00e99..90d61d2 100644
--- a/src/GitHubExtension/DataManager/GitHubSearchManger.cs
+++ b/src/GitHubExtension/DataManager/GitHubSearchManger.cs
@@ -3,9 +3,9 @@
 
 using GitHubExtension.Client;
 using GitHubExtension.DataManager;
-using GitHubExtension.DataModel;
 using Microsoft.Windows.DevHome.SDK;
 using Octokit;
+using Serilog;
 
 namespace GitHubExtension;
 
@@ -13,6 +13,10 @@ namespace GitHubExtension;
 
 public partial class GitHubSearchManager : IGitHubSearchManager, IDisposable
 {
+    private static readonly Lazy<ILogger> _log = new(() => Serilog.Log.ForContext("SourceContext", nameof(GitHubSearchManager)));
+
+    private static readonly ILogger Log = _log.Value;
+
     private static readonly string Name = nameof(GitHubSearchManager);
 
     public static event SearchManagerResultsAvailableEventHandler? OnResultsAvailable;
@@ -29,7 +33,7 @@ public GitHubSearchManager()
         }
         catch (Exception e)
         {
-            Log.Logger()?.ReportError(Name, "Failed creating GitHubSearchManager", e);
+            Log.Error(e, "Failed creating GitHubSearchManager");
             Environment.FailFast(e.Message, e);
             return null;
         }
@@ -51,7 +55,7 @@ public async Task SearchForGitHubIssuesOrPRs(Octokit.SearchIssuesRequest request
 
     private async Task SearchForGitHubIssuesOrPRs(Octokit.SearchIssuesRequest request, string initiator, SearchCategory category, GitHubClient client, RequestOptions? options = null)
     {
-        Log.Logger()?.ReportInfo(Name, $"Searching for issues or pull requests for widget {initiator}");
+        Log.Information(Name, $"Searching for issues or pull requests for widget {initiator}");
         request.State = Octokit.ItemState.Open;
         request.Archived = false;
         request.PerPage = 10;
@@ -72,12 +76,12 @@ private async Task SearchForGitHubIssuesOrPRs(Octokit.SearchIssuesRequest reques
         var octokitResult = await client.Search.SearchIssues(request);
         if (octokitResult == null)
         {
-            Log.Logger()?.ReportDebug($"No issues or PRs found.");
+            Log.Debug($"No issues or PRs found.");
             SendResultsAvailable(new List<Octokit.Issue>(), initiator);
         }
         else
         {
-            Log.Logger()?.ReportDebug(Name, $"Results contain {octokitResult.Items.Count} items.");
+            Log.Debug($"Results contain {octokitResult.Items.Count} items.");
             SendResultsAvailable(octokitResult.Items, initiator);
         }
     }
@@ -86,7 +90,7 @@ private void SendResultsAvailable(IEnumerable<Octokit.Issue> results, string ini
     {
         if (OnResultsAvailable != null)
         {
-            Log.Logger()?.ReportInfo(Name, $"Sending search results available Event, of type: {initiator}");
+            Log.Information(Name, $"Sending search results available Event, of type: {initiator}");
             OnResultsAvailable.Invoke(results, initiator);
         }
     }
diff --git a/src/GitHubExtension/DataModel/DataObjects/CheckRun.cs b/src/GitHubExtension/DataModel/DataObjects/CheckRun.cs
index 0e2911d..fdbb8cd 100644
--- a/src/GitHubExtension/DataModel/DataObjects/CheckRun.cs
+++ b/src/GitHubExtension/DataModel/DataObjects/CheckRun.cs
@@ -5,12 +5,17 @@
 using Dapper.Contrib.Extensions;
 using GitHubExtension.Helpers;
 using Octokit;
+using Serilog;
 
 namespace GitHubExtension.DataModel;
 
 [Table("CheckRun")]
 public class CheckRun
 {
+    private static readonly Lazy<ILogger> _log = new(() => Serilog.Log.ForContext("SourceContext", $"DataModel/{nameof(CheckRun)}"));
+
+    private static readonly ILogger Log = _log.Value;
+
     [Key]
     public long Id { get; set; } = DataStore.NoForeignKey;
 
@@ -129,7 +134,7 @@ private static CheckConclusion GetCheckRunConclusion(StringEnum<Octokit.CheckCon
         catch (Exception)
         {
             // This error means a programming error or Octokit added to or changed their enum.
-            Log.Logger()?.ReportError($"Found Unknown CheckConclusion value: {octoCheckConclusion.Value.Value}");
+            Log.Error($"Found Unknown CheckConclusion value: {octoCheckConclusion.Value.Value}");
             return CheckConclusion.Unknown;
         }
 
@@ -149,7 +154,7 @@ private static CheckStatus GetCheckRunStatus(StringEnum<Octokit.CheckStatus> oct
         catch (Exception)
         {
             // This error means a programming error or Octokit added to or changed their enum.
-            Log.Logger()?.ReportError($"Found Unknown CheckStatus value: {octoCheckStatus.Value}");
+            Log.Error($"Found Unknown CheckStatus value: {octoCheckStatus.Value}");
             return CheckStatus.Unknown;
         }
 
@@ -205,7 +210,7 @@ public static IEnumerable<CheckRun> GetFailedCheckRunsForPullRequest(DataStore d
             MaxConclusion = (long)CheckConclusion.ActionRequired,
         };
 
-        Log.Logger()?.ReportDebug(DataStore.GetSqlLogMessage(sql, param));
+        Log.Verbose(DataStore.GetSqlLogMessage(sql, param));
         return dataStore.Connection!.Query<CheckRun>(sql, param, null) ?? Enumerable.Empty<CheckRun>();
     }
 
@@ -220,7 +225,7 @@ public static CheckStatus GetCheckRunStatusForPullRequest(DataStore datastore, P
             pullRequest.HeadSha,
         };
 
-        Log.Logger()?.ReportDebug(DataStore.GetSqlLogMessage(sql, param));
+        Log.Verbose(DataStore.GetSqlLogMessage(sql, param));
 
         // Query results in NULL if there are no entries, and QueryFirstOrDefault will throw trying
         // to assign null to an integer. In this instance we catch it and return the None type.
@@ -250,7 +255,7 @@ public static CheckConclusion GetCheckRunConclusionForPullRequest(DataStore data
             StatusId = (long)CheckStatus.Completed,
         };
 
-        Log.Logger()?.ReportDebug(DataStore.GetSqlLogMessage(sql, param));
+        Log.Verbose(DataStore.GetSqlLogMessage(sql, param));
 
         // Query results in NULL if there are no entries, and QueryFirstOrDefault will throw trying
         // to assign null to an integer. In this instance we catch it and return the None type.
@@ -270,9 +275,9 @@ public static void DeleteUnreferenced(DataStore dataStore)
         var sql = @"DELETE FROM CheckRun WHERE HeadSha NOT IN (SELECT HeadSha FROM PullRequest)";
         var command = dataStore.Connection!.CreateCommand();
         command.CommandText = sql;
-        Log.Logger()?.ReportDebug(DataStore.GetCommandLogMessage(sql, command));
+        Log.Verbose(DataStore.GetCommandLogMessage(sql, command));
         var rowsDeleted = command.ExecuteNonQuery();
-        Log.Logger()?.ReportDebug(DataStore.GetDeletedLogMessage(rowsDeleted));
+        Log.Verbose(DataStore.GetDeletedLogMessage(rowsDeleted));
     }
 
     public static void DeleteAllForPullRequest(DataStore dataStore, PullRequest pullRequest)
@@ -282,8 +287,8 @@ public static void DeleteAllForPullRequest(DataStore dataStore, PullRequest pull
         var command = dataStore.Connection!.CreateCommand();
         command.CommandText = sql;
         command.Parameters.AddWithValue("$HeadSha", pullRequest.HeadSha);
-        Log.Logger()?.ReportDebug(DataStore.GetCommandLogMessage(sql, command));
+        Log.Verbose(DataStore.GetCommandLogMessage(sql, command));
         var rowsDeleted = command.ExecuteNonQuery();
-        Log.Logger()?.ReportDebug(DataStore.GetDeletedLogMessage(rowsDeleted));
+        Log.Verbose(DataStore.GetDeletedLogMessage(rowsDeleted));
     }
 }
diff --git a/src/GitHubExtension/DataModel/DataObjects/CheckSuite.cs b/src/GitHubExtension/DataModel/DataObjects/CheckSuite.cs
index ef09e60..e7df7ea 100644
--- a/src/GitHubExtension/DataModel/DataObjects/CheckSuite.cs
+++ b/src/GitHubExtension/DataModel/DataObjects/CheckSuite.cs
@@ -4,12 +4,17 @@
 using Dapper;
 using Dapper.Contrib.Extensions;
 using Octokit;
+using Serilog;
 
 namespace GitHubExtension.DataModel;
 
 [Table("CheckSuite")]
 public class CheckSuite
 {
+    private static readonly Lazy<ILogger> _log = new(() => Serilog.Log.ForContext("SourceContext", $"DataModel/{nameof(CheckSuite)}"));
+
+    private static readonly ILogger Log = _log.Value;
+
     [Key]
     public long Id { get; set; } = DataStore.NoForeignKey;
 
@@ -106,7 +111,7 @@ private static CheckConclusion GetCheckConclusion(StringEnum<Octokit.CheckConclu
         catch (Exception)
         {
             // This error means a programming error or Octokit added to or changed their enum.
-            Log.Logger()?.ReportError($"Found Unknown CheckConclusion value: {octoCheckConclusion.Value.Value}");
+            Log.Error($"Found Unknown CheckConclusion value: {octoCheckConclusion.Value.Value}");
             return CheckConclusion.Unknown;
         }
 
@@ -126,7 +131,7 @@ private static CheckStatus GetCheckStatus(StringEnum<Octokit.CheckStatus> octoCh
         catch (Exception)
         {
             // This error means a programming error or Octokit added to or changed their enum.
-            Log.Logger()?.ReportError($"Found Unknown CheckStatus value: {octoCheckStatus.Value}");
+            Log.Error($"Found Unknown CheckStatus value: {octoCheckStatus.Value}");
             return CheckStatus.Unknown;
         }
 
@@ -179,7 +184,7 @@ public static CheckStatus GetCheckStatusForPullRequest(DataStore datastore, Pull
             pullRequest.HeadSha,
         };
 
-        Log.Logger()?.ReportDebug(DataStore.GetSqlLogMessage(sql, param));
+        Log.Verbose(DataStore.GetSqlLogMessage(sql, param));
 
         // Query results in NULL if there are no entries, and QueryFirstOrDefault will throw trying
         // to assign null to an integer. In this instance we catch it and return the None type.
@@ -209,7 +214,7 @@ public static CheckConclusion GetCheckConclusionForPullRequest(DataStore datasto
             StatusId = (long)CheckStatus.Completed,
         };
 
-        Log.Logger()?.ReportDebug(DataStore.GetSqlLogMessage(sql, param));
+        Log.Verbose(DataStore.GetSqlLogMessage(sql, param));
 
         // Query results in NULL if there are no entries, and QueryFirstOrDefault will throw trying
         // to assign null to an integer. In this instance we catch it and return the None type.
@@ -230,9 +235,9 @@ public static void DeleteAllForPullRequest(DataStore dataStore, PullRequest pull
         var command = dataStore.Connection!.CreateCommand();
         command.CommandText = sql;
         command.Parameters.AddWithValue("$HeadSha", pullRequest.HeadSha);
-        Log.Logger()?.ReportDebug(DataStore.GetCommandLogMessage(sql, command));
+        Log.Verbose(DataStore.GetCommandLogMessage(sql, command));
         var rowsDeleted = command.ExecuteNonQuery();
-        Log.Logger()?.ReportDebug(DataStore.GetDeletedLogMessage(rowsDeleted));
+        Log.Verbose(DataStore.GetDeletedLogMessage(rowsDeleted));
     }
 
     public static void DeleteUnreferenced(DataStore dataStore)
@@ -241,7 +246,7 @@ public static void DeleteUnreferenced(DataStore dataStore)
         var sql = @"DELETE FROM CheckSuite WHERE HeadSha NOT IN (SELECT HeadSha FROM PullRequest)";
         var command = dataStore.Connection!.CreateCommand();
         command.CommandText = sql;
-        Log.Logger()?.ReportDebug(DataStore.GetCommandLogMessage(sql, command));
+        Log.Verbose(DataStore.GetCommandLogMessage(sql, command));
         command.ExecuteNonQuery();
     }
 }
diff --git a/src/GitHubExtension/DataModel/DataObjects/CommitCombinedStatus.cs b/src/GitHubExtension/DataModel/DataObjects/CommitCombinedStatus.cs
index 267d905..3531b15 100644
--- a/src/GitHubExtension/DataModel/DataObjects/CommitCombinedStatus.cs
+++ b/src/GitHubExtension/DataModel/DataObjects/CommitCombinedStatus.cs
@@ -3,12 +3,17 @@
 
 using Dapper;
 using Dapper.Contrib.Extensions;
+using Serilog;
 
 namespace GitHubExtension.DataModel;
 
 [Table("CommitCombinedStatus")]
 public class CommitCombinedStatus
 {
+    private static readonly Lazy<ILogger> _log = new(() => Serilog.Log.ForContext("SourceContext", $"DataModel/{nameof(CommitCombinedStatus)}"));
+
+    private static readonly ILogger Log = _log.Value;
+
     [Key]
     public long Id { get; set; } = DataStore.NoForeignKey;
 
@@ -71,7 +76,7 @@ private static CommitState GetCommitState(Octokit.StringEnum<Octokit.CommitState
         catch (Exception)
         {
             // This error means a programming error or Octokit added to or changed their enum.
-            Log.Logger()?.ReportError($"Found Unknown CheckStatus value: {octoCommitState.Value}");
+            Log.Error($"Found Unknown CheckStatus value: {octoCommitState.Value}");
             return CommitState.Unknown;
         }
 
@@ -112,9 +117,9 @@ public static void DeleteUnreferenced(DataStore dataStore)
         var sql = @"DELETE FROM CommitCombinedStatus WHERE HeadSha NOT IN (SELECT HeadSha FROM PullRequest)";
         var command = dataStore.Connection!.CreateCommand();
         command.CommandText = sql;
-        Log.Logger()?.ReportDebug(DataStore.GetCommandLogMessage(sql, command));
+        Log.Verbose(DataStore.GetCommandLogMessage(sql, command));
         var rowsDeleted = command.ExecuteNonQuery();
-        Log.Logger()?.ReportDebug(DataStore.GetDeletedLogMessage(rowsDeleted));
+        Log.Verbose(DataStore.GetDeletedLogMessage(rowsDeleted));
     }
 
     public static void DeleteForPullRequest(DataStore dataStore, PullRequest pullRequest)
@@ -124,8 +129,8 @@ public static void DeleteForPullRequest(DataStore dataStore, PullRequest pullReq
         var command = dataStore.Connection!.CreateCommand();
         command.CommandText = sql;
         command.Parameters.AddWithValue("$HeadSha", pullRequest.HeadSha);
-        Log.Logger()?.ReportDebug(DataStore.GetCommandLogMessage(sql, command));
+        Log.Verbose(DataStore.GetCommandLogMessage(sql, command));
         var rowsDeleted = command.ExecuteNonQuery();
-        Log.Logger()?.ReportDebug(DataStore.GetDeletedLogMessage(rowsDeleted));
+        Log.Verbose(DataStore.GetDeletedLogMessage(rowsDeleted));
     }
 }
diff --git a/src/GitHubExtension/DataModel/DataObjects/Issue.cs b/src/GitHubExtension/DataModel/DataObjects/Issue.cs
index 8eadcc5..0f5cc6c 100644
--- a/src/GitHubExtension/DataModel/DataObjects/Issue.cs
+++ b/src/GitHubExtension/DataModel/DataObjects/Issue.cs
@@ -4,12 +4,17 @@
 using Dapper;
 using Dapper.Contrib.Extensions;
 using GitHubExtension.Helpers;
+using Serilog;
 
 namespace GitHubExtension.DataModel;
 
 [Table("Issue")]
 public class Issue
 {
+    private static readonly Lazy<ILogger> _log = new(() => Serilog.Log.ForContext("SourceContext", $"DataModel/{nameof(Issue)}"));
+
+    private static readonly ILogger Log = _log.Value;
+
     [Key]
     public long Id { get; set; } = DataStore.NoForeignKey;
 
@@ -286,7 +291,7 @@ public static IEnumerable<Issue> GetAllForRepository(DataStore dataStore, Reposi
             RepositoryId = repository.Id,
         };
 
-        Log.Logger()?.ReportDebug(DataStore.GetSqlLogMessage(sql, param));
+        Log.Verbose(DataStore.GetSqlLogMessage(sql, param));
         var issues = dataStore.Connection!.Query<Issue>(sql, param, null) ?? Enumerable.Empty<Issue>();
         foreach (var issue in issues)
         {
@@ -310,7 +315,7 @@ public static IEnumerable<Issue> GetForSearch(DataStore dataStore, Search search
             SearchId = search.Id,
         };
 
-        Log.Logger()?.ReportDebug(DataStore.GetSqlLogMessage(sql, param));
+        Log.Verbose(DataStore.GetSqlLogMessage(sql, param));
         var issues = dataStore.Connection!.Query<Issue>(sql, param, null) ?? Enumerable.Empty<Issue>();
         foreach (var issue in issues)
         {
@@ -365,8 +370,8 @@ public static void DeleteLastObservedBefore(DataStore dataStore, long repository
         command.CommandText = sql;
         command.Parameters.AddWithValue("$Time", date.ToDataStoreInteger());
         command.Parameters.AddWithValue("$RepositoryId", repositoryId);
-        Log.Logger()?.ReportDebug(DataStore.GetCommandLogMessage(sql, command));
+        Log.Verbose(DataStore.GetCommandLogMessage(sql, command));
         var rowsDeleted = command.ExecuteNonQuery();
-        Log.Logger()?.ReportDebug(DataStore.GetDeletedLogMessage(rowsDeleted));
+        Log.Verbose(DataStore.GetDeletedLogMessage(rowsDeleted));
     }
 }
diff --git a/src/GitHubExtension/DataModel/DataObjects/IssueAssign.cs b/src/GitHubExtension/DataModel/DataObjects/IssueAssign.cs
index 578ab91..2bbc9d8 100644
--- a/src/GitHubExtension/DataModel/DataObjects/IssueAssign.cs
+++ b/src/GitHubExtension/DataModel/DataObjects/IssueAssign.cs
@@ -3,12 +3,17 @@
 
 using Dapper;
 using Dapper.Contrib.Extensions;
+using Serilog;
 
 namespace GitHubExtension.DataModel;
 
 [Table("IssueAssign")]
 public class IssueAssign
 {
+    private static readonly Lazy<ILogger> _log = new(() => Serilog.Log.ForContext("SourceContext", $"DataModel/{nameof(IssueAssign)}"));
+
+    private static readonly ILogger Log = _log.Value;
+
     [Key]
     public long Id { get; set; } = DataStore.NoForeignKey;
 
@@ -55,7 +60,7 @@ public static IEnumerable<User> GetUsersForIssue(DataStore dataStore, Issue issu
             IssueId = issue.Id,
         };
 
-        Log.Logger()?.ReportDebug(DataStore.GetSqlLogMessage(sql, param));
+        Log.Verbose(DataStore.GetSqlLogMessage(sql, param));
         return dataStore.Connection!.Query<User>(sql, param, null) ?? Enumerable.Empty<User>();
     }
 
diff --git a/src/GitHubExtension/DataModel/DataObjects/IssueLabel.cs b/src/GitHubExtension/DataModel/DataObjects/IssueLabel.cs
index 5ab44d4..86e3f92 100644
--- a/src/GitHubExtension/DataModel/DataObjects/IssueLabel.cs
+++ b/src/GitHubExtension/DataModel/DataObjects/IssueLabel.cs
@@ -3,12 +3,17 @@
 
 using Dapper;
 using Dapper.Contrib.Extensions;
+using Serilog;
 
 namespace GitHubExtension.DataModel;
 
 [Table("IssueLabel")]
 public class IssueLabel
 {
+    private static readonly Lazy<ILogger> _log = new(() => Serilog.Log.ForContext("SourceContext", $"DataModel/{nameof(IssueLabel)}"));
+
+    private static readonly ILogger Log = _log.Value;
+
     [Key]
     public long Id { get; set; } = DataStore.NoForeignKey;
 
@@ -55,7 +60,7 @@ public static IEnumerable<Label> GetLabelsForIssue(DataStore dataStore, Issue is
             IssueId = issue.Id,
         };
 
-        Log.Logger()?.ReportDebug(DataStore.GetSqlLogMessage(sql, param));
+        Log.Verbose(DataStore.GetSqlLogMessage(sql, param));
         return dataStore.Connection!.Query<Label>(sql, param, null) ?? Enumerable.Empty<Label>();
     }
 
diff --git a/src/GitHubExtension/DataModel/DataObjects/Label.cs b/src/GitHubExtension/DataModel/DataObjects/Label.cs
index 016f836..35cb19c 100644
--- a/src/GitHubExtension/DataModel/DataObjects/Label.cs
+++ b/src/GitHubExtension/DataModel/DataObjects/Label.cs
@@ -4,12 +4,17 @@
 using Dapper;
 using Dapper.Contrib.Extensions;
 using GitHubExtension.Helpers;
+using Serilog;
 
 namespace GitHubExtension.DataModel;
 
 [Table("Label")]
 public class Label
 {
+    private static readonly Lazy<ILogger> _log = new(() => Serilog.Log.ForContext("SourceContext", $"DataModel/{nameof(Label)}"));
+
+    private static readonly ILogger Log = _log.Value;
+
     // This is the time between seeing a potential updated label record and updating it.
     // This value / 2 is the average time between label changing on GitHub and having
     // it reflected in the datastore.
diff --git a/src/GitHubExtension/DataModel/DataObjects/MetaData.cs b/src/GitHubExtension/DataModel/DataObjects/MetaData.cs
index 2a2e878..7c67658 100644
--- a/src/GitHubExtension/DataModel/DataObjects/MetaData.cs
+++ b/src/GitHubExtension/DataModel/DataObjects/MetaData.cs
@@ -3,12 +3,17 @@
 
 using Dapper;
 using Dapper.Contrib.Extensions;
+using Serilog;
 
 namespace GitHubExtension.DataModel;
 
-[Table("Metadata")]
+[Table("MetaData")]
 public class MetaData
 {
+    private static readonly Lazy<ILogger> _log = new(() => Serilog.Log.ForContext("SourceContext", $"DataModel/{nameof(MetaData)}"));
+
+    private static readonly ILogger Log = _log.Value;
+
     [Key]
     public long Id { get; set; } = DataStore.NoForeignKey;
 
diff --git a/src/GitHubExtension/DataModel/DataObjects/Notification.cs b/src/GitHubExtension/DataModel/DataObjects/Notification.cs
index 3f7e715..ed16380 100644
--- a/src/GitHubExtension/DataModel/DataObjects/Notification.cs
+++ b/src/GitHubExtension/DataModel/DataObjects/Notification.cs
@@ -7,6 +7,7 @@
 using Microsoft.Windows.ApplicationModel.Resources;
 using Microsoft.Windows.AppNotifications;
 using Microsoft.Windows.AppNotifications.Builder;
+using Serilog;
 
 namespace GitHubExtension.DataModel;
 
@@ -24,6 +25,10 @@ namespace GitHubExtension.DataModel;
 [Table("Notification")]
 public class Notification
 {
+    private static readonly Lazy<ILogger> _log = new(() => Serilog.Log.ForContext("SourceContext", $"DataModel/{nameof(Notification)}"));
+
+    private static readonly ILogger Log = _log.Value;
+
     [Key]
     public long Id { get; set; } = DataStore.NoForeignKey;
 
@@ -93,7 +98,7 @@ public bool Toasted
                     // Catch errors so we do not throw for something like this. The local ToastState
                     // will still be set even if the datastore update fails. This could result in a
                     // toast later being shown twice, however, so report it as an error.
-                    Log.Logger()?.ReportError("Failed setting Notification ToastState for Notification Id = {Id}", ex);
+                    Log.Error(ex, "Failed setting Notification ToastState for Notification Id = {Id}");
                 }
             }
         }
@@ -170,7 +175,7 @@ private bool ShowFailedCheckRunToast()
     {
         try
         {
-            Notifications.Log.Logger()?.ReportInfo($"Showing Notification for {this}");
+            Log.Information($"Showing Notification for {this}");
             var resLoader = new ResourceLoader(ResourceLoader.GetDefaultResourceFilePath(), "GitHubExtension/Resources");
             var nb = new AppNotificationBuilder();
             nb.SetDuration(AppNotificationDuration.Long);
@@ -189,7 +194,7 @@ private bool ShowFailedCheckRunToast()
         }
         catch (Exception ex)
         {
-            Notifications.Log.Logger()?.ReportError($"Failed creating the Notification for {this}", ex);
+            Log.Error(ex, $"Failed creating the Notification for {this}");
             return false;
         }
 
@@ -200,7 +205,7 @@ private bool ShowSucceededCheckRunToast()
     {
         try
         {
-            Notifications.Log.Logger()?.ReportInfo($"Showing Notification for {this}");
+            Log.Information($"Showing Notification for {this}");
             var resLoader = new ResourceLoader(ResourceLoader.GetDefaultResourceFilePath(), "GitHubExtension/Resources");
             var nb = new AppNotificationBuilder();
             nb.SetDuration(AppNotificationDuration.Long);
@@ -219,7 +224,7 @@ private bool ShowSucceededCheckRunToast()
         }
         catch (Exception ex)
         {
-            Notifications.Log.Logger()?.ReportError($"Failed creating the Notification for {this}", ex);
+            Log.Error(ex, $"Failed creating the Notification for {this}");
             return false;
         }
 
@@ -230,7 +235,7 @@ private bool ShowNewReviewToast()
     {
         try
         {
-            Notifications.Log.Logger()?.ReportInfo($"Showing Notification for {this}");
+            Log.Information($"Showing Notification for {this}");
             var resLoader = new ResourceLoader(ResourceLoader.GetDefaultResourceFilePath(), "GitHubExtension/Resources");
             var nb = new AppNotificationBuilder();
             nb.SetDuration(AppNotificationDuration.Long);
@@ -262,7 +267,7 @@ private bool ShowNewReviewToast()
         }
         catch (Exception ex)
         {
-            Notifications.Log.Logger()?.ReportError($"Failed creating the Notification for {this}", ex);
+            Log.Error(ex, $"Failed creating the Notification for {this}");
             return false;
         }
 
@@ -333,7 +338,7 @@ public static IEnumerable<Notification> Get(DataStore dataStore, DateTime? since
             ToastedCount = includeToasted ? 1 : 0,
         };
 
-        Log.Logger()?.ReportDebug(DataStore.GetSqlLogMessage(sql, param));
+        Log.Verbose(DataStore.GetSqlLogMessage(sql, param));
         var notifications = dataStore.Connection!.Query<Notification>(sql, param, null) ?? Enumerable.Empty<Notification>();
         foreach (var notification in notifications)
         {
@@ -357,13 +362,13 @@ public static void SetOlderNotificationsToasted(DataStore dataStore, Notificatio
             notification.TimeOccurred,
         };
 
-        Log.Logger()?.ReportDebug(DataStore.GetSqlLogMessage(sql, param));
+        Log.Verbose(DataStore.GetSqlLogMessage(sql, param));
         var outDatedNotifications = dataStore.Connection!.Query<Notification>(sql, param, null) ?? Enumerable.Empty<Notification>();
         foreach (var olderNotification in outDatedNotifications)
         {
             olderNotification.DataStore = dataStore;
             olderNotification.Toasted = true;
-            Notifications.Log.Logger()?.ReportInfo($"Found older notification for {olderNotification.Identifier} with result {olderNotification.Result}, marking toasted.");
+            Log.Information($"Found older notification for {olderNotification.Identifier} with result {olderNotification.Result}, marking toasted.");
         }
     }
 
@@ -374,8 +379,8 @@ public static void DeleteBefore(DataStore dataStore, DateTime date)
         var command = dataStore.Connection!.CreateCommand();
         command.CommandText = sql;
         command.Parameters.AddWithValue("$Time", date.ToDataStoreInteger());
-        Log.Logger()?.ReportDebug(DataStore.GetCommandLogMessage(sql, command));
+        Log.Verbose(DataStore.GetCommandLogMessage(sql, command));
         var rowsDeleted = command.ExecuteNonQuery();
-        Log.Logger()?.ReportDebug(DataStore.GetDeletedLogMessage(rowsDeleted));
+        Log.Verbose(DataStore.GetDeletedLogMessage(rowsDeleted));
     }
 }
diff --git a/src/GitHubExtension/DataModel/DataObjects/PullRequest.cs b/src/GitHubExtension/DataModel/DataObjects/PullRequest.cs
index c07052c..9f179bb 100644
--- a/src/GitHubExtension/DataModel/DataObjects/PullRequest.cs
+++ b/src/GitHubExtension/DataModel/DataObjects/PullRequest.cs
@@ -4,12 +4,17 @@
 using Dapper;
 using Dapper.Contrib.Extensions;
 using GitHubExtension.Helpers;
+using Serilog;
 
 namespace GitHubExtension.DataModel;
 
 [Table("PullRequest")]
 public class PullRequest
 {
+    private static readonly Lazy<ILogger> _log = new(() => Serilog.Log.ForContext("SourceContext", $"DataModel/{nameof(PullRequest)}"));
+
+    private static readonly ILogger Log = _log.Value;
+
     [Key]
     public long Id { get; set; } = DataStore.NoForeignKey;
 
@@ -486,7 +491,7 @@ public static IEnumerable<PullRequest> GetAllForRepository(DataStore dataStore,
             RepositoryId = repository.Id,
         };
 
-        Log.Logger()?.ReportDebug(DataStore.GetSqlLogMessage(sql, param));
+        Log.Verbose(DataStore.GetSqlLogMessage(sql, param));
         var pulls = dataStore.Connection!.Query<PullRequest>(sql, param, null) ?? Enumerable.Empty<PullRequest>();
         foreach (var pull in pulls)
         {
@@ -504,7 +509,7 @@ public static IEnumerable<PullRequest> GetAllForUser(DataStore dataStore, User u
             AuthorId = user.Id,
         };
 
-        Log.Logger()?.ReportDebug(DataStore.GetSqlLogMessage(sql, param));
+        Log.Verbose(DataStore.GetSqlLogMessage(sql, param));
         var pulls = dataStore.Connection!.Query<PullRequest>(sql, param, null) ?? Enumerable.Empty<PullRequest>();
         foreach (var pull in pulls)
         {
@@ -559,9 +564,9 @@ public static void DeleteLastObservedBefore(DataStore dataStore, long repository
         command.CommandText = sql;
         command.Parameters.AddWithValue("$Time", date.ToDataStoreInteger());
         command.Parameters.AddWithValue("$RepositoryId", repositoryId);
-        Log.Logger()?.ReportDebug(DataStore.GetCommandLogMessage(sql, command));
+        Log.Verbose(DataStore.GetCommandLogMessage(sql, command));
         var rowsDeleted = command.ExecuteNonQuery();
-        Log.Logger()?.ReportDebug(DataStore.GetDeletedLogMessage(rowsDeleted));
+        Log.Verbose(DataStore.GetDeletedLogMessage(rowsDeleted));
     }
 
     // Delete all records from a particular user before the specified date.
@@ -582,9 +587,9 @@ public static void DeleteAllByDeveloperLoginAndLastObservedBefore(DataStore data
             command.CommandText = sql;
             command.Parameters.AddWithValue("$Time", date.ToDataStoreInteger());
             command.Parameters.AddWithValue("$UserId", user.Id);
-            Log.Logger()?.ReportDebug(DataStore.GetCommandLogMessage(sql, command));
+            Log.Verbose(DataStore.GetCommandLogMessage(sql, command));
             var rowsDeleted = command.ExecuteNonQuery();
-            Log.Logger()?.ReportDebug(DataStore.GetDeletedLogMessage(rowsDeleted));
+            Log.Verbose(DataStore.GetDeletedLogMessage(rowsDeleted));
             break;
         }
     }
diff --git a/src/GitHubExtension/DataModel/DataObjects/PullRequestAssign.cs b/src/GitHubExtension/DataModel/DataObjects/PullRequestAssign.cs
index 3034cfe..ef6be93 100644
--- a/src/GitHubExtension/DataModel/DataObjects/PullRequestAssign.cs
+++ b/src/GitHubExtension/DataModel/DataObjects/PullRequestAssign.cs
@@ -3,12 +3,17 @@
 
 using Dapper;
 using Dapper.Contrib.Extensions;
+using Serilog;
 
 namespace GitHubExtension.DataModel;
 
 [Table("PullRequestAssign")]
 public class PullRequestAssign
 {
+    private static readonly Lazy<ILogger> _log = new(() => Serilog.Log.ForContext("SourceContext", $"DataModel/{nameof(PullRequestAssign)}"));
+
+    private static readonly ILogger Log = _log.Value;
+
     [Key]
     public long Id { get; set; } = DataStore.NoForeignKey;
 
@@ -57,7 +62,7 @@ public static IEnumerable<User> GetUsersForPullRequest(DataStore dataStore, Pull
             PullId = pull.Id,
         };
 
-        Log.Logger()?.ReportDebug(DataStore.GetSqlLogMessage(sql, param));
+        Log.Verbose(DataStore.GetSqlLogMessage(sql, param));
         return dataStore.Connection!.Query<User>(sql, param, null) ?? Enumerable.Empty<User>();
     }
 
diff --git a/src/GitHubExtension/DataModel/DataObjects/PullRequestLabel.cs b/src/GitHubExtension/DataModel/DataObjects/PullRequestLabel.cs
index ffd0807..af3be89 100644
--- a/src/GitHubExtension/DataModel/DataObjects/PullRequestLabel.cs
+++ b/src/GitHubExtension/DataModel/DataObjects/PullRequestLabel.cs
@@ -3,12 +3,17 @@
 
 using Dapper;
 using Dapper.Contrib.Extensions;
+using Serilog;
 
 namespace GitHubExtension.DataModel;
 
 [Table("PullRequestLabel")]
 public class PullRequestLabel
 {
+    private static readonly Lazy<ILogger> _log = new(() => Serilog.Log.ForContext("SourceContext", $"DataModel/{nameof(PullRequestLabel)}"));
+
+    private static readonly ILogger Log = _log.Value;
+
     [Key]
     public long Id { get; set; } = DataStore.NoForeignKey;
 
@@ -55,7 +60,7 @@ public static IEnumerable<Label> GetLabelsForPullRequest(DataStore dataStore, Pu
             PullId = pull.Id,
         };
 
-        Log.Logger()?.ReportDebug(DataStore.GetSqlLogMessage(sql, param));
+        Log.Verbose(DataStore.GetSqlLogMessage(sql, param));
         return dataStore.Connection!.Query<Label>(sql, param, null) ?? Enumerable.Empty<Label>();
     }
 
diff --git a/src/GitHubExtension/DataModel/DataObjects/PullRequestStatus.cs b/src/GitHubExtension/DataModel/DataObjects/PullRequestStatus.cs
index 4de8ea5..ec89c1b 100644
--- a/src/GitHubExtension/DataModel/DataObjects/PullRequestStatus.cs
+++ b/src/GitHubExtension/DataModel/DataObjects/PullRequestStatus.cs
@@ -4,6 +4,7 @@
 using Dapper;
 using Dapper.Contrib.Extensions;
 using GitHubExtension.Helpers;
+using Serilog;
 
 namespace GitHubExtension.DataModel;
 
@@ -13,6 +14,10 @@ namespace GitHubExtension.DataModel;
 [Table("PullRequestStatus")]
 public class PullRequestStatus
 {
+    private static readonly Lazy<ILogger> _log = new(() => Serilog.Log.ForContext("SourceContext", $"DataModel/{nameof(PullRequestStatus)}"));
+
+    private static readonly ILogger Log = _log.Value;
+
     [Key]
     public long Id { get; set; } = DataStore.NoForeignKey;
 
@@ -159,7 +164,7 @@ public static PullRequestStatus Create(PullRequest pullRequest)
             PullRequestId = pullRequest.Id,
         };
 
-        Log.Logger()?.ReportDebug(DataStore.GetSqlLogMessage(sql, param));
+        Log.Verbose(DataStore.GetSqlLogMessage(sql, param));
         var pullRequestStatus = dataStore.Connection!.QueryFirstOrDefault<PullRequestStatus>(sql, param, null);
         if (pullRequestStatus is not null)
         {
@@ -174,7 +179,7 @@ public static PullRequestStatus Add(DataStore dataStore, PullRequest pullRequest
     {
         var pullRequestStatus = Create(pullRequest);
         pullRequestStatus.Id = dataStore.Connection!.Insert(pullRequestStatus);
-        Log.Logger()?.ReportDebug($"Inserted PullRequestStatus, Id = {pullRequestStatus.Id}");
+        Log.Debug($"Inserted PullRequestStatus, Id = {pullRequestStatus.Id}");
 
         // Remove older records we no longer need.
         DeleteOutdatedForPullRequest(dataStore, pullRequest);
@@ -190,9 +195,9 @@ public static void DeleteOutdatedForPullRequest(DataStore dataStore, PullRequest
         var command = dataStore.Connection!.CreateCommand();
         command.CommandText = sql;
         command.Parameters.AddWithValue("$Id", pullRequest.Id);
-        Log.Logger()?.ReportDebug(DataStore.GetCommandLogMessage(sql, command));
+        Log.Verbose(DataStore.GetCommandLogMessage(sql, command));
         var rowsDeleted = command.ExecuteNonQuery();
-        Log.Logger()?.ReportDebug(DataStore.GetDeletedLogMessage(rowsDeleted));
+        Log.Verbose(DataStore.GetDeletedLogMessage(rowsDeleted));
     }
 
     public static void DeleteUnreferenced(DataStore dataStore)
@@ -203,9 +208,9 @@ public static void DeleteUnreferenced(DataStore dataStore)
         var sql = @"DELETE FROM PullRequestStatus WHERE HeadSha NOT IN (SELECT HeadSha FROM PullRequest)";
         var command = dataStore.Connection!.CreateCommand();
         command.CommandText = sql;
-        Log.Logger()?.ReportDebug(DataStore.GetCommandLogMessage(sql, command));
+        Log.Verbose(DataStore.GetCommandLogMessage(sql, command));
         var rowsDeleted = command.ExecuteNonQuery();
-        Log.Logger()?.ReportDebug(DataStore.GetDeletedLogMessage(rowsDeleted));
+        Log.Verbose(DataStore.GetDeletedLogMessage(rowsDeleted));
     }
 
     private PullRequestCombinedStatus GetCombinedStatus()
@@ -229,7 +234,7 @@ private PullRequestCombinedStatus GetCombinedStatus()
             return PullRequestCombinedStatus.Success;
         }
 
-        Log.Logger()?.ReportWarn($"Unknown PR Status:  State={State} Status={Status} Conclusion={Conclusion}");
+        Log.Warning($"Unknown PR Status:  State={State} Status={Status} Conclusion={Conclusion}");
         return PullRequestCombinedStatus.Unknown;
     }
 }
diff --git a/src/GitHubExtension/DataModel/DataObjects/Release.cs b/src/GitHubExtension/DataModel/DataObjects/Release.cs
index 55eca59..8cdf72c 100644
--- a/src/GitHubExtension/DataModel/DataObjects/Release.cs
+++ b/src/GitHubExtension/DataModel/DataObjects/Release.cs
@@ -4,12 +4,17 @@
 using Dapper;
 using Dapper.Contrib.Extensions;
 using GitHubExtension.Helpers;
+using Serilog;
 
 namespace GitHubExtension.DataModel;
 
 [Table("Release")]
 public class Release
 {
+    private static readonly Lazy<ILogger> _log = new(() => Serilog.Log.ForContext("SourceContext", $"DataModel/{nameof(Release)}"));
+
+    private static readonly ILogger Log = _log.Value;
+
     [Key]
     public long Id { get; set; } = DataStore.NoForeignKey;
 
@@ -66,7 +71,7 @@ public static IEnumerable<Release> GetAllForRepository(DataStore dataStore, Repo
             RepositoryId = repository.Id,
         };
 
-        Log.Logger()?.ReportDebug(DataStore.GetSqlLogMessage(sql, param));
+        Log.Verbose(DataStore.GetSqlLogMessage(sql, param));
         var releases = dataStore.Connection!.Query<Release>(sql, param, null) ?? Enumerable.Empty<Release>();
         foreach (var release in releases)
         {
@@ -104,9 +109,9 @@ public static void DeleteLastObservedBefore(DataStore dataStore, long repository
         command.CommandText = sql;
         command.Parameters.AddWithValue("$Time", date.ToDataStoreInteger());
         command.Parameters.AddWithValue("$RepositoryId", repositoryId);
-        Log.Logger()?.ReportDebug(DataStore.GetCommandLogMessage(sql, command));
+        Log.Verbose(DataStore.GetCommandLogMessage(sql, command));
         var rowsDeleted = command.ExecuteNonQuery();
-        Log.Logger()?.ReportDebug(DataStore.GetDeletedLogMessage(rowsDeleted));
+        Log.Verbose(DataStore.GetDeletedLogMessage(rowsDeleted));
     }
 
     private static Release CreateFromOctokitRelease(DataStore dataStore, Octokit.Release okitRelease, Repository repository)
@@ -154,8 +159,8 @@ public static void DeleteBefore(DataStore dataStore, DateTime date)
         var command = dataStore.Connection!.CreateCommand();
         command.CommandText = sql;
         command.Parameters.AddWithValue("$Time", date.ToDataStoreInteger());
-        Log.Logger()?.ReportDebug(DataStore.GetCommandLogMessage(sql, command));
+        Log.Verbose(DataStore.GetCommandLogMessage(sql, command));
         var rowsDeleted = command.ExecuteNonQuery();
-        Log.Logger()?.ReportDebug(DataStore.GetDeletedLogMessage(rowsDeleted));
+        Log.Verbose(DataStore.GetDeletedLogMessage(rowsDeleted));
     }
 }
diff --git a/src/GitHubExtension/DataModel/DataObjects/Repository.cs b/src/GitHubExtension/DataModel/DataObjects/Repository.cs
index 2fbaf5b..a48aff3 100644
--- a/src/GitHubExtension/DataModel/DataObjects/Repository.cs
+++ b/src/GitHubExtension/DataModel/DataObjects/Repository.cs
@@ -4,12 +4,17 @@
 using Dapper;
 using Dapper.Contrib.Extensions;
 using GitHubExtension.Helpers;
+using Serilog;
 
 namespace GitHubExtension.DataModel;
 
 [Table("Repository")]
 public class Repository
 {
+    private static readonly Lazy<ILogger> _log = new(() => Serilog.Log.ForContext("SourceContext", $"DataModel/{nameof(Repository)}"));
+
+    private static readonly ILogger Log = _log.Value;
+
     [Key]
     public long Id { get; set; } = DataStore.NoForeignKey;
 
@@ -257,7 +262,7 @@ public static IEnumerable<Repository> GetAll(DataStore dataStore)
             Owner = owner,
         };
 
-        Log.Logger()?.ReportDebug(DataStore.GetSqlLogMessage(sql, param));
+        Log.Verbose(DataStore.GetSqlLogMessage(sql, param));
         var repo = dataStore.Connection!.QueryFirstOrDefault<Repository>(sql, param, null);
         if (repo is not null)
         {
@@ -272,7 +277,7 @@ public static IEnumerable<Repository> GetAll(DataStore dataStore)
         var nameSplit = fullName.Split(new[] { '/' }, 2);
         if (nameSplit.Length != 2)
         {
-            Log.Logger()?.ReportWarn($"Invalid fullName input into Repository.Get: {fullName}");
+            Log.Warning($"Invalid fullName input into Repository.Get: {fullName}");
             return null;
         }
 
diff --git a/src/GitHubExtension/DataModel/DataObjects/Review.cs b/src/GitHubExtension/DataModel/DataObjects/Review.cs
index b3db32f..265b6c6 100644
--- a/src/GitHubExtension/DataModel/DataObjects/Review.cs
+++ b/src/GitHubExtension/DataModel/DataObjects/Review.cs
@@ -4,12 +4,17 @@
 using Dapper;
 using Dapper.Contrib.Extensions;
 using GitHubExtension.Helpers;
+using Serilog;
 
 namespace GitHubExtension.DataModel;
 
 [Table("Review")]
 public class Review
 {
+    private static readonly Lazy<ILogger> _log = new(() => Serilog.Log.ForContext("SourceContext", $"DataModel/{nameof(Review)}"));
+
+    private static readonly ILogger Log = _log.Value;
+
     [Key]
     public long Id { get; set; } = DataStore.NoForeignKey;
 
@@ -172,7 +177,7 @@ public static IEnumerable<Review> GetAllForPullRequest(DataStore dataStore, Pull
             PullRequestId = pullRequest.Id,
         };
 
-        Log.Logger()?.ReportDebug(DataStore.GetSqlLogMessage(sql, param));
+        Log.Verbose(DataStore.GetSqlLogMessage(sql, param));
         var reviews = dataStore.Connection!.Query<Review>(sql, param, null) ?? Enumerable.Empty<Review>();
         foreach (var review in reviews)
         {
@@ -190,7 +195,7 @@ public static IEnumerable<Review> GetAllForUser(DataStore dataStore, User user)
             AuthorId = user.Id,
         };
 
-        Log.Logger()?.ReportDebug(DataStore.GetSqlLogMessage(sql, param));
+        Log.Verbose(DataStore.GetSqlLogMessage(sql, param));
         var reviews = dataStore.Connection!.Query<Review>(sql, param, null) ?? Enumerable.Empty<Review>();
         foreach (var review in reviews)
         {
@@ -206,8 +211,8 @@ public static void DeleteUnreferenced(DataStore dataStore)
         var sql = @"DELETE FROM Review WHERE PullRequestId NOT IN (SELECT Id FROM PullRequest)";
         var command = dataStore.Connection!.CreateCommand();
         command.CommandText = sql;
-        Log.Logger()?.ReportDebug(DataStore.GetCommandLogMessage(sql, command));
+        Log.Verbose(DataStore.GetCommandLogMessage(sql, command));
         var rowsDeleted = command.ExecuteNonQuery();
-        Log.Logger()?.ReportDebug(DataStore.GetDeletedLogMessage(rowsDeleted));
+        Log.Verbose(DataStore.GetDeletedLogMessage(rowsDeleted));
     }
 }
diff --git a/src/GitHubExtension/DataModel/DataObjects/Search.cs b/src/GitHubExtension/DataModel/DataObjects/Search.cs
index e445c6d..31e46ab 100644
--- a/src/GitHubExtension/DataModel/DataObjects/Search.cs
+++ b/src/GitHubExtension/DataModel/DataObjects/Search.cs
@@ -4,12 +4,17 @@
 using Dapper;
 using Dapper.Contrib.Extensions;
 using GitHubExtension.Helpers;
+using Serilog;
 
 namespace GitHubExtension.DataModel;
 
 [Table("Search")]
 public class Search
 {
+    private static readonly Lazy<ILogger> _log = new(() => Serilog.Log.ForContext("SourceContext", $"DataModel/{nameof(Search)}"));
+
+    private static readonly ILogger Log = _log.Value;
+
     // This is the time between seeing a search and updating it's TimeUpdated.
     private static readonly long UpdateThreshold = TimeSpan.FromMinutes(2).Ticks;
 
@@ -92,8 +97,8 @@ public static void DeleteBefore(DataStore dataStore, DateTime date)
         var command = dataStore.Connection!.CreateCommand();
         command.CommandText = sql;
         command.Parameters.AddWithValue("$Time", date.ToDataStoreInteger());
-        Log.Logger()?.ReportDebug(DataStore.GetCommandLogMessage(sql, command));
+        Log.Verbose(DataStore.GetCommandLogMessage(sql, command));
         var rowsDeleted = command.ExecuteNonQuery();
-        Log.Logger()?.ReportDebug(DataStore.GetDeletedLogMessage(rowsDeleted));
+        Log.Verbose(DataStore.GetDeletedLogMessage(rowsDeleted));
     }
 }
diff --git a/src/GitHubExtension/DataModel/DataObjects/SearchIssue.cs b/src/GitHubExtension/DataModel/DataObjects/SearchIssue.cs
index 7c22649..169c200 100644
--- a/src/GitHubExtension/DataModel/DataObjects/SearchIssue.cs
+++ b/src/GitHubExtension/DataModel/DataObjects/SearchIssue.cs
@@ -4,12 +4,17 @@
 using Dapper;
 using Dapper.Contrib.Extensions;
 using GitHubExtension.Helpers;
+using Serilog;
 
 namespace GitHubExtension.DataModel;
 
 [Table("SearchIssue")]
 public class SearchIssue
 {
+    private static readonly Lazy<ILogger> _log = new(() => Serilog.Log.ForContext("SourceContext", $"DataModel/{nameof(SearchIssue)}"));
+
+    private static readonly ILogger Log = _log.Value;
+
     [Key]
     public long Id { get; set; } = DataStore.NoForeignKey;
 
@@ -63,9 +68,9 @@ public static void DeleteUnreferenced(DataStore dataStore)
         var sql = @"DELETE FROM SearchIssue WHERE (Search NOT IN (SELECT Id FROM Search)) OR (Issue NOT IN (SELECT Id FROM Issue))";
         var command = dataStore.Connection!.CreateCommand();
         command.CommandText = sql;
-        Log.Logger()?.ReportDebug(DataStore.GetCommandLogMessage(sql, command));
+        Log.Verbose(DataStore.GetCommandLogMessage(sql, command));
         var rowsDeleted = command.ExecuteNonQuery();
-        Log.Logger()?.ReportDebug(DataStore.GetDeletedLogMessage(rowsDeleted));
+        Log.Verbose(DataStore.GetDeletedLogMessage(rowsDeleted));
     }
 
     public static void DeleteBefore(DataStore dataStore, Search search, DateTime date)
@@ -76,8 +81,8 @@ public static void DeleteBefore(DataStore dataStore, Search search, DateTime dat
         command.CommandText = sql;
         command.Parameters.AddWithValue("$Time", date.ToDataStoreInteger());
         command.Parameters.AddWithValue("$SearchId", search.Id);
-        Log.Logger()?.ReportDebug(DataStore.GetCommandLogMessage(sql, command));
+        Log.Verbose(DataStore.GetCommandLogMessage(sql, command));
         var rowsDeleted = command.ExecuteNonQuery();
-        Log.Logger()?.ReportDebug(DataStore.GetDeletedLogMessage(rowsDeleted));
+        Log.Verbose(DataStore.GetDeletedLogMessage(rowsDeleted));
     }
 }
diff --git a/src/GitHubExtension/DataModel/DataObjects/User.cs b/src/GitHubExtension/DataModel/DataObjects/User.cs
index 50407a7..6a5ac9a 100644
--- a/src/GitHubExtension/DataModel/DataObjects/User.cs
+++ b/src/GitHubExtension/DataModel/DataObjects/User.cs
@@ -5,12 +5,17 @@
 using Dapper.Contrib.Extensions;
 using GitHubExtension.DeveloperId;
 using GitHubExtension.Helpers;
+using Serilog;
 
 namespace GitHubExtension.DataModel;
 
 [Table("User")]
 public class User
 {
+    private static readonly Lazy<ILogger> _log = new(() => Serilog.Log.ForContext("SourceContext", $"DataModel/{nameof(User)}"));
+
+    private static readonly ILogger Log = _log.Value;
+
     // This is the time between seeing a potential updated user record and updating it.
     // This value / 2 is the average time between user updating their user data and having
     // it reflected in the datastore.
@@ -151,7 +156,7 @@ public static IEnumerable<User> GetDeveloperUsers(DataStore dataStore)
             DeveloperIds = GetDeveloperLoginIds(),
         };
 
-        Log.Logger()?.ReportDebug(DataStore.GetSqlLogMessage(sql, param));
+        Log.Verbose(DataStore.GetSqlLogMessage(sql, param));
         var users = dataStore.Connection!.Query<User>(sql, param) ?? Enumerable.Empty<User>();
         foreach (var user in users)
         {
diff --git a/src/GitHubExtension/DataModel/DataStore.cs b/src/GitHubExtension/DataModel/DataStore.cs
index dc6379a..24a4cb4 100644
--- a/src/GitHubExtension/DataModel/DataStore.cs
+++ b/src/GitHubExtension/DataModel/DataStore.cs
@@ -6,11 +6,16 @@
 using System.Text;
 using GitHubExtension.Helpers;
 using Microsoft.Data.Sqlite;
+using Serilog;
 
 namespace GitHubExtension.DataModel;
 
 public class DataStore : IDisposable
 {
+    private static readonly Lazy<ILogger> _log = new(() => Serilog.Log.ForContext("SourceContext", nameof(DataStore)));
+
+    private static readonly ILogger Log = _log.Value;
+
     public string Name { get; private set; }
 
     public const long NoForeignKey = 0;
@@ -53,7 +58,7 @@ public bool Create(bool deleteExistingDatabase = false)
                         // migration method is to delete the existing database and create anew.
                         deleteExistingDatabase = true;
                         Close();
-                        Log.Logger()?.ReportInfo($"Schema mismatch. Expected: {schema.SchemaVersion}  Actual: {currentSchemaVersion}");
+                        Log.Information($"Schema mismatch. Expected: {schema.SchemaVersion}  Actual: {currentSchemaVersion}");
                     }
                 }
                 catch (SqliteException e)
@@ -61,7 +66,7 @@ public bool Create(bool deleteExistingDatabase = false)
                     // if we had a problem opening the DB and fetching the pragma, then
                     // we surely cannot reuse it.
                     deleteExistingDatabase = true;
-                    Log.Logger()?.ReportError($"Unable to open existing database to verify schema. Deleting database.", e);
+                    Log.Error(e, $"Unable to open existing database to verify schema. Deleting database.");
                 }
             }
 
@@ -71,7 +76,7 @@ public bool Create(bool deleteExistingDatabase = false)
             }
             else
             {
-                Log.Logger()?.ReportWarn($"Deleting database: {DataStoreFilePath}");
+                Log.Warning($"Deleting database: {DataStoreFilePath}");
 
                 if (IsConnected)
                 {
@@ -87,16 +92,16 @@ public bool Create(bool deleteExistingDatabase = false)
                 {
                     if ((uint)e.HResult == 0x80070020)
                     {
-                        Log.Logger()?.ReportCritical($"Sharing Violation Error; datastore exists and cannot be deleted ({DataStoreFilePath})", e);
+                        Log.Fatal(e, $"Sharing Violation Error; datastore exists and cannot be deleted ({DataStoreFilePath})");
                     }
                     else
                     {
-                        Log.Logger()?.ReportCritical($"I/O Error ({DataStoreFilePath})", e);
+                        Log.Fatal(e, $"I/O Error ({DataStoreFilePath})");
                     }
                 }
                 catch (UnauthorizedAccessException e)
                 {
-                    Log.Logger()?.ReportCritical($"Access Denied ({e})", e);
+                    Log.Fatal(e, $"Access Denied ({e})");
                 }
             }
         }
@@ -104,7 +109,7 @@ public bool Create(bool deleteExistingDatabase = false)
         // Report creating new if it didn't exist or it was successfully deleted.
         if (!File.Exists(DataStoreFilePath))
         {
-            Log.Logger()?.ReportInfo($"Creating new DataStore at {DataStoreFilePath}");
+            Log.Information($"Creating new DataStore at {DataStoreFilePath}");
         }
 
         // Ensure Directory exists. Sqlite open database will create a file
@@ -113,14 +118,14 @@ public bool Create(bool deleteExistingDatabase = false)
         if (!Directory.Exists(directory))
         {
             // Create the directory.
-            Log.Logger()?.ReportInfo($"Creating root directory: {directory}");
+            Log.Information($"Creating root directory: {directory}");
             try
             {
                 Directory.CreateDirectory(directory!);
             }
             catch (Exception e)
             {
-                Log.Logger()?.ReportCritical($"Failed creating directory: ({directory})", e);
+                Log.Fatal(e, $"Failed creating directory: ({directory})");
             }
         }
 
@@ -136,11 +141,11 @@ public void Open()
     {
         if (Connection is not null)
         {
-            Log.Logger()?.ReportDebug($"Connection is already open.");
+            Log.Verbose($"Connection is already open.");
             return;
         }
 
-        Log.Logger()?.ReportDebug($"Opening datastore {DataStoreFilePath}");
+        Log.Verbose($"Opening datastore {DataStoreFilePath}");
         disposed = false;
         var builder = new SqliteConnectionStringBuilder
         {
@@ -149,7 +154,7 @@ public void Open()
             Cache = SqliteCacheMode.Shared,
         };
         Connection = new SqliteConnection(builder.ToString());
-        Log.Logger()?.ReportDebug($"SL: new SqliteConnection: {Connection.ConnectionString}");
+        Log.Verbose($"SL: new SqliteConnection: {Connection.ConnectionString}");
 
         try
         {
@@ -158,15 +163,15 @@ public void Open()
         }
         catch (SqliteException e)
         {
-            Log.Logger()?.ReportCritical($"Failed to open connection: {Connection.ConnectionString}", e);
+            Log.Fatal(e, $"Failed to open connection: {Connection.ConnectionString}");
         }
 
-        Log.Logger()?.ReportDebug($"Opened DataStore at {DataStoreFilePath}");
+        Log.Debug($"Opened DataStore at {DataStoreFilePath}");
     }
 
     private void CreateSchema()
     {
-        Log.Logger()?.ReportDebug("Creating Schema");
+        Log.Debug("Creating Schema");
         SetPragma("encoding", "\"UTF-8\"");
 
         using var tx = BeginTransaction();
@@ -176,7 +181,7 @@ private void CreateSchema()
             Execute(sql);
         }
 
-        Log.Logger()?.ReportDebug($"Created schema ({sqls.Count} entities)");
+        Log.Debug($"Created schema ({sqls.Count} entities)");
         SetPragma("user_version", schema.SchemaVersion);
         tx.Commit();
     }
@@ -254,7 +259,7 @@ private void Execute(string sql)
         }
         catch (SqliteException e)
         {
-            Log.Logger()?.ReportError($"Failure executing SQL Command: {command.CommandText}", e);
+            Log.Error(e, $"Failure executing SQL Command: {command.CommandText}");
         }
     }
 
@@ -280,7 +285,7 @@ public void Close()
         if (Connection != null)
         {
             Connection.Close();
-            Log.Logger()?.ReportDebug("DataStore closed.");
+            Log.Debug("DataStore closed.");
             Connection = null;
             SqliteConnection.ClearAllPools();
         }
diff --git a/src/GitHubExtension/DataModel/GitHubDataStoreSchema.cs b/src/GitHubExtension/DataModel/GitHubDataStoreSchema.cs
index 440a64a..4b5401f 100644
--- a/src/GitHubExtension/DataModel/GitHubDataStoreSchema.cs
+++ b/src/GitHubExtension/DataModel/GitHubDataStoreSchema.cs
@@ -14,15 +14,15 @@ public GitHubDataStoreSchema()
     }
 
     // Update this anytime incompatible changes happen with a released version.
-    private const long SchemaVersionValue = 0x0007;
+    private const long SchemaVersionValue = 0x0008;
 
-    private static readonly string Metadata =
-    @"CREATE TABLE Metadata (" +
+    private static readonly string MetaData =
+    @"CREATE TABLE MetaData (" +
         "Id INTEGER PRIMARY KEY NOT NULL," +
         "Key TEXT NOT NULL COLLATE NOCASE," +
         "Value TEXT NULL COLLATE NOCASE" +
     ");" +
-    "CREATE UNIQUE INDEX IDX_Metadata_Key ON Metadata (Key);";
+    "CREATE UNIQUE INDEX IDX_MetaData_Key ON MetaData (Key);";
 
     private static readonly string User =
     @"CREATE TABLE User (" +
@@ -266,7 +266,7 @@ public GitHubDataStoreSchema()
     // All Sqls together.
     private static readonly List<string> SchemaSqlsValue = new()
     {
-        Metadata,
+        MetaData,
         User,
         Repository,
         Label,
diff --git a/src/GitHubExtension/DataModel/Log.cs b/src/GitHubExtension/DataModel/Log.cs
deleted file mode 100644
index 72b823c..0000000
--- a/src/GitHubExtension/DataModel/Log.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using DevHome.Logging;
-using Windows.Storage;
-
-namespace GitHubExtension.DataModel;
-
-public class Log
-{
-    private static Logger? _logger;
-
-    public static Logger? Logger()
-    {
-        try
-        {
-            _logger ??= new Logger("DataStore", GetLoggingOptions());
-        }
-        catch
-        {
-            // Do nothing if logger fails.
-        }
-
-        return _logger;
-    }
-
-    public static void Attach(Logger logger)
-    {
-        if (logger is not null)
-        {
-            _logger?.Dispose();
-            _logger = logger;
-        }
-    }
-
-    public static Options GetLoggingOptions()
-    {
-        return new Options
-        {
-            LogFileFolderRoot = ApplicationData.Current.TemporaryFolder.Path,
-            LogFileName = "DataStore_{now}.dhlog",
-            LogFileFolderName = "DataStore",
-            DebugListenerEnabled = true,
-#if DEBUG
-            LogStdoutEnabled = true,
-            LogStdoutFilter = SeverityLevel.Info,
-            LogFileFilter = SeverityLevel.Info,
-#else
-            LogStdoutEnabled = false,
-            LogStdoutFilter = SeverityLevel.Info,
-            LogFileFilter = SeverityLevel.Info,
-#endif
-            FailFastSeverity = FailFastSeverityLevel.Critical,
-        };
-    }
-}
diff --git a/src/GitHubExtension/DeveloperId/CredentialVault.cs b/src/GitHubExtension/DeveloperId/CredentialVault.cs
index cfe453e..bf64555 100644
--- a/src/GitHubExtension/DeveloperId/CredentialVault.cs
+++ b/src/GitHubExtension/DeveloperId/CredentialVault.cs
@@ -4,6 +4,7 @@
 using System.ComponentModel;
 using System.Runtime.InteropServices;
 using System.Security;
+using Serilog;
 using Windows.Security.Credentials;
 using static GitHubExtension.DeveloperId.CredentialManager;
 
@@ -11,6 +12,10 @@ namespace GitHubExtension.DeveloperId;
 
 public class CredentialVault : ICredentialVault
 {
+    private static readonly Lazy<ILogger> _log = new(() => Serilog.Log.ForContext("SourceContext", nameof(CredentialVault)));
+
+    private static readonly ILogger Log = _log.Value;
+
     private readonly string _credentialResourceName;
 
     private static class CredentialVaultConfiguration
@@ -51,7 +56,7 @@ public void SaveCredentials(string loginId, SecureString? accessToken)
             }
             else
             {
-                Log.Logger()?.ReportInfo($"The access token is null for the loginId provided");
+                Log.Information($"The access token is null for the loginId provided");
                 throw new ArgumentNullException(nameof(accessToken));
             }
 
@@ -59,7 +64,7 @@ public void SaveCredentials(string loginId, SecureString? accessToken)
             var isCredentialSaved = CredWrite(credential, 0);
             if (!isCredentialSaved)
             {
-                Log.Logger()?.ReportInfo($"Writing credentials to Credential Manager has failed");
+                Log.Information($"Writing credentials to Credential Manager has failed");
                 throw new Win32Exception(Marshal.GetLastWin32Error());
             }
         }
@@ -83,7 +88,7 @@ public void SaveCredentials(string loginId, SecureString? accessToken)
             if (!isCredentialRetrieved)
             {
                 var error = Marshal.GetLastWin32Error();
-                Log.Logger()?.ReportError($"Retrieving credentials from Credential Manager has failed for {loginId} with {error}");
+                Log.Error($"Retrieving credentials from Credential Manager has failed for {loginId} with {error}");
 
                 // NotFound is expected and can be ignored.
                 if (error == Win32ErrorNotFound)
@@ -104,7 +109,7 @@ public void SaveCredentials(string loginId, SecureString? accessToken)
             }
             else
             {
-                Log.Logger()?.ReportError($"No credentials found for this DeveloperId : {loginId}");
+                Log.Error($"No credentials found for this DeveloperId : {loginId}");
                 return null;
             }
 
@@ -125,7 +130,7 @@ public void SaveCredentials(string loginId, SecureString? accessToken)
         }
         catch (Exception ex)
         {
-            Log.Logger()?.ReportError($"Retrieving credentials from Credential Manager has failed unexpectedly: {loginId} : ", ex);
+            Log.Error(ex, $"Retrieving credentials from Credential Manager has failed unexpectedly: {loginId} : ");
             throw;
         }
         finally
@@ -143,7 +148,7 @@ public void RemoveCredentials(string loginId)
         var isCredentialDeleted = CredDelete(targetCredentialToDelete, CRED_TYPE.GENERIC, 0);
         if (!isCredentialDeleted)
         {
-            Log.Logger()?.ReportError($"Deleting credentials from Credential Manager has failed for {loginId}");
+            Log.Error($"Deleting credentials from Credential Manager has failed for {loginId}");
         }
     }
 
@@ -212,7 +217,7 @@ public void RemoveAllCredentials()
             }
             catch (Exception ex)
             {
-                Log.Logger()?.ReportError($"Deleting credentials from Credential Manager has failed unexpectedly: {credential} : ", ex);
+                Log.Error(ex, $"Deleting credentials from Credential Manager has failed unexpectedly: {credential} : ");
             }
         }
     }
diff --git a/src/GitHubExtension/DeveloperId/DeveloperIdProvider.cs b/src/GitHubExtension/DeveloperId/DeveloperIdProvider.cs
index a47f67f..0c712e5 100644
--- a/src/GitHubExtension/DeveloperId/DeveloperIdProvider.cs
+++ b/src/GitHubExtension/DeveloperId/DeveloperIdProvider.cs
@@ -6,6 +6,7 @@
 using Microsoft.UI;
 using Microsoft.Windows.DevHome.SDK;
 using Octokit;
+using Serilog;
 using Windows.Foundation;
 using Windows.Security.Credentials;
 
@@ -13,6 +14,10 @@ namespace GitHubExtension.DeveloperId;
 
 public class DeveloperIdProvider : IDeveloperIdProviderInternal
 {
+    private static readonly Lazy<ILogger> _log = new(() => Serilog.Log.ForContext("SourceContext", nameof(DeveloperIdProvider)));
+
+    private static readonly ILogger Log = _log.Value;
+
     // Locks to control access to Singleton class members.
     private static readonly object _developerIdsLock = new();
 
@@ -49,7 +54,7 @@ public static DeveloperIdProvider GetInstance()
     // Private constructor for Singleton class.
     private DeveloperIdProvider()
     {
-        Log.Logger()?.ReportInfo($"Creating DeveloperIdProvider singleton instance");
+        Log.Information($"Creating DeveloperIdProvider singleton instance");
 
         _credentialVault = new(() => new CredentialVault());
 
@@ -70,7 +75,7 @@ private DeveloperIdProvider()
         }
         catch (Exception ex)
         {
-            Log.Logger()?.ReportError($"Error while restoring DeveloperIds: {ex.Message}. Proceeding without restoring.", ex);
+            Log.Error(ex, $"Error while restoring DeveloperIds: {ex.Message}. Proceeding without restoring.");
         }
     }
 
@@ -94,7 +99,7 @@ public IAsyncOperation<IDeveloperId> LoginNewDeveloperIdAsync()
             var oauthRequest = LoginNewDeveloperId();
             if (oauthRequest is null)
             {
-                Log.Logger()?.ReportError($"Invalid OAuthRequest");
+                Log.Error($"Invalid OAuthRequest");
                 throw new InvalidOperationException();
             }
 
@@ -103,7 +108,7 @@ public IAsyncOperation<IDeveloperId> LoginNewDeveloperIdAsync()
             var devId = CreateOrUpdateDeveloperIdFromOauthRequest(oauthRequest);
             oauthRequest.Dispose();
 
-            Log.Logger()?.ReportInfo($"New DeveloperId logged in");
+            Log.Information($"New DeveloperId logged in");
 
             return devId as IDeveloperId;
         }).AsAsyncOperation();
@@ -120,13 +125,13 @@ public DeveloperId LoginNewDeveloperIdWithPAT(Uri hostAddress, SecureString pers
             DeveloperId developerId = new(newUser.Login, newUser.Name, newUser.Email, newUser.Url, gitHubClient);
             SaveOrOverwriteDeveloperId(developerId, personalAccessToken);
 
-            Log.Logger()?.ReportInfo($"{developerId.LoginId} logged in with PAT flow to {developerId.GetHostAddress()}");
+            Log.Information($"{developerId.LoginId} logged in with PAT flow to {developerId.GetHostAddress()}");
 
             return developerId;
         }
         catch (Exception ex)
         {
-            Log.Logger()?.ReportError($"Error while logging in with PAT to {hostAddress.AbsoluteUri} : ", ex);
+            Log.Error(ex, $"Error while logging in with PAT to {hostAddress.AbsoluteUri} : ");
             throw;
         }
     }
@@ -146,7 +151,7 @@ public DeveloperId LoginNewDeveloperIdWithPAT(Uri hostAddress, SecureString pers
             catch (Exception ex)
             {
                 OAuthRequests.Remove(oauthRequest);
-                Log.Logger()?.ReportError($"Unable to complete OAuth request: ", ex);
+                Log.Error(ex, $"Unable to complete OAuth request: ");
             }
         }
 
@@ -161,7 +166,7 @@ public ProviderOperationResult LogoutDeveloperId(IDeveloperId developerId)
             developerIdToLogout = DeveloperIds?.Find(e => e.LoginId == developerId.LoginId);
             if (developerIdToLogout == null)
             {
-                Log.Logger()?.ReportError($"Unable to find DeveloperId to logout");
+                Log.Error($"Unable to find DeveloperId to logout");
                 return new ProviderOperationResult(ProviderOperationStatus.Failure, new ArgumentNullException(nameof(developerId)), "The developer account to log out does not exist", "Unable to find DeveloperId to logout");
             }
 
@@ -175,7 +180,7 @@ public ProviderOperationResult LogoutDeveloperId(IDeveloperId developerId)
         }
         catch (Exception ex)
         {
-            Log.Logger()?.ReportError($"LoggedOut event signaling failed: ", ex);
+            Log.Error(ex, $"LoggedOut event signaling failed: ");
         }
 
         return new ProviderOperationResult(ProviderOperationStatus.Success, null, "The developer account has been logged out successfully", "LogoutDeveloperId succeeded");
@@ -196,7 +201,7 @@ public void HandleOauthRedirection(Uri authorizationResponse)
             {
                 // This could happen if the user refreshes the redirected browser window
                 // causing the OAuth response to be received again.
-                Log.Logger()?.ReportWarn($"No saved OAuth requests to match OAuth response");
+                Log.Warning($"No saved OAuth requests to match OAuth response");
                 return;
             }
 
@@ -208,7 +213,7 @@ public void HandleOauthRedirection(Uri authorizationResponse)
             {
                 // This could happen if the user refreshes a previously redirected browser window instead of using
                 // the new browser window for the response. Log the warning and return.
-                Log.Logger()?.ReportWarn($"Unable to find valid request for received OAuth response");
+                Log.Warning($"Unable to find valid request for received OAuth response");
                 return;
             }
             else
@@ -247,7 +252,7 @@ private void SaveOrOverwriteDeveloperId(DeveloperId newDeveloperId, SecureString
 
         if (duplicateDeveloperIds.Any())
         {
-            Log.Logger()?.ReportInfo($"DeveloperID already exists! Updating accessToken");
+            Log.Information($"DeveloperID already exists! Updating accessToken");
             try
             {
                 // Save the credential to Credential Vault.
@@ -259,12 +264,12 @@ private void SaveOrOverwriteDeveloperId(DeveloperId newDeveloperId, SecureString
                 }
                 catch (Exception ex)
                 {
-                    Log.Logger()?.ReportError($"Updated event signaling failed: ", ex);
+                    Log.Error(ex, $"Updated event signaling failed: ");
                 }
             }
             catch (InvalidOperationException)
             {
-                Log.Logger()?.ReportWarn($"Multiple copies of same DeveloperID already exists");
+                Log.Warning($"Multiple copies of same DeveloperID already exists");
                 throw new InvalidOperationException("Multiple copies of same DeveloperID already exists");
             }
         }
@@ -283,7 +288,7 @@ private void SaveOrOverwriteDeveloperId(DeveloperId newDeveloperId, SecureString
             }
             catch (Exception ex)
             {
-                Log.Logger()?.ReportError($"LoggedIn event signaling failed: ", ex);
+                Log.Error(ex, $"LoggedIn event signaling failed: ");
             }
         }
     }
@@ -295,13 +300,13 @@ private DeveloperId CreateOrUpdateDeveloperIdFromOauthRequest(OAuthRequest oauth
         var accessToken = oauthRequest.AccessToken;
         if (accessToken is null)
         {
-            Log.Logger()?.ReportError($"Invalid AccessToken");
+            Log.Error($"Invalid AccessToken");
             throw new InvalidOperationException();
         }
 
         SaveOrOverwriteDeveloperId(newDeveloperId, accessToken);
 
-        Log.Logger()?.ReportInfo($"{newDeveloperId.LoginId} logged in with OAuth flow to {newDeveloperId.GetHostAddress()}");
+        Log.Information($"{newDeveloperId.LoginId} logged in with OAuth flow to {newDeveloperId.GetHostAddress()}");
 
         return newDeveloperId;
     }
@@ -335,7 +340,7 @@ private void RestoreDeveloperIds(IEnumerable<string> loginIdsAndUrls)
                     DeveloperIds.Add(developerId);
                 }
 
-                Log.Logger()?.ReportInfo($"Restored DeveloperId {user.Url}");
+                Log.Information($"Restored DeveloperId {user.Url}");
 
                 // If loginId is currently used to save credential, remove it, and use URL instead.
                 if (!isUrl)
@@ -345,7 +350,7 @@ private void RestoreDeveloperIds(IEnumerable<string> loginIdsAndUrls)
             }
             catch (Exception ex)
             {
-                Log.Logger()?.ReportError($"Error while restoring DeveloperId {loginIdOrUrl} : ", ex);
+                Log.Error(ex, $"Error while restoring DeveloperId {loginIdOrUrl} : ");
 
                 // If we are unable to restore a DeveloperId, remove it from CredentialManager to avoid
                 // the same error next time, and to force the user to login again
@@ -364,11 +369,11 @@ private void ReplaceSavedLoginIdWithUrl(DeveloperId developerId)
                 developerId.Url,
                 new NetworkCredential(string.Empty, _credentialVault.Value.GetCredentials(developerId.LoginId)?.Password).SecurePassword);
             _credentialVault.Value.RemoveCredentials(developerId.LoginId);
-            Log.Logger()?.ReportInfo($"Replaced {developerId.LoginId} with {developerId.Url} in CredentialManager");
+            Log.Information($"Replaced {developerId.LoginId} with {developerId.Url} in CredentialManager");
         }
         catch (Exception ex)
         {
-            Log.Logger()?.ReportError($"Error while replacing {developerId.LoginId} with {developerId.Url} in CredentialManager: ", ex);
+            Log.Error(ex, $"Error while replacing {developerId.LoginId} with {developerId.Url} in CredentialManager: ");
         }
     }
 
@@ -384,7 +389,7 @@ public AuthenticationExperienceKind GetAuthenticationExperienceKind()
 
     public AdaptiveCardSessionResult GetLoginAdaptiveCardSession()
     {
-        Log.Logger()?.ReportInfo($"GetAdaptiveCardController");
+        Log.Information($"GetAdaptiveCardController");
         return new AdaptiveCardSessionResult(new LoginUIController(this));
     }
 
diff --git a/src/GitHubExtension/DeveloperId/Log.cs b/src/GitHubExtension/DeveloperId/Log.cs
deleted file mode 100644
index 40b1cc8..0000000
--- a/src/GitHubExtension/DeveloperId/Log.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using DevHome.Logging;
-using Windows.Storage;
-
-namespace GitHubExtension.DeveloperId;
-
-public class Log
-{
-    private static Logger? _logger;
-
-    public static Logger? Logger()
-    {
-        try
-        {
-            _logger ??= new Logger("DeveloperId", GetLoggingOptions());
-        }
-        catch
-        {
-            // Do nothing if logger fails.
-        }
-
-        return _logger;
-    }
-
-    public static void Attach(Logger logger)
-    {
-        if (logger is not null)
-        {
-            _logger?.Dispose();
-            _logger = logger;
-        }
-    }
-
-    public static Options GetLoggingOptions()
-    {
-        return new Options
-        {
-            LogFileFolderRoot = ApplicationData.Current.TemporaryFolder.Path,
-            LogFileName = "DeveloperId_{now}.dhlog",
-            LogFileFolderName = "DeveloperId",
-            DebugListenerEnabled = true,
-#if DEBUG
-            LogStdoutEnabled = true,
-            LogStdoutFilter = SeverityLevel.Debug,
-            LogFileFilter = SeverityLevel.Debug,
-#else
-            LogStdoutEnabled = false,
-            LogStdoutFilter = SeverityLevel.Info,
-            LogFileFilter = SeverityLevel.Info,
-#endif
-            FailFastSeverity = FailFastSeverityLevel.Critical,
-        };
-    }
-}
diff --git a/src/GitHubExtension/DeveloperId/LoginUIController.cs b/src/GitHubExtension/DeveloperId/LoginUIController.cs
index e29bb00..f81160e 100644
--- a/src/GitHubExtension/DeveloperId/LoginUIController.cs
+++ b/src/GitHubExtension/DeveloperId/LoginUIController.cs
@@ -6,12 +6,17 @@
 using GitHubExtension.DeveloperId.LoginUI;
 using GitHubExtension.Helpers;
 using Microsoft.Windows.DevHome.SDK;
+using Serilog;
 using Windows.Foundation;
 
 namespace GitHubExtension.DeveloperId;
 
 public class LoginUIController : IExtensionAdaptiveCardSession
 {
+    private static readonly Lazy<ILogger> _log = new(() => Serilog.Log.ForContext("SourceContext", nameof(LoginUIController)));
+
+    private static readonly ILogger Log = _log.Value;
+
     private readonly IDeveloperIdProviderInternal _developerIdProvider;
     private IExtensionAdaptiveCard? _loginUI;
     private Uri? _hostAddress;
@@ -30,13 +35,13 @@ public LoginUIController(IDeveloperIdProviderInternal developerIdProvider)
 
     public void Dispose()
     {
-        Log.Logger()?.ReportDebug($"Dispose");
+        Log.Debug($"Dispose");
         _loginUI?.Update(null, null, null);
     }
 
     public ProviderOperationResult Initialize(IExtensionAdaptiveCard extensionUI)
     {
-        Log.Logger()?.ReportDebug($"Initialize");
+        Log.Debug($"Initialize");
         _loginUI = extensionUI;
         return new LoginPage().UpdateExtensionAdaptiveCard(_loginUI);
     }
@@ -47,13 +52,13 @@ public IAsyncOperation<ProviderOperationResult> OnAction(string action, string i
         {
             if (_loginUI == null)
             {
-                Log.Logger()?.ReportError($"OnAction() called with invalid state of LoginUI");
+                Log.Error($"OnAction() called with invalid state of LoginUI");
                 return new ProviderOperationResult(ProviderOperationStatus.Failure, null, "OnAction() called with invalid state of LoginUI", "_loginUI is null");
             }
 
             ProviderOperationResult operationResult;
-            Log.Logger()?.ReportInfo($"OnAction() called with state:{_loginUI.State}");
-            Log.Logger()?.ReportDebug($"action: {action}");
+            Log.Information($"OnAction() called with state:{_loginUI.State}");
+            Log.Debug($"action: {action}");
 
             switch (_loginUI.State)
             {
@@ -65,14 +70,14 @@ public IAsyncOperation<ProviderOperationResult> OnAction(string action, string i
 
                             if (!loginPageActionPayload.IsSubmitAction())
                             {
-                                Log.Logger()?.ReportError($"Invalid action performed on LoginUI: {loginPageActionPayload.Id}");
+                                Log.Error($"Invalid action performed on LoginUI: {loginPageActionPayload.Id}");
                                 operationResult = new ProviderOperationResult(ProviderOperationStatus.Failure, null, "Invalid action performed on LoginUI", "Invalid action performed on LoginUI");
                                 break;
                             }
 
                             if (loginPageActionPayload.IsEnterprise())
                             {
-                                Log.Logger()?.ReportInfo($"Show Enterprise Page");
+                                Log.Information($"Show Enterprise Page");
                                 operationResult = new EnterpriseServerPage(hostAddress: string.Empty, errorText: string.Empty).UpdateExtensionAdaptiveCard(_loginUI);
                                 break;
                             }
@@ -86,14 +91,14 @@ public IAsyncOperation<ProviderOperationResult> OnAction(string action, string i
                             }
                             else
                             {
-                                Log.Logger()?.ReportError($"Unable to create DeveloperId");
+                                Log.Error($"Unable to create DeveloperId");
                                 new LoginFailedPage().UpdateExtensionAdaptiveCard(_loginUI);
                                 operationResult = new ProviderOperationResult(ProviderOperationStatus.Failure, null, "Developer Id could not be created", "Developer Id could not be created");
                             }
                         }
                         catch (Exception ex)
                         {
-                            Log.Logger()?.ReportError($"Error: ", ex);
+                            Log.Error(ex, $"Error: ");
                             new LoginFailedPage().UpdateExtensionAdaptiveCard(_loginUI);
                             operationResult = new ProviderOperationResult(ProviderOperationStatus.Failure, ex, "Error occurred in login page", ex.Message);
                         }
@@ -109,25 +114,25 @@ public IAsyncOperation<ProviderOperationResult> OnAction(string action, string i
 
                         if (enterprisePageActionPayload.IsCancelAction())
                         {
-                            Log.Logger()?.ReportInfo($"Cancel clicked on EnterpriseServerPage");
+                            Log.Information($"Cancel clicked on EnterpriseServerPage");
                             operationResult = new LoginPage().UpdateExtensionAdaptiveCard(_loginUI);
                             break;
                         }
 
                         if (!enterprisePageActionPayload.IsSubmitAction())
                         {
-                            Log.Logger()?.ReportError($"Invalid action performed on LoginUI: {enterprisePageActionPayload.Id}");
+                            Log.Error($"Invalid action performed on LoginUI: {enterprisePageActionPayload.Id}");
                             operationResult = new ProviderOperationResult(ProviderOperationStatus.Failure, null, "Invalid action performed on LoginUI", "Invalid action");
                             break;
                         }
 
                         // Otherwise user clicked on Next button. We should validate the inputs and update the UI with PAT page.
                         var enterprisePageInputPayload = Json.ToObject<EnterpriseServerPage.InputPayload>(inputs) ?? throw new InvalidOperationException("Invalid inputs");
-                        Log.Logger()?.ReportInfo($"EnterpriseServer: {enterprisePageInputPayload?.EnterpriseServer}");
+                        Log.Information($"EnterpriseServer: {enterprisePageInputPayload?.EnterpriseServer}");
 
                         if (enterprisePageInputPayload?.EnterpriseServer == null)
                         {
-                            Log.Logger()?.ReportError($"EnterpriseServer is null");
+                            Log.Error($"EnterpriseServer is null");
                             operationResult = new EnterpriseServerPage(hostAddress: string.Empty, errorText: $"{Resources.GetResource("LoginUI_EnterprisePage_NullErrorText")}").UpdateExtensionAdaptiveCard(_loginUI);
                             break;
                         }
@@ -144,13 +149,13 @@ public IAsyncOperation<ProviderOperationResult> OnAction(string action, string i
                         }
                         catch (UriFormatException ufe)
                         {
-                            Log.Logger()?.ReportError($"Error: ", ufe);
+                            Log.Error(ufe, $"Error: ");
                             operationResult = new EnterpriseServerPage(hostAddress: enterprisePageInputPayload.EnterpriseServer, errorText: $"{Resources.GetResource("LoginUI_EnterprisePage_UriErrorText")}").UpdateExtensionAdaptiveCard(_loginUI);
                             break;
                         }
                         catch (Exception ex)
                         {
-                            Log.Logger()?.ReportError($"Error: ", ex);
+                            Log.Error(ex, $"Error: ");
                             operationResult = new EnterpriseServerPage(hostAddress: enterprisePageInputPayload.EnterpriseServer, errorText: $"{Resources.GetResource("LoginUI_EnterprisePage_GenericErrorText")} : {ex}").UpdateExtensionAdaptiveCard(_loginUI);
                             break;
                         }
@@ -161,7 +166,7 @@ public IAsyncOperation<ProviderOperationResult> OnAction(string action, string i
                         }
                         catch (Exception ex)
                         {
-                            Log.Logger()?.ReportError($"Error: ", ex);
+                            Log.Error(ex, $"Error: ");
                             operationResult = new LoginFailedPage().UpdateExtensionAdaptiveCard(_loginUI);
                         }
 
@@ -173,7 +178,7 @@ public IAsyncOperation<ProviderOperationResult> OnAction(string action, string i
                         if (_hostAddress == null)
                         {
                             // This should never happen.
-                            Log.Logger()?.ReportError($"Host address is null");
+                            Log.Error($"Host address is null");
                             operationResult = new ProviderOperationResult(ProviderOperationStatus.Failure, null, "Host address is null", "Host address is null");
                             break;
                         }
@@ -183,14 +188,14 @@ public IAsyncOperation<ProviderOperationResult> OnAction(string action, string i
 
                         if (enterprisePATPageActionPayload.IsCancelAction())
                         {
-                            Log.Logger()?.ReportInfo($"Cancel clicked");
+                            Log.Information($"Cancel clicked");
                             operationResult = new EnterpriseServerPage(hostAddress: _hostAddress, errorText: string.Empty).UpdateExtensionAdaptiveCard(_loginUI);
                             break;
                         }
 
                         if (enterprisePATPageActionPayload.IsUrlAction())
                         {
-                            Log.Logger()?.ReportInfo($"Create PAT Link clicked");
+                            Log.Information($"Create PAT Link clicked");
 
                             try
                             {
@@ -205,23 +210,23 @@ public IAsyncOperation<ProviderOperationResult> OnAction(string action, string i
 
                                     if (browserLaunch)
                                     {
-                                        Log.Logger()?.ReportInfo($"Uri Launched to {uri.AbsoluteUri} - Check browser");
+                                        Log.Information($"Uri Launched to {uri.AbsoluteUri} - Check browser");
                                     }
                                     else
                                     {
-                                        Log.Logger()?.ReportError($"Uri Launch failed to {uri.AbsoluteUri}");
+                                        Log.Error($"Uri Launch failed to {uri.AbsoluteUri}");
                                     }
                                 });
                             }
                             catch (UriFormatException ufe)
                             {
-                                Log.Logger()?.ReportError($"Error: ", ufe);
+                                Log.Error(ufe, $"Error: ");
                                 operationResult = new ProviderOperationResult(ProviderOperationStatus.Failure, null, $"Error: {ufe}", $"Error: {ufe}");
                                 break;
                             }
                             catch (Exception ex)
                             {
-                                Log.Logger()?.ReportError($"Error: ", ex);
+                                Log.Error(ex, $"Error: ");
                                 operationResult = new ProviderOperationResult(ProviderOperationStatus.Failure, null, $"Error: {ex}", $"Error: {ex}");
                                 break;
                             }
@@ -232,7 +237,7 @@ public IAsyncOperation<ProviderOperationResult> OnAction(string action, string i
 
                         if (!enterprisePATPageActionPayload.IsSubmitAction())
                         {
-                            Log.Logger()?.ReportError($"Invalid action performed on LoginUI");
+                            Log.Error($"Invalid action performed on LoginUI");
                             operationResult = new ProviderOperationResult(ProviderOperationStatus.Failure, null, "Invalid action performed on LoginUI", "Invalid action");
                             break;
                         }
@@ -242,12 +247,12 @@ public IAsyncOperation<ProviderOperationResult> OnAction(string action, string i
 
                         if (string.IsNullOrEmpty(enterprisePATPageInputPayload.PAT))
                         {
-                            Log.Logger()?.ReportError($"PAT is null");
+                            Log.Error($"PAT is null");
                             operationResult = new EnterpriseServerPATPage(hostAddress: _hostAddress, errorText: $"{Resources.GetResource("LoginUI_EnterprisePATPage_NullErrorText")}", inputPAT: new NetworkCredential(null, enterprisePATPageInputPayload.PAT).SecurePassword).UpdateExtensionAdaptiveCard(_loginUI);
                             break;
                         }
 
-                        Log.Logger()?.ReportInfo($"PAT Received");
+                        Log.Information($"PAT Received");
                         var securePAT = new NetworkCredential(null, enterprisePATPageInputPayload.PAT).SecurePassword;
                         enterprisePATPageInputPayload.PAT = string.Empty;
                         enterprisePATPageInputPayload = null;
@@ -263,7 +268,7 @@ public IAsyncOperation<ProviderOperationResult> OnAction(string action, string i
                             }
                             else
                             {
-                                Log.Logger()?.ReportError($"PAT doesn't work for GHES endpoint {_hostAddress.OriginalString}");
+                                Log.Error($"PAT doesn't work for GHES endpoint {_hostAddress.OriginalString}");
                                 operationResult = new EnterpriseServerPATPage(hostAddress: _hostAddress, errorText: $"{Resources.GetResource("LoginUI_EnterprisePATPage_BadCredentialsErrorText")} {_hostAddress.OriginalString}", inputPAT: new NetworkCredential(null, enterprisePATPageInputPayload?.PAT).SecurePassword).UpdateExtensionAdaptiveCard(_loginUI);
                                 break;
                             }
@@ -272,12 +277,12 @@ public IAsyncOperation<ProviderOperationResult> OnAction(string action, string i
                         {
                             if (ex.Message.Contains("Bad credentials") || ex.Message.Contains("Not Found"))
                             {
-                                Log.Logger()?.ReportError($"Unauthorized Error: ", ex);
+                                Log.Error(ex, $"Unauthorized Error: ");
                                 operationResult = new EnterpriseServerPATPage(hostAddress: _hostAddress, errorText: $"{Resources.GetResource("LoginUI_EnterprisePATPage_BadCredentialsErrorText")} {_hostAddress.OriginalString}", inputPAT: new NetworkCredential(null, enterprisePATPageInputPayload?.PAT).SecurePassword).UpdateExtensionAdaptiveCard(_loginUI);
                                 break;
                             }
 
-                            Log.Logger()?.ReportError($"Error: ", ex);
+                            Log.Error(ex, $"Error: ");
                             operationResult = new EnterpriseServerPATPage(hostAddress: _hostAddress, errorText: $"{Resources.GetResource("LoginUI_EnterprisePATPage_GenericErrorPrefix")} {ex}", inputPAT: new NetworkCredential(null, enterprisePATPageInputPayload?.PAT).SecurePassword).UpdateExtensionAdaptiveCard(_loginUI);
                             break;
                         }
@@ -287,7 +292,7 @@ public IAsyncOperation<ProviderOperationResult> OnAction(string action, string i
                 case nameof(LoginUIState.LoginSucceededPage):
                 case nameof(LoginUIState.LoginFailedPage):
                     {
-                        Log.Logger()?.ReportInfo($"State:{_loginUI.State}");
+                        Log.Information($"State:{_loginUI.State}");
                         operationResult = new EndPage().UpdateExtensionAdaptiveCard(_loginUI);
                         break;
                     }
@@ -296,7 +301,7 @@ public IAsyncOperation<ProviderOperationResult> OnAction(string action, string i
                 case nameof(LoginUIState.WaitingPage):
                 default:
                     {
-                        Log.Logger()?.ReportError($"Unexpected state:{_loginUI.State}");
+                        Log.Error($"Unexpected state:{_loginUI.State}");
                         operationResult = new ProviderOperationResult(ProviderOperationStatus.Failure, null, $"Error occurred in :{_loginUI.State}", $"Error occurred in :{_loginUI.State}");
                         break;
                     }
diff --git a/src/GitHubExtension/DeveloperId/OAuthRequest.cs b/src/GitHubExtension/DeveloperId/OAuthRequest.cs
index 2c0d390..5b685ab 100644
--- a/src/GitHubExtension/DeveloperId/OAuthRequest.cs
+++ b/src/GitHubExtension/DeveloperId/OAuthRequest.cs
@@ -7,11 +7,16 @@
 using System.Web;
 using GitHubExtension.Helpers;
 using Octokit;
+using Serilog;
 
 namespace GitHubExtension.DeveloperId;
 
 internal class OAuthRequest : IDisposable
 {
+    private static readonly Lazy<ILogger> _log = new(() => Serilog.Log.ForContext("SourceContext", nameof(OAuthRequest)));
+
+    private static readonly ILogger Log = _log.Value;
+
     internal string State { get; private set; }
 
     internal SecureString? AccessToken { get; private set; }
@@ -75,11 +80,11 @@ internal void BeginOAuthRequest()
 
             if (browserLaunch)
             {
-                Log.Logger()?.ReportInfo($"Uri Launched - Check browser");
+                Log.Information($"Uri Launched - Check browser");
             }
             else
             {
-                Log.Logger()?.ReportError($"Uri Launch failed");
+                Log.Error($"Uri Launch failed");
             }
         });
     }
@@ -94,13 +99,13 @@ internal async Task CompleteOAuthAsync(Uri authorizationResponse)
 
         if (!string.IsNullOrEmpty(queryStringCollection.Get("error")))
         {
-            Log.Logger()?.ReportError($"OAuth authorization error: {queryStringCollection.Get("error")}");
+            Log.Error($"OAuth authorization error: {queryStringCollection.Get("error")}");
             throw new UriFormatException();
         }
 
         if (string.IsNullOrEmpty(queryStringCollection.Get("code")))
         {
-            Log.Logger()?.ReportError($"Malformed authorization response: {queryString}");
+            Log.Error($"Malformed authorization response: {queryString}");
             throw new UriFormatException();
         }
 
@@ -116,11 +121,11 @@ internal async Task CompleteOAuthAsync(Uri authorizationResponse)
         }
         catch (Exception ex)
         {
-            Log.Logger()?.ReportError($"Authorization code exchange failed: {ex}");
+            Log.Error($"Authorization code exchange failed: {ex}");
             throw;
         }
 
-        Log.Logger()?.ReportInfo($"Authorization code exchange completed");
+        Log.Information($"Authorization code exchange completed");
         oAuthCompleted.Release();
     }
 
@@ -128,7 +133,7 @@ internal DeveloperId RetrieveDeveloperId()
     {
         if (AccessToken is null)
         {
-            Log.Logger()?.ReportError($"RetrieveDeveloperIdData called before AccessToken is set");
+            Log.Error($"RetrieveDeveloperIdData called before AccessToken is set");
             throw new InvalidOperationException("RetrieveDeveloperIdData called before AccessToken is set");
         }
 
@@ -150,7 +155,7 @@ internal static string RetrieveState(Uri authorizationResponse)
 
         if (string.IsNullOrEmpty(state))
         {
-            Log.Logger()?.ReportError($"Authorization code exchange failed: ResponseString:{queryString}");
+            Log.Error($"Authorization code exchange failed: ResponseString:{queryString}");
             throw new UriFormatException();
         }
 
diff --git a/src/GitHubExtension/GitHubExtension.cs b/src/GitHubExtension/GitHubExtension.cs
index 9dd8204..fb48d02 100644
--- a/src/GitHubExtension/GitHubExtension.cs
+++ b/src/GitHubExtension/GitHubExtension.cs
@@ -5,6 +5,7 @@
 using GitHubExtension.DeveloperId;
 using GitHubExtension.Providers;
 using Microsoft.Windows.DevHome.SDK;
+using Serilog;
 
 namespace GitHubExtension;
 
@@ -14,6 +15,7 @@ namespace GitHubExtension;
 public sealed class GitHubExtension : IExtension
 {
     private readonly ManualResetEvent _extensionDisposedEvent;
+    private readonly ILogger _log = Log.ForContext("SourceContext", nameof(GitHubExtension));
 
     public GitHubExtension(ManualResetEvent extensionDisposedEvent)
     {
@@ -33,7 +35,7 @@ public GitHubExtension(ManualResetEvent extensionDisposedEvent)
             case ProviderType.FeaturedApplications:
                 return new object();
             default:
-                Providers.Log.Logger()?.ReportInfo("Invalid provider");
+                _log.Warning($"Invalid provider: {providerType}");
                 return null;
         }
     }
diff --git a/src/GitHubExtension/GitHubExtension.csproj b/src/GitHubExtension/GitHubExtension.csproj
index 85cca9a..a8fd18a 100644
--- a/src/GitHubExtension/GitHubExtension.csproj
+++ b/src/GitHubExtension/GitHubExtension.csproj
@@ -84,6 +84,7 @@
     <PackageReference Include="LibGit2Sharp" Version="0.29.0" />
     <PackageReference Include="MessageFormat" Version="6.0.2" />
     <PackageReference Include="Microsoft.Data.Sqlite" Version="7.0.4" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
     <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.3" />
     <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.2.206-beta" />
     <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.0.2" />
@@ -91,10 +92,15 @@
     <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240227000" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Octokit" Version="10.0.0" />
+    <PackageReference Include="Serilog" Version="3.1.1" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
+    <PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Logging\DevHome.Logging.csproj" />
     <ProjectReference Include="..\Telemetry\GitHubExtension.Telemetry.csproj" />
   </ItemGroup>
 
diff --git a/src/GitHubExtension/Helpers/IconLoader.cs b/src/GitHubExtension/Helpers/IconLoader.cs
index e10fe37..bd113a7 100644
--- a/src/GitHubExtension/Helpers/IconLoader.cs
+++ b/src/GitHubExtension/Helpers/IconLoader.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using GitHubExtension.DataModel;
+using Serilog;
 
 namespace GitHubExtension.Helpers;
 
@@ -11,11 +11,12 @@ public class IconLoader
 
     public static string GetIconAsBase64(string filename)
     {
-        Log.Logger()?.ReportDebug(nameof(IconLoader), $"Asking for icon: {filename}");
+        var log = Log.ForContext("SourceContext", nameof(IconLoader));
+        log.Verbose($"Asking for icon: {filename}");
         if (!Base64ImageRegistry.ContainsKey(filename))
         {
             Base64ImageRegistry.Add(filename, ConvertIconToDataString(filename));
-            Log.Logger()?.ReportDebug(nameof(IconLoader), $"The icon {filename} was converted and is now stored.");
+            log.Verbose($"The icon {filename} was converted and is now stored.");
         }
 
         return Base64ImageRegistry[filename];
diff --git a/src/GitHubExtension/Helpers/Resources.cs b/src/GitHubExtension/Helpers/Resources.cs
index 0b8ce7b..ca9367c 100644
--- a/src/GitHubExtension/Helpers/Resources.cs
+++ b/src/GitHubExtension/Helpers/Resources.cs
@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using DevHome.Logging;
 using Microsoft.Windows.ApplicationModel.Resources;
+using Serilog;
 
 namespace GitHubExtension.Helpers;
 
@@ -10,7 +10,7 @@ public static class Resources
 {
     private static ResourceLoader? _resourceLoader;
 
-    public static string GetResource(string identifier, Logger? log = null)
+    public static string GetResource(string identifier, ILogger? log = null)
     {
         try
         {
@@ -23,7 +23,7 @@ public static string GetResource(string identifier, Logger? log = null)
         }
         catch (Exception ex)
         {
-            log?.ReportError($"Failed loading resource: {identifier}", ex);
+            log?.Error(ex, $"Failed loading resource: {identifier}");
 
             // If we fail, load the original identifier so it is obvious which resource is missing.
             return identifier;
@@ -33,7 +33,7 @@ public static string GetResource(string identifier, Logger? log = null)
     // Replaces all identifiers in the provided list in the target string. Assumes all identifiers
     // are wrapped with '%' to prevent sub-string replacement errors. This is intended for strings
     // such as a JSON string with resource identifiers embedded.
-    public static string ReplaceIdentifiers(string str, string[] resourceIdentifiers, Logger? log = null)
+    public static string ReplaceIdentifiers(string str, string[] resourceIdentifiers, ILogger? log = null)
     {
         var start = DateTime.Now;
         foreach (var identifier in resourceIdentifiers)
@@ -45,7 +45,7 @@ public static string ReplaceIdentifiers(string str, string[] resourceIdentifiers
         }
 
         var elapsed = DateTime.Now - start;
-        log?.ReportDebug($"Replaced identifiers in {elapsed.TotalMilliseconds}ms");
+        log?.Debug($"Replaced identifiers in {elapsed.TotalMilliseconds}ms");
         return str;
     }
 
@@ -105,6 +105,8 @@ public static string[] GetWidgetResourceIdentifiers()
             "Widget_Template/ChooseAccountPlaceholder",
             "Widget_Template/Published",
             "Widget_Template_Tooltip/OpenRelease",
+            "Widget_Template/WidgetTitleLabel",
+            "Widget_Template/WidgetTitlePlaceholder",
         };
     }
 }
diff --git a/src/GitHubExtension/Helpers/TimeSpanHelper.cs b/src/GitHubExtension/Helpers/TimeSpanHelper.cs
index 9afbc56..2bd628b 100644
--- a/src/GitHubExtension/Helpers/TimeSpanHelper.cs
+++ b/src/GitHubExtension/Helpers/TimeSpanHelper.cs
@@ -1,14 +1,14 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using DevHome.Logging;
 using Jeffijoe.MessageFormat;
+using Serilog;
 
 namespace GitHubExtension.Helpers;
 
 internal class TimeSpanHelper
 {
-    public static string TimeSpanToDisplayString(TimeSpan timeSpan, Logger? log = null)
+    public static string TimeSpanToDisplayString(TimeSpan timeSpan, ILogger? log = null)
     {
         if (timeSpan.TotalSeconds < 1)
         {
@@ -33,7 +33,7 @@ public static string TimeSpanToDisplayString(TimeSpan timeSpan, Logger? log = nu
         return MessageFormatter.Format(Resources.GetResource("WidgetTemplate_DaysAgo", log), new { days = timeSpan.Days });
     }
 
-    internal static string DateTimeOffsetToDisplayString(DateTimeOffset? dateTime, Logger? log)
+    internal static string DateTimeOffsetToDisplayString(DateTimeOffset? dateTime, ILogger? log)
     {
         if (dateTime == null)
         {
diff --git a/src/GitHubExtension/Notifications/Log.cs b/src/GitHubExtension/Notifications/Log.cs
deleted file mode 100644
index 55d5670..0000000
--- a/src/GitHubExtension/Notifications/Log.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using DevHome.Logging;
-using Windows.Storage;
-
-namespace GitHubExtension.Notifications;
-
-public class Log
-{
-    private static Logger? _logger;
-
-    public static Logger? Logger()
-    {
-        try
-        {
-            _logger ??= new Logger("Notifications", GetLoggingOptions());
-        }
-        catch
-        {
-            // Do nothing if logger fails.
-        }
-
-        return _logger;
-    }
-
-    public static void Attach(Logger logger)
-    {
-        if (logger is not null)
-        {
-            _logger?.Dispose();
-            _logger = logger;
-        }
-    }
-
-    public static Options GetLoggingOptions()
-    {
-        return new Options
-        {
-            LogFileFolderRoot = ApplicationData.Current.TemporaryFolder.Path,
-            LogFileName = "Notifications_{now}.dhlog",
-            LogFileFolderName = "Notifications",
-            DebugListenerEnabled = true,
-#if DEBUG
-            LogStdoutEnabled = true,
-            LogStdoutFilter = SeverityLevel.Debug,
-            LogFileFilter = SeverityLevel.Debug,
-#else
-            LogStdoutEnabled = false,
-            LogStdoutFilter = SeverityLevel.Info,
-            LogFileFilter = SeverityLevel.Info,
-#endif
-            FailFastSeverity = FailFastSeverityLevel.Critical,
-        };
-    }
-}
diff --git a/src/GitHubExtension/Notifications/NotificationHandler.cs b/src/GitHubExtension/Notifications/NotificationHandler.cs
index c6626b7..e679520 100644
--- a/src/GitHubExtension/Notifications/NotificationHandler.cs
+++ b/src/GitHubExtension/Notifications/NotificationHandler.cs
@@ -6,18 +6,23 @@
 using System.Text;
 using GitHubExtension.Client;
 using Microsoft.Windows.AppNotifications;
+using Serilog;
 
 namespace GitHubExtension.Notifications;
 
 public class NotificationHandler
 {
+    private static readonly Lazy<ILogger> _log = new(() => Serilog.Log.ForContext("SourceContext", nameof(NotificationHandler)));
+
+    private static readonly ILogger Log = _log.Value;
+
 #pragma warning disable IDE0060 // Remove unused parameter
     public static void OnNotificationInvoked(object sender, AppNotificationActivatedEventArgs args) => NotificationActivation(args);
 #pragma warning restore IDE0060 // Remove unused parameter
 
     public static void NotificationActivation(AppNotificationActivatedEventArgs args)
     {
-        Log.Logger()?.ReportInfo($"Notification Activated with args: {NotificationArgsToString(args)}");
+        Log.Information($"Notification Activated with args: {NotificationArgsToString(args)}");
 
         if (args.Arguments.ContainsKey("htmlurl"))
         {
@@ -31,7 +36,7 @@ public static void NotificationActivation(AppNotificationActivatedEventArgs args
                     throw new InvalidGitHubUrlException($"{urlString} is invalid.");
                 }
 
-                Log.Logger()?.ReportInfo($"Launching Uri: {urlString}");
+                Log.Information($"Launching Uri: {urlString}");
                 var processStartInfo = new ProcessStartInfo
                 {
                     UseShellExecute = true,
@@ -42,7 +47,7 @@ public static void NotificationActivation(AppNotificationActivatedEventArgs args
             }
             catch (Exception ex)
             {
-                Log.Logger()?.ReportError($"Failed launching Uri for {args.Arguments["htmlurl"]}", ex);
+                Log.Error(ex, $"Failed launching Uri for {args.Arguments["htmlurl"]}");
             }
 
             return;
diff --git a/src/GitHubExtension/Notifications/NotificationManager.cs b/src/GitHubExtension/Notifications/NotificationManager.cs
index 3d9e375..9d1f8a6 100644
--- a/src/GitHubExtension/Notifications/NotificationManager.cs
+++ b/src/GitHubExtension/Notifications/NotificationManager.cs
@@ -2,11 +2,16 @@
 // Licensed under the MIT License.
 
 using Microsoft.Windows.AppNotifications;
+using Serilog;
 
 namespace GitHubExtension.Notifications;
 
 public class NotificationManager
 {
+    private static readonly Lazy<ILogger> _log = new(() => Serilog.Log.ForContext("SourceContext", nameof(NotificationManager)));
+
+    private static readonly ILogger Log = _log.Value;
+
     private bool isRegistered;
 
     public NotificationManager(Windows.Foundation.TypedEventHandler<AppNotificationManager, AppNotificationActivatedEventArgs> handler)
@@ -14,7 +19,7 @@ public NotificationManager(Windows.Foundation.TypedEventHandler<AppNotificationM
         AppNotificationManager.Default.NotificationInvoked += handler;
         AppNotificationManager.Default.Register();
         isRegistered = true;
-        Log.Logger()?.ReportInfo($"NotificationManager created and registered.");
+        Log.Information($"NotificationManager created and registered.");
     }
 
     ~NotificationManager()
@@ -28,7 +33,7 @@ public void Unregister()
         {
             AppNotificationManager.Default.Unregister();
             isRegistered = false;
-            Log.Logger()?.ReportInfo($"NotificationManager unregistered.");
+            Log.Information($"NotificationManager unregistered.");
         }
     }
 }
diff --git a/src/GitHubExtension/Providers/Log.cs b/src/GitHubExtension/Providers/Log.cs
deleted file mode 100644
index 58fcb34..0000000
--- a/src/GitHubExtension/Providers/Log.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using DevHome.Logging;
-using Windows.Storage;
-
-namespace GitHubExtension.Providers;
-
-public class Log
-{
-    private static Logger? _logger;
-
-    public static Logger? Logger()
-    {
-        try
-        {
-            _logger ??= new Logger("GitHubExtension", GetLoggingOptions());
-        }
-        catch
-        {
-            // Do nothing if logger fails.
-        }
-
-        return _logger;
-    }
-
-    public static Options GetLoggingOptions()
-    {
-        return new Options
-        {
-            LogFileFolderRoot = ApplicationData.Current.TemporaryFolder.Path,
-            LogFileName = "GitHubExtension_{now}.dhlog",
-            LogFileFolderName = "GitHubExtension",
-            DebugListenerEnabled = true,
-#if DEBUG
-            LogStdoutEnabled = true,
-            LogStdoutFilter = SeverityLevel.Debug,
-            LogFileFilter = SeverityLevel.Debug,
-#else
-            LogStdoutEnabled = false,
-            LogStdoutFilter = SeverityLevel.Info,
-            LogFileFilter = SeverityLevel.Info,
-#endif
-            FailFastSeverity = FailFastSeverityLevel.Critical,
-        };
-    }
-}
diff --git a/src/GitHubExtension/Providers/RepositoryProvider.cs b/src/GitHubExtension/Providers/RepositoryProvider.cs
index 011b35a..8b85fa6 100644
--- a/src/GitHubExtension/Providers/RepositoryProvider.cs
+++ b/src/GitHubExtension/Providers/RepositoryProvider.cs
@@ -2,11 +2,10 @@
 // Licensed under the MIT License.
 
 using GitHubExtension.Client;
-using GitHubExtension.DataModel;
-using GitHubExtension.DeveloperId;
 using GitHubExtension.Helpers;
 using Microsoft.Windows.DevHome.SDK;
 using Octokit;
+using Serilog;
 using Windows.Foundation;
 using Windows.Storage.Streams;
 
@@ -14,6 +13,10 @@ namespace GitHubExtension.Providers;
 
 public class RepositoryProvider : IRepositoryProvider
 {
+    private static readonly Lazy<ILogger> _log = new(() => Serilog.Log.ForContext("SourceContext", nameof(RepositoryProvider)));
+
+    private static readonly ILogger Log = _log.Value;
+
     public string DisplayName => Resources.GetResource(@"RepositoryProviderDisplayName");
 
     public IRandomAccessStreamReference Icon
@@ -126,7 +129,7 @@ IAsyncOperation<RepositoriesResult> IRepositoryProvider.GetRepositoriesAsync(IDe
             catch (Exception ex)
             {
                 // Any failures should be thrown so the core app can catch the failures.
-                Providers.Log.Logger()?.ReportError("RepositoryProvider", "Failed getting list of repositories.", ex);
+                Log.Error(ex, "Failed getting list of repositories.");
                 return new RepositoriesResult(ex, $"Something went wrong.  HResult: {ex.HResult}");
             }
 
@@ -174,25 +177,25 @@ public IAsyncOperation<RepositoryResult> GetRepositoryFromUriAsync(Uri uri, IDev
                 var innerException = e.InnerException;
                 if (innerException is Octokit.NotFoundException)
                 {
-                    Log.Logger()?.ReportError($"Can't find {owner}/{repoName}");
+                    Log.Error($"Can't find {owner}/{repoName}");
                     return new RepositoryResult(innerException, $"Can't find {owner}/{repoName}. HResult: {innerException.HResult}");
                 }
 
                 if (innerException is Octokit.ForbiddenException)
                 {
-                    Log.Logger()?.ReportError($"Forbidden access to {owner}/{repoName}");
+                    Log.Error($"Forbidden access to {owner}/{repoName}");
                     return new RepositoryResult(innerException, $"Forbidden access to {owner}/{repoName}. HResult: {innerException.HResult}");
                 }
 
                 if (innerException is Octokit.RateLimitExceededException)
                 {
-                    Log.Logger()?.ReportError("Rate limit exceeded.", e);
+                    Log.Error(innerException, "Rate limit exceeded.");
                     return new RepositoryResult(innerException, $"Rate limit exceeded. HResult: {innerException.HResult}");
                 }
             }
             catch (Exception e)
             {
-                Log.Logger()?.ReportError("Unspecified error.", e);
+                Log.Error(e, "Unspecified error.");
                 return new RepositoryResult(e, $"Unspecified error when cloning a repo. HResult: {e.HResult}");
             }
 
@@ -236,7 +239,7 @@ public IAsyncOperation<ProviderOperationResult> CloneRepositoryAsync(IRepository
                 }
                 catch (Exception e)
                 {
-                    Log.Logger()?.ReportError("DevHomeRepository", "Could not get credentials.", e);
+                    Log.Error(e, "Could not get credentials.");
                     return new ProviderOperationResult(ProviderOperationStatus.Failure, e, "Could not get credentials.", e.Message);
                 }
             }
@@ -248,27 +251,27 @@ public IAsyncOperation<ProviderOperationResult> CloneRepositoryAsync(IRepository
             }
             catch (LibGit2Sharp.RecurseSubmodulesException recurseException)
             {
-                Providers.Log.Logger()?.ReportError("DevHomeRepository", "Could not clone all submodules.", recurseException);
+                Log.Error(recurseException, "Could not clone all submodules.");
                 return new ProviderOperationResult(ProviderOperationStatus.Failure, recurseException, "Could not clone all submodules.", recurseException.Message);
             }
             catch (LibGit2Sharp.UserCancelledException userCancelledException)
             {
-                Providers.Log.Logger()?.ReportError("DevHomeRepository", "The user stopped the clone operation.", userCancelledException);
+                Log.Error(userCancelledException, "The user stopped the clone operation.");
                 return new ProviderOperationResult(ProviderOperationStatus.Failure, userCancelledException, "User cancelled the clone operation.", userCancelledException.Message);
             }
             catch (LibGit2Sharp.NameConflictException nameConflictException)
             {
-                Providers.Log.Logger()?.ReportError("DevHomeRepository", nameConflictException);
+                Log.Error(nameConflictException, "Name conflict");
                 return new ProviderOperationResult(ProviderOperationStatus.Failure, nameConflictException, "The destination location is non-empty.", nameConflictException.Message);
             }
             catch (LibGit2Sharp.LibGit2SharpException libGitTwoException)
             {
-                Providers.Log.Logger()?.ReportError("DevHomeRepository", $"Either no logged in account has access to this repository, or the repository can't be found.", libGitTwoException);
+                Log.Error(libGitTwoException, $"Either no logged in account has access to this repository, or the repository can't be found.");
                 return new ProviderOperationResult(ProviderOperationStatus.Failure, libGitTwoException, "LibGit2 library threw an exception.", "LibGit2 library threw an exception.");
             }
             catch (Exception e)
             {
-                Providers.Log.Logger()?.ReportError("DevHomeRepository", "Could not clone the repository.", e);
+                Log.Error(e, "Could not clone the repository.");
                 return new ProviderOperationResult(ProviderOperationStatus.Failure, e, "Something happened when cloning the repository.", "Something happened when cloning the repository.");
             }
 
diff --git a/src/GitHubExtension/Providers/SettingsProvider.cs b/src/GitHubExtension/Providers/SettingsProvider.cs
index 420f6c5..db40354 100644
--- a/src/GitHubExtension/Providers/SettingsProvider.cs
+++ b/src/GitHubExtension/Providers/SettingsProvider.cs
@@ -3,16 +3,21 @@
 
 using GitHubExtension.Helpers;
 using Microsoft.Windows.DevHome.SDK;
+using Serilog;
 
 namespace GitHubExtension.Providers;
 
 public class SettingsProvider : ISettingsProvider
 {
+    private static readonly Lazy<ILogger> _log = new(() => Serilog.Log.ForContext("SourceContext", nameof(SettingsProvider)));
+
+    private static readonly ILogger Log = _log.Value;
+
     string ISettingsProvider.DisplayName => Resources.GetResource(@"SettingsProviderDisplayName");
 
     public AdaptiveCardSessionResult GetSettingsAdaptiveCardSession()
     {
-        Log.Logger()?.ReportInfo($"GetSettingsAdaptiveCardSession");
+        Log.Information($"GetSettingsAdaptiveCardSession");
         return new AdaptiveCardSessionResult(new SettingsUIController());
     }
 
diff --git a/src/GitHubExtension/Providers/SettingsUIController.cs b/src/GitHubExtension/Providers/SettingsUIController.cs
index a4b6fa7..a697dad 100644
--- a/src/GitHubExtension/Providers/SettingsUIController.cs
+++ b/src/GitHubExtension/Providers/SettingsUIController.cs
@@ -4,12 +4,17 @@
 using GitHubExtension.Helpers;
 using Microsoft.Windows.ApplicationModel.Resources;
 using Microsoft.Windows.DevHome.SDK;
+using Serilog;
 using Windows.Foundation;
 
 namespace GitHubExtension.Providers;
 
 internal class SettingsUIController : IExtensionAdaptiveCardSession
 {
+    private static readonly Lazy<ILogger> _log = new(() => Serilog.Log.ForContext("SourceContext", nameof(RepositoryProvider)));
+
+    private static readonly ILogger Log = _log.Value;
+
     private static readonly string _notificationsEnabledString = "NotificationsEnabled";
 
     private IExtensionAdaptiveCard? _settingsUI;
@@ -17,13 +22,13 @@ internal class SettingsUIController : IExtensionAdaptiveCardSession
 
     public void Dispose()
     {
-        Log.Logger()?.ReportDebug($"Dispose");
+        Log.Debug($"Dispose");
         _settingsUI?.Update(null, null, null);
     }
 
     public ProviderOperationResult Initialize(IExtensionAdaptiveCard extensionUI)
     {
-        Log.Logger()?.ReportDebug($"Initialize");
+        Log.Debug($"Initialize");
         _settingsUI = extensionUI;
         return _settingsUI.Update(_settingsUITemplate.GetSettingsUITemplate(), null, "SettingsPage");
     }
@@ -33,14 +38,14 @@ public IAsyncOperation<ProviderOperationResult> OnAction(string action, string i
         return Task.Run(async () =>
         {
             ProviderOperationResult operationResult;
-            Log.Logger()?.ReportInfo($"OnAction() called with state:{_settingsUI?.State}");
-            Log.Logger()?.ReportDebug($"action: {action}");
+            Log.Information($"OnAction() called with state:{_settingsUI?.State}");
+            Log.Debug($"action: {action}");
 
             switch (_settingsUI?.State)
             {
                 case "SettingsPage":
                     {
-                        Log.Logger()?.ReportDebug($"inputs: {inputs}");
+                        Log.Debug($"inputs: {inputs}");
 
                         var currentNotificationsEnabled = LocalSettings.ReadSettingAsync<string>(_notificationsEnabledString).Result ?? "true";
                         await LocalSettings.SaveSettingAsync(_notificationsEnabledString, currentNotificationsEnabled == "true" ? "false" : "true");
@@ -52,7 +57,7 @@ public IAsyncOperation<ProviderOperationResult> OnAction(string action, string i
 
                 default:
                     {
-                        Log.Logger()?.ReportError($"Unexpected state:{_settingsUI?.State}");
+                        Log.Error($"Unexpected state:{_settingsUI?.State}");
                         operationResult = new ProviderOperationResult(ProviderOperationStatus.Failure, null, "Something went wrong", $"Unexpected state:{_settingsUI?.State}");
                         break;
                     }
diff --git a/src/GitHubExtension/Strings/en-US/Resources.resw b/src/GitHubExtension/Strings/en-US/Resources.resw
index dde7ecd..abaa0b2 100644
--- a/src/GitHubExtension/Strings/en-US/Resources.resw
+++ b/src/GitHubExtension/Strings/en-US/Resources.resw
@@ -533,4 +533,12 @@
     <value>There are no releases in this repository.</value>
     <comment>Shown in Widget, when there are no releases</comment>
   </data>
+  <data name="Widget_Template/WidgetTitleLabel" xml:space="preserve">
+    <value>Title (Optional)</value>
+    <comment>Shown in Widget, Label for title</comment>
+  </data>
+  <data name="Widget_Template/WidgetTitlePlaceholder" xml:space="preserve">
+    <value>Widget Title</value>
+    <comment>Shown in Widget, placeholder for title</comment>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/GitHubExtension/Widgets/GitHubIssuesWidget.cs b/src/GitHubExtension/Widgets/GitHubIssuesWidget.cs
index 95fc7dd..79ba19a 100644
--- a/src/GitHubExtension/Widgets/GitHubIssuesWidget.cs
+++ b/src/GitHubExtension/Widgets/GitHubIssuesWidget.cs
@@ -14,8 +14,6 @@ internal class GitHubIssuesWidget : GitHubRepositoryWidget
 {
     private readonly string issuesIconData = IconLoader.GetIconAsBase64("issues.png");
 
-    protected static readonly new string Name = nameof(GitHubIssuesWidget);
-
     public override void DeleteWidget(string widgetId, string customState)
     {
         // Remove event handler.
@@ -34,7 +32,7 @@ public override void RequestContentData()
         // Throttle protection against a widget trigging rapid data updates.
         if (DateTime.Now - LastUpdated < WidgetDataRequestMinTime)
         {
-            Log.Logger()?.ReportDebug(Name, ShortId, "Data request too soon, skipping.");
+            Log.Debug("Data request too soon, skipping.");
         }
 
         if (ActivityState == WidgetActivityState.Configure)
@@ -44,7 +42,7 @@ public override void RequestContentData()
 
         try
         {
-            Log.Logger()?.ReportDebug(Name, ShortId, $"Requesting data update for {GetOwner()}/{GetRepo()}");
+            Log.Debug($"Requesting data update for {GetOwner()}/{GetRepo()}");
             var requestOptions = new RequestOptions
             {
                 UsePublicClientAsFallback = true,
@@ -76,12 +74,12 @@ public override void RequestContentData()
 
             var dataManager = GitHubDataManager.CreateInstance();
             _ = dataManager?.UpdateIssuesForRepositoryAsync(GetOwner(), GetRepo(), requestOptions);
-            Log.Logger()?.ReportInfo(Name, ShortId, $"Requested data update for {GetOwner()}/{GetRepo()}");
+            Log.Information($"Requested data update for {GetOwner()}/{GetRepo()}");
             DataState = WidgetDataState.Requested;
         }
         catch (Exception ex)
         {
-            Log.Logger()?.ReportError(Name, ShortId, "Failed requesting data update.", ex);
+            Log.Error(ex, "Failed requesting data update.");
         }
     }
 
@@ -94,7 +92,7 @@ public override void LoadContentData()
             return;
         }
 
-        Log.Logger()?.ReportDebug(Name, ShortId, "Getting Data for Issues");
+        Log.Debug("Getting Data for Issues");
 
         try
         {
@@ -128,7 +126,7 @@ public override void LoadContentData()
                     { "title", issueItem.Title },
                     { "url", issueItem.HtmlUrl },
                     { "number", issueItem.Number },
-                    { "date", TimeSpanHelper.DateTimeOffsetToDisplayString(issueItem.CreatedAt, Log.Logger()) },
+                    { "date", TimeSpanHelper.DateTimeOffsetToDisplayString(issueItem.CreatedAt, Log) },
                     { "user", issueItem.Author.Login },
                     { "avatar", issueItem.Author.AvatarUrl },
                     { "icon", issuesIconData },
@@ -154,6 +152,7 @@ public override void LoadContentData()
 
             issuesData.Add("issues", issuesArray);
             issuesData.Add("selected_repo", repository?.FullName ?? string.Empty);
+            issuesData.Add("widgetTitle", WidgetTitle);
             issuesData.Add("is_loading_data", DataState == WidgetDataState.Unknown);
             issuesData.Add("issues_icon_data", issuesIconData);
 
@@ -163,7 +162,7 @@ public override void LoadContentData()
         }
         catch (Exception e)
         {
-            Log.Logger()?.ReportError(Name, ShortId, "Error retrieving data.", e);
+            Log.Error(e, "Error retrieving data.");
             DataState = WidgetDataState.Failed;
             return;
         }
@@ -183,7 +182,7 @@ public override string GetTemplatePath(WidgetPageState page)
 
     protected override void DataManagerUpdateHandler(object? source, DataManagerUpdateEventArgs e)
     {
-        Log.Logger()?.ReportDebug(Name, ShortId, $"Data Update Event: Kind={e.Kind} Info={e.Description} Context={string.Join(",", e.Context)}");
+        Log.Debug($"Data Update Event: Kind={e.Kind} Info={e.Description} Context={string.Join(",", e.Context)}");
 
         // Don't update if we're in configuration mode.
         if (ActivityState == WidgetActivityState.Configure)
@@ -196,7 +195,7 @@ protected override void DataManagerUpdateHandler(object? source, DataManagerUpda
             var fullName = Validation.ParseFullNameFromGitHubURL(RepositoryUrl);
             if (fullName == e.Description && e.Context.Contains("Issues"))
             {
-                Log.Logger()?.ReportInfo(Name, ShortId, $"Received matching repository update event.");
+                Log.Information($"Received matching repository update event.");
                 LoadContentData();
                 UpdateActivityState();
             }
diff --git a/src/GitHubExtension/Widgets/GitHubMentionedInWidget.cs b/src/GitHubExtension/Widgets/GitHubMentionedInWidget.cs
index fbae0ed..93e55bf 100644
--- a/src/GitHubExtension/Widgets/GitHubMentionedInWidget.cs
+++ b/src/GitHubExtension/Widgets/GitHubMentionedInWidget.cs
@@ -36,8 +36,6 @@ internal class GitHubMentionedInWidget : GitHubUserWidget
         "W2+XsCNN5MdnNZw38ksp1Odyag9m4AD1g0f1QBnmA2WUN5HPim5V7jiPIsneZsCMdjHvmn" +
         "ZBE9QJ5KFrH0dFXqxnYisOz0HtBybqufmgwMDAwMDFWCmpq/ANfVYnfzsINAAAAAAElFTkSuQmCC";
 
-    protected static readonly new string Name = nameof(GitHubMentionedInWidget);
-
     protected override string GetTitleIconData()
     {
         return TitleIconData;
diff --git a/src/GitHubExtension/Widgets/GitHubPullsWidget.cs b/src/GitHubExtension/Widgets/GitHubPullsWidget.cs
index 18f4875..f373ba3 100644
--- a/src/GitHubExtension/Widgets/GitHubPullsWidget.cs
+++ b/src/GitHubExtension/Widgets/GitHubPullsWidget.cs
@@ -16,8 +16,6 @@ internal class GitHubPullsWidget : GitHubRepositoryWidget
 
     private static Dictionary<string, string> Templates { get; set; } = new();
 
-    protected static readonly new string Name = nameof(GitHubPullsWidget);
-
     public override void DeleteWidget(string widgetId, string customState)
     {
         // Remove event handler.
@@ -36,7 +34,7 @@ public override void RequestContentData()
         // Throttle protection against a widget trigging rapid data updates.
         if (DateTime.Now - LastUpdated < WidgetDataRequestMinTime)
         {
-            Log.Logger()?.ReportDebug(Name, ShortId, "Data request too soon, skipping.");
+            Log.Debug("Data request too soon, skipping.");
         }
 
         if (ActivityState == WidgetActivityState.Configure)
@@ -46,7 +44,7 @@ public override void RequestContentData()
 
         try
         {
-            Log.Logger()?.ReportDebug(Name, ShortId, $"Requesting data update for {GetOwner()}/{GetRepo()}");
+            Log.Debug($"Requesting data update for {GetOwner()}/{GetRepo()}");
             var requestOptions = new RequestOptions
             {
                 PullRequestRequest = new PullRequestRequest
@@ -66,12 +64,12 @@ public override void RequestContentData()
 
             var dataManager = GitHubDataManager.CreateInstance();
             _ = dataManager?.UpdatePullRequestsForRepositoryAsync(GetOwner(), GetRepo(), requestOptions);
-            Log.Logger()?.ReportInfo(Name, ShortId, $"Requested data update for {GetOwner()}/{GetRepo()}");
+            Log.Information($"Requested data update for {GetOwner()}/{GetRepo()}");
             DataState = WidgetDataState.Requested;
         }
         catch (Exception ex)
         {
-            Log.Logger()?.ReportError(Name, ShortId, "Failed requesting data update.", ex);
+            Log.Error(ex, "Failed requesting data update.");
         }
     }
 
@@ -84,7 +82,7 @@ public override void LoadContentData()
             return;
         }
 
-        Log.Logger()?.ReportDebug(Name, ShortId, "Getting Data for Pull Requests");
+        Log.Debug("Getting Data for Pull Requests");
 
         try
         {
@@ -101,7 +99,7 @@ public override void LoadContentData()
                     { "title", pullItem.Title },
                     { "url", pullItem.HtmlUrl },
                     { "number", pullItem.Number },
-                    { "date", TimeSpanHelper.DateTimeOffsetToDisplayString(pullItem.UpdatedAt, Log.Logger()) },
+                    { "date", TimeSpanHelper.DateTimeOffsetToDisplayString(pullItem.UpdatedAt, Log) },
                     { "user", pullItem.Author.Login },
                     { "avatar", pullItem.Author.AvatarUrl },
                     { "icon", pullsIconData },
@@ -127,6 +125,7 @@ public override void LoadContentData()
 
             pullsData.Add("pulls", pullsArray);
             pullsData.Add("selected_repo", repository?.FullName ?? string.Empty);
+            pullsData.Add("widgetTitle", WidgetTitle);
             pullsData.Add("is_loading_data", DataState == WidgetDataState.Unknown);
             pullsData.Add("pulls_icon_data", pullsIconData);
 
@@ -136,7 +135,7 @@ public override void LoadContentData()
         }
         catch (Exception e)
         {
-            Log.Logger()?.ReportError(Name, ShortId, "Error retrieving data.", e);
+            Log.Error(e, "Error retrieving data.");
             DataState = WidgetDataState.Failed;
             return;
         }
@@ -156,7 +155,7 @@ public override string GetTemplatePath(WidgetPageState page)
 
     protected override void DataManagerUpdateHandler(object? source, DataManagerUpdateEventArgs e)
     {
-        Log.Logger()?.ReportDebug(Name, ShortId, $"Data Update Event: Kind={e.Kind} Info={e.Description} Context={string.Join(",", e.Context)}");
+        Log.Debug($"Data Update Event: Kind={e.Kind} Info={e.Description} Context={string.Join(",", e.Context)}");
 
         // Don't update if we're in configuration mode.
         if (ActivityState == WidgetActivityState.Configure)
@@ -169,7 +168,7 @@ protected override void DataManagerUpdateHandler(object? source, DataManagerUpda
             var fullName = Validation.ParseFullNameFromGitHubURL(RepositoryUrl);
             if (fullName == e.Description && e.Context.Contains("PullRequests"))
             {
-                Log.Logger()?.ReportInfo(Name, ShortId, $"Received matching repository update event.");
+                Log.Information($"Received matching repository update event.");
                 LoadContentData();
                 UpdateActivityState();
             }
diff --git a/src/GitHubExtension/Widgets/GitHubReleasesWidget.cs b/src/GitHubExtension/Widgets/GitHubReleasesWidget.cs
index 694d8cf..80c1e52 100644
--- a/src/GitHubExtension/Widgets/GitHubReleasesWidget.cs
+++ b/src/GitHubExtension/Widgets/GitHubReleasesWidget.cs
@@ -14,8 +14,6 @@ internal class GitHubReleasesWidget : GitHubRepositoryWidget
 {
     private readonly string _releasesIconData = IconLoader.GetIconAsBase64("releases.png");
 
-    protected static readonly new string Name = nameof(GitHubReleasesWidget);
-
     public override void DeleteWidget(string widgetId, string customState)
     {
         // Remove event handler.
@@ -34,7 +32,7 @@ public override void RequestContentData()
         // Throttle protection against a widget trigging rapid data updates.
         if (DateTime.Now - LastUpdated < WidgetDataRequestMinTime)
         {
-            Log.Logger()?.ReportDebug(Name, ShortId, "Data request too soon, skipping.");
+            Log.Debug("Data request too soon, skipping.");
         }
 
         if (ActivityState == WidgetActivityState.Configure)
@@ -44,7 +42,7 @@ public override void RequestContentData()
 
         try
         {
-            Log.Logger()?.ReportDebug(Name, ShortId, $"Requesting data update for {GetOwner()}/{GetRepo()}");
+            Log.Debug($"Requesting data update for {GetOwner()}/{GetRepo()}");
             var requestOptions = new RequestOptions
             {
                 UsePublicClientAsFallback = true,
@@ -52,12 +50,12 @@ public override void RequestContentData()
 
             var dataManager = GitHubDataManager.CreateInstance();
             _ = dataManager?.UpdateReleasesForRepositoryAsync(GetOwner(), GetRepo(), requestOptions);
-            Log.Logger()?.ReportInfo(Name, ShortId, $"Requested data update for {GetOwner()}/{GetRepo()}");
+            Log.Information($"Requested data update for {GetOwner()}/{GetRepo()}");
             DataState = WidgetDataState.Requested;
         }
         catch (Exception ex)
         {
-            Log.Logger()?.ReportError(Name, ShortId, "Failed requesting data update.", ex);
+            Log.Error(ex, "Failed requesting data update.");
         }
     }
 
@@ -70,7 +68,7 @@ public override void LoadContentData()
             return;
         }
 
-        Log.Logger()?.ReportDebug(Name, ShortId, "Getting Data for Releases");
+        Log.Debug("Getting Data for Releases");
 
         try
         {
@@ -114,7 +112,7 @@ public override void LoadContentData()
                     { "tag", releaseItem.TagName },
                     { "infoText", infoText },
                     { "infoColor", infoColor },
-                    { "published", TimeSpanHelper.DateTimeOffsetToDisplayString(releaseItem.PublishedAt, Log.Logger()) },
+                    { "published", TimeSpanHelper.DateTimeOffsetToDisplayString(releaseItem.PublishedAt, Log) },
                     { "url", releaseItem.HtmlUrl },
                     { "icon", _releasesIconData },
                 };
@@ -124,6 +122,7 @@ public override void LoadContentData()
 
             releasesData.Add("releases", releasesArray);
             releasesData.Add("selected_repo", repository?.FullName ?? string.Empty);
+            releasesData.Add("widgetTitle", WidgetTitle);
             releasesData.Add("is_loading_data", DataState == WidgetDataState.Unknown);
             releasesData.Add("releases_icon_data", _releasesIconData);
 
@@ -133,7 +132,7 @@ public override void LoadContentData()
         }
         catch (Exception e)
         {
-            Log.Logger()?.ReportError(Name, ShortId, "Error retrieving data.", e);
+            Log.Error(e, "Error retrieving data.");
             DataState = WidgetDataState.Failed;
             return;
         }
@@ -153,7 +152,7 @@ public override string GetTemplatePath(WidgetPageState page)
 
     protected override void DataManagerUpdateHandler(object? source, DataManagerUpdateEventArgs e)
     {
-        Log.Logger()?.ReportDebug(Name, ShortId, $"Data Update Event: Kind={e.Kind} Info={e.Description} Context={string.Join(",", e.Context)}");
+        Log.Debug($"Data Update Event: Kind={e.Kind} Info={e.Description} Context={string.Join(",", e.Context)}");
 
         // Don't update if we're in configuration mode.
         if (ActivityState == WidgetActivityState.Configure)
@@ -166,7 +165,7 @@ protected override void DataManagerUpdateHandler(object? source, DataManagerUpda
             var fullName = Validation.ParseFullNameFromGitHubURL(RepositoryUrl);
             if (fullName == e.Description && e.Context.Contains("Releases"))
             {
-                Log.Logger()?.ReportInfo(Name, ShortId, $"Received matching repository update event.");
+                Log.Information($"Received matching repository update event.");
                 LoadContentData();
                 UpdateActivityState();
             }
diff --git a/src/GitHubExtension/Widgets/GitHubRepositoryWidget.cs b/src/GitHubExtension/Widgets/GitHubRepositoryWidget.cs
index bb775e1..990e7bf 100644
--- a/src/GitHubExtension/Widgets/GitHubRepositoryWidget.cs
+++ b/src/GitHubExtension/Widgets/GitHubRepositoryWidget.cs
@@ -13,8 +13,6 @@ namespace GitHubExtension.Widgets;
 
 public abstract class GitHubRepositoryWidget : GitHubWidget
 {
-    protected static readonly new string Name = nameof(GitHubRepositoryWidget);
-
     protected string RepositoryUrl { get; set; } = string.Empty;
 
     public GitHubRepositoryWidget()
@@ -51,7 +49,7 @@ public string GetUnescapedIssueQuery()
     public override void OnActionInvoked(WidgetActionInvokedArgs actionInvokedArgs)
     {
         var verb = GetWidgetActionForVerb(actionInvokedArgs.Verb);
-        Log.Logger()?.ReportDebug(Name, ShortId, $"ActionInvoked: {verb}");
+        Log.Debug($"ActionInvoked: {verb}");
 
         switch (verb)
         {
@@ -59,6 +57,11 @@ public override void OnActionInvoked(WidgetActionInvokedArgs actionInvokedArgs)
                 HandleCheckUrl(actionInvokedArgs);
                 break;
 
+            case WidgetAction.Save:
+                UpdateTitle(JsonNode.Parse(actionInvokedArgs.Data));
+                base.OnActionInvoked(actionInvokedArgs);
+                break;
+
             default:
                 base.OnActionInvoked(actionInvokedArgs);
                 break;
@@ -88,22 +91,22 @@ protected Octokit.Repository GetRepositoryFromUrl(string url)
                 {
                     case Octokit.NotFoundException:
                         // A private repository will come back as "not found" by the GitHub API when an unauthorized account cannot even view it.
-                        Log.Logger()?.ReportDebug(Name, $"DeveloperId {devId.LoginId} did not find {ownerName}/{repositoryName}");
+                        Log.Debug($"DeveloperId {devId.LoginId} did not find {ownerName}/{repositoryName}");
                         continue;
 
                     case Octokit.RateLimitExceededException:
-                        Log.Logger()?.ReportDebug(Name, $"DeveloperId {devId.LoginId} rate limit exceeded.");
+                        Log.Debug($"DeveloperId {devId.LoginId} rate limit exceeded.");
                         throw ex.InnerException;
 
                     case Octokit.ForbiddenException:
                         // This can happen most commonly with SAML-enabled organizations.
                         // The user may have access but the org blocked the application.
-                        Log.Logger()?.ReportDebug(Name, $"DeveloperId {devId.LoginId} was forbidden access to {ownerName}/{repositoryName}");
+                        Log.Debug($"DeveloperId {devId.LoginId} was forbidden access to {ownerName}/{repositoryName}");
                         throw ex.InnerException;
 
                     default:
                         // If it's some other error like abuse detection, abort and do not continue.
-                        Log.Logger()?.ReportDebug(Name, $"Unhandled Octokit API error for {devId.LoginId} and {ownerName}/{repositoryName}");
+                        Log.Debug($"Unhandled Octokit API error for {devId.LoginId} and {ownerName}/{repositoryName}");
                         throw ex.InnerException;
                 }
             }
@@ -117,6 +120,20 @@ protected Octokit.Repository GetRepositoryFromUrl(string url)
         return repository;
     }
 
+    private void UpdateTitle(JsonNode? dataObj)
+    {
+        if (dataObj == null)
+        {
+            return;
+        }
+
+        GetTitleFromDataObject(dataObj);
+        if (string.IsNullOrEmpty(WidgetTitle))
+        {
+            WidgetTitle = GetRepositoryFromUrl(RepositoryUrl).FullName;
+        }
+    }
+
     protected override void ResetWidgetInfoFromState()
     {
         JsonNode? dataObject = null;
@@ -127,8 +144,8 @@ protected override void ResetWidgetInfoFromState()
         }
         catch (JsonException e)
         {
-            Log.Logger()?.ReportWarn(Name, ShortId, $"Failed to parse ConfigurationData; attempting migration. {e.Message}");
-            Log.Logger()?.ReportDebug(Name, ShortId, $"Json parse failure.", e);
+            Log.Warning($"Failed to parse ConfigurationData; attempting migration. {e.Message}");
+            Log.Debug($"Json parse failure.", e);
 
             try
             {
@@ -136,7 +153,7 @@ protected override void ResetWidgetInfoFromState()
                 // and we get a failure, check if it is the old version.
                 if (!string.IsNullOrEmpty(ConfigurationData))
                 {
-                    Log.Logger()?.ReportInfo(Name, ShortId, $"Found string data format, migrating to JSON format. Data: {ConfigurationData}");
+                    Log.Information($"Found string data format, migrating to JSON format. Data: {ConfigurationData}");
                     var migratedState = new JsonObject
                     {
                         { "url", ConfigurationData },
@@ -151,7 +168,7 @@ protected override void ResetWidgetInfoFromState()
             catch (Exception ex)
             {
                 // Adding for abundance of caution because we have seen crashes in this space.
-                Log.Logger()?.ReportError(Name, ShortId, $"Unexpected failure during migration.", ex);
+                Log.Error(ex, $"Unexpected failure during migration.");
             }
         }
 
@@ -159,13 +176,14 @@ protected override void ResetWidgetInfoFromState()
         {
             dataObject ??= JsonNode.Parse(ConfigurationData);
             RepositoryUrl = dataObject!["url"]?.GetValue<string>() ?? string.Empty;
+            UpdateTitle(dataObject);
         }
         catch (Exception e)
         {
             // If we fail to parse configuration data, do nothing, report the failure, and don't
             // crash the entire extension.
             RepositoryUrl = string.Empty;
-            Log.Logger()?.ReportError(Name, ShortId, $"Unexpected error while resetting state: {e.Message}", e);
+            Log.Error(e, $"Unexpected error while resetting state: {e.Message}");
         }
     }
 
@@ -189,6 +207,7 @@ private void HandleCheckUrl(WidgetActionInvokedArgs args)
         if (dataObject != null && dataObject["url"] != null)
         {
             RepositoryUrl = dataObject["url"]?.GetValue<string>() ?? string.Empty;
+            UpdateTitle(dataObject);
 
             ConfigurationData = data;
 
@@ -208,6 +227,7 @@ public string GetConfiguration(string dataUrl)
         var configurationData = new JsonObject
         {
             { "submitIcon", IconLoader.GetIconAsBase64("arrow.png") },
+            { "widgetTitle", WidgetTitle },
         };
 
         if (dataUrl == string.Empty)
@@ -247,7 +267,7 @@ public string GetConfiguration(string dataUrl)
             }
             catch (Exception ex)
             {
-                Log.Logger()?.ReportError(Name, ShortId, $"Failed getting configuration information for input url: {dataUrl}", ex);
+                Log.Error(ex, $"Failed getting configuration information for input url: {dataUrl}");
                 configurationData.Add("hasConfiguration", false);
 
                 var repositoryData = new JsonObject
diff --git a/src/GitHubExtension/Widgets/GitHubReviewWidget.cs b/src/GitHubExtension/Widgets/GitHubReviewWidget.cs
index 9a24842..ac7f0e7 100644
--- a/src/GitHubExtension/Widgets/GitHubReviewWidget.cs
+++ b/src/GitHubExtension/Widgets/GitHubReviewWidget.cs
@@ -11,8 +11,6 @@ namespace GitHubExtension.Widgets;
 
 internal class GitHubReviewWidget : GitHubUserWidget
 {
-    protected static readonly new string Name = nameof(GitHubReviewWidget);
-
     public GitHubReviewWidget()
         : base()
     {
@@ -54,6 +52,7 @@ public override void OnActionInvoked(WidgetActionInvokedArgs actionInvokedArgs)
             }
 
             DeveloperLoginId = dataObject["account"]?.GetValue<string>() ?? string.Empty;
+            UpdateTitle(dataObject);
 
             ConfigurationData = data;
 
diff --git a/src/GitHubExtension/Widgets/GitHubUserWidget.cs b/src/GitHubExtension/Widgets/GitHubUserWidget.cs
index 38796c4..e46a346 100644
--- a/src/GitHubExtension/Widgets/GitHubUserWidget.cs
+++ b/src/GitHubExtension/Widgets/GitHubUserWidget.cs
@@ -15,8 +15,6 @@ namespace GitHubExtension.Widgets;
 
 internal abstract class GitHubUserWidget : GitHubWidget
 {
-    protected static readonly new string Name = nameof(GitHubUserWidget);
-
     protected string DeveloperLoginId { get; set; } = string.Empty;
 
     protected SearchCategory ShowCategory { get; set; } = SearchCategory.Unknown;
@@ -57,6 +55,15 @@ public override void OnWidgetContextChanged(WidgetContextChangedArgs contextChan
         UpdateActivityState();
     }
 
+    protected void UpdateTitle(JsonNode dataObj)
+    {
+        GetTitleFromDataObject(dataObj);
+        if (string.IsNullOrEmpty(WidgetTitle))
+        {
+            WidgetTitle = UserName;
+        }
+    }
+
     protected override void ResetWidgetInfoFromState()
     {
         JsonNode? dataObject = null;
@@ -67,8 +74,8 @@ protected override void ResetWidgetInfoFromState()
         }
         catch (JsonException e)
         {
-            Log.Logger()?.ReportWarn(Name, ShortId, $"Failed to parse ConfigurationData; attempting migration. {e.Message}");
-            Log.Logger()?.ReportDebug(Name, ShortId, $"Json parse failure.", e);
+            Log.Warning($"Failed to parse ConfigurationData; attempting migration. {e.Message}");
+            Log.Debug($"Json parse failure.", e);
 
             try
             {
@@ -76,7 +83,7 @@ protected override void ResetWidgetInfoFromState()
                 // and we get a failure, assume it is the old version.
                 if (!string.IsNullOrEmpty(ConfigurationData))
                 {
-                    Log.Logger()?.ReportInfo(Name, ShortId, $"Found string data format, migrating to JSON format. Data: {ConfigurationData}");
+                    Log.Information($"Found string data format, migrating to JSON format. Data: {ConfigurationData}");
                     var migratedState = new JsonObject
                     {
                         { "showCategory", ConfigurationData },
@@ -101,7 +108,7 @@ protected override void ResetWidgetInfoFromState()
             catch (Exception ex)
             {
                 // Adding for abundance of caution because we have seen crashes in this space.
-                Log.Logger()?.ReportError(Name, ShortId, $"Unexpected failure during migration.", ex);
+                Log.Error(ex, $"Unexpected failure during migration.");
             }
         }
 
@@ -110,6 +117,7 @@ protected override void ResetWidgetInfoFromState()
             dataObject ??= JsonNode.Parse(ConfigurationData);
             ShowCategory = EnumHelper.StringToSearchCategory(dataObject!["showCategory"]?.GetValue<string>() ?? string.Empty);
             DeveloperLoginId = dataObject!["account"]?.GetValue<string>() ?? string.Empty;
+            UpdateTitle(dataObject);
         }
         catch (Exception e)
         {
@@ -117,7 +125,7 @@ protected override void ResetWidgetInfoFromState()
             // crash the entire extension.
             DeveloperLoginId = string.Empty;
             ShowCategory = SearchCategory.Unknown;
-            Log.Logger()?.ReportError(Name, ShortId, $"Unexpected error while resetting state: {e.Message}", e);
+            Log.Error(e, $"Unexpected error while resetting state: {e.Message}");
         }
     }
 
@@ -141,6 +149,7 @@ public override void OnActionInvoked(WidgetActionInvokedArgs actionInvokedArgs)
 
             ShowCategory = EnumHelper.StringToSearchCategory(dataObject["showCategory"]?.GetValue<string>() ?? string.Empty);
             DeveloperLoginId = dataObject["account"]?.GetValue<string>() ?? string.Empty;
+            UpdateTitle(dataObject);
 
             ConfigurationData = data;
 
@@ -193,7 +202,7 @@ protected void RequestContentData(SearchIssuesRequest request)
         // Throttle protection against a widget trigging rapid data updates.
         if (DateTime.Now - LastUpdated < WidgetDataRequestMinTime)
         {
-            Log.Logger()?.ReportDebug(Name, ShortId, "Data request too soon, skipping.");
+            Log.Debug("Data request too soon, skipping.");
         }
 
         if (ActivityState == WidgetActivityState.Configure)
@@ -203,7 +212,7 @@ protected void RequestContentData(SearchIssuesRequest request)
 
         try
         {
-            Log.Logger()?.ReportInfo(Name, ShortId, $"Requesting data update for {UserName}");
+            Log.Information($"Requesting data update for {UserName}");
             var requestOptions = new RequestOptions
             {
                 ApiOptions = new ApiOptions
@@ -224,12 +233,12 @@ protected void RequestContentData(SearchIssuesRequest request)
             }
 
             searchManager?.SearchForGitHubIssuesOrPRs(request, Id, ShowCategory, developerId, requestOptions);
-            Log.Logger()?.ReportInfo(Name, ShortId, $"Requested data update for {UserName}");
+            Log.Information($"Requested data update for {UserName}");
             DataState = WidgetDataState.Requested;
         }
         catch (Exception ex)
         {
-            Log.Logger()?.ReportError(Name, ShortId, "Failed requesting data update.", ex);
+            Log.Error(ex, "Failed requesting data update.");
         }
     }
 
@@ -240,6 +249,7 @@ public override void LoadContentData()
             { "openCount", 0 },
             { "items", new JsonArray() },
             { "userName", UserName },
+            { "widgetTitle", WidgetTitle },
             { "titleIconUrl", GetTitleIconData() },
             { "is_loading_data", true },
         };
@@ -248,7 +258,7 @@ public override void LoadContentData()
 
     public void LoadContentData(IEnumerable<Octokit.Issue> items)
     {
-        Log.Logger()?.ReportDebug(Name, ShortId, "Getting Data for Category in Widget");
+        Log.Debug("Getting Data for Category in Widget");
 
         try
         {
@@ -262,7 +272,7 @@ public void LoadContentData(IEnumerable<Octokit.Issue> items)
                     { "title", item.Title },
                     { "url", item.HtmlUrl },
                     { "number", item.Number },
-                    { "date", TimeSpanHelper.DateTimeOffsetToDisplayString(item.UpdatedAt, Log.Logger()) },
+                    { "date", TimeSpanHelper.DateTimeOffsetToDisplayString(item.UpdatedAt, Log) },
                     { "user", item.User.Login },
                     { "avatar", item.User.AvatarUrl },
                     { "iconUrl", IconLoader.GetIconAsBase64(item.PullRequest == null ? "issues.png" : "pulls.png") },
@@ -292,6 +302,7 @@ public void LoadContentData(IEnumerable<Octokit.Issue> items)
             issuesData.Add("items", issuesArray);
             issuesData.Add("userName", UserName);
             issuesData.Add("titleIconUrl", GetTitleIconData());
+            issuesData.Add("widgetTitle", WidgetTitle);
 
             LastUpdated = DateTime.Now;
             ContentData = issuesData.ToJsonString();
@@ -299,7 +310,7 @@ public void LoadContentData(IEnumerable<Octokit.Issue> items)
         }
         catch (Exception e)
         {
-            Log.Logger()?.ReportError(Name, ShortId, "Error retrieving data.", e);
+            Log.Error(e, "Error retrieving data.");
             DataState = WidgetDataState.Failed;
             return;
         }
@@ -309,7 +320,7 @@ public override string GetData(WidgetPageState page)
     {
         return page switch
         {
-            WidgetPageState.SignIn => new JsonObject { { "message", Resources.GetResource(@"Widget_Template/SignInRequired", Log.Logger()) } }.ToJsonString(),
+            WidgetPageState.SignIn => new JsonObject { { "message", Resources.GetResource(@"Widget_Template/SignInRequired", Log) } }.ToJsonString(),
             WidgetPageState.Configure => GetConfigurationData(),
             WidgetPageState.Content => ContentData,
             WidgetPageState.Loading => EmptyJson,
@@ -336,7 +347,7 @@ protected void AddDevIds(ref JsonObject configurationData)
 
         foreach (var developerId in DeveloperIdProvider.GetInstance().GetLoggedInDeveloperIds().DeveloperIds)
         {
-            Log.Logger()?.ReportInfo(developerId.LoginId);
+            Log.Information(developerId.LoginId);
             developerIdsData.Add(new JsonObject
             {
                 { "devId", developerId.LoginId },
@@ -353,6 +364,7 @@ public string GetConfigurationData()
             { "showCategory", EnumHelper.SearchCategoryToString(ShowCategory == SearchCategory.Unknown ? SearchCategory.IssuesAndPullRequests : ShowCategory) },
             { "savedShowCategory", SavedConfigurationData },
             { "configuring", true },
+            { "widgetTitle", WidgetTitle },
         };
 
         if (!string.IsNullOrEmpty(DeveloperLoginId))
@@ -371,10 +383,10 @@ public string GetConfigurationData()
 
     private void SearchManagerResultsAvailableHandler(IEnumerable<Octokit.Issue> results, string widgetId)
     {
-        Log.Logger()?.ReportDebug(Name, ShortId, $"Results Available Event: ID={widgetId}");
+        Log.Debug($"Results Available Event: ID={widgetId}");
         if (widgetId == Id)
         {
-            Log.Logger()?.ReportInfo(Name, ShortId, $"Received matching repository update event.");
+            Log.Information($"Received matching repository update event.");
             LoadContentData(results);
             UpdateActivityState();
         }
diff --git a/src/GitHubExtension/Widgets/GitHubWidget.cs b/src/GitHubExtension/Widgets/GitHubWidget.cs
index 341fabf..98d06f7 100644
--- a/src/GitHubExtension/Widgets/GitHubWidget.cs
+++ b/src/GitHubExtension/Widgets/GitHubWidget.cs
@@ -20,8 +20,6 @@ public abstract class GitHubWidget : WidgetImpl
 
     private DateTime lastUpdateRequest = DateTime.MinValue;
 
-    protected static readonly string Name = nameof(GitHubWidget);
-
     protected WidgetActivityState ActivityState { get; set; } = WidgetActivityState.Unknown;
 
     protected WidgetDataState DataState { get; set; } = WidgetDataState.Unknown;
@@ -45,6 +43,8 @@ protected string ConfigurationData
 
     protected string SavedConfigurationData { get; set; } = string.Empty;
 
+    protected string WidgetTitle { get; set; } = string.Empty;
+
     protected DateTime LastUpdated { get; set; } = DateTime.MinValue;
 
     protected DataUpdater DataUpdater { get; set; }
@@ -115,7 +115,7 @@ public override void OnWidgetContextChanged(WidgetContextChangedArgs contextChan
     public override void OnActionInvoked(WidgetActionInvokedArgs actionInvokedArgs)
     {
         var verb = GetWidgetActionForVerb(actionInvokedArgs.Verb);
-        Log.Logger()?.ReportDebug(Name, ShortId, $"ActionInvoked: {verb}");
+        Log.Debug($"ActionInvoked: {verb}");
 
         switch (verb)
         {
@@ -151,7 +151,7 @@ public override void OnActionInvoked(WidgetActionInvokedArgs actionInvokedArgs)
                 break;
 
             case WidgetAction.Unknown:
-                Log.Logger()?.ReportError(Name, ShortId, $"Unknown verb: {actionInvokedArgs.Verb}");
+                Log.Error($"Unknown verb: {actionInvokedArgs.Verb}");
                 break;
         }
     }
@@ -165,13 +165,18 @@ public override void OnCustomizationRequested(WidgetCustomizationRequestedArgs c
         SetConfigure();
     }
 
+    protected void GetTitleFromDataObject(JsonNode dataObj)
+    {
+        WidgetTitle = dataObj!["widgetTitle"]?.GetValue<string>() ?? string.Empty;
+    }
+
     private async Task HandleSignIn()
     {
-        Log.Logger()?.ReportInfo($"WidgetAction invoked for user sign in");
+        Log.Information($"WidgetAction invoked for user sign in");
         var authProvider = DeveloperIdProvider.GetInstance();
         await authProvider.LoginNewDeveloperIdAsync();
         UpdateActivityState();
-        Log.Logger()?.ReportInfo($"User sign in successful from WidgetAction invocation");
+        Log.Information($"User sign in successful from WidgetAction invocation");
     }
 
     protected WidgetAction GetWidgetActionForVerb(string verb)
@@ -183,7 +188,7 @@ protected WidgetAction GetWidgetActionForVerb(string verb)
         catch (Exception)
         {
             // Invalid verb.
-            Log.Logger()?.ReportError($"Unknown WidgetAction verb: {verb}");
+            Log.Error($"Unknown WidgetAction verb: {verb}");
             return WidgetAction.Unknown;
         }
     }
@@ -192,7 +197,7 @@ public string GetSignIn()
     {
         var signInData = new JsonObject
         {
-            { "message", Resources.GetResource(@"Widget_Template/SignInRequired", Log.Logger()) },
+            { "message", Resources.GetResource(@"Widget_Template/SignInRequired", Log) },
         };
 
         return signInData.ToString();
@@ -238,7 +243,7 @@ public void UpdateWidget()
             CustomState = ConfigurationData,
         };
 
-        Log.Logger()?.ReportDebug(Name, ShortId, $"Updating widget for {Page}");
+        Log.Debug($"Updating widget for {Page}");
         WidgetManager.GetDefault().UpdateWidget(updateOptions);
     }
 
@@ -256,7 +261,7 @@ protected string GetTemplateForPage(WidgetPageState page)
     {
         if (Template.ContainsKey(page))
         {
-            Log.Logger()?.ReportDebug(Name, ShortId, $"Using cached template for {page}");
+            Log.Debug($"Using cached template for {page}");
             return Template[page];
         }
 
@@ -264,14 +269,14 @@ protected string GetTemplateForPage(WidgetPageState page)
         {
             var path = Path.Combine(AppContext.BaseDirectory, GetTemplatePath(page));
             var template = File.ReadAllText(path, Encoding.Default) ?? throw new FileNotFoundException(path);
-            template = Resources.ReplaceIdentifiers(template, Resources.GetWidgetResourceIdentifiers(), Log.Logger());
-            Log.Logger()?.ReportDebug(Name, ShortId, $"Caching template for {page}");
+            template = Resources.ReplaceIdentifiers(template, Resources.GetWidgetResourceIdentifiers(), Log);
+            Log.Debug($"Caching template for {page}");
             Template[page] = template;
             return template;
         }
         catch (Exception e)
         {
-            Log.Logger()?.ReportError(Name, ShortId, "Error getting template.", e);
+            Log.Error(e, "Error getting template.");
             return string.Empty;
         }
     }
@@ -283,7 +288,7 @@ protected string GetCurrentState()
 
     protected void LogCurrentState()
     {
-        Log.Logger()?.ReportDebug(Name, ShortId, GetCurrentState());
+        Log.Debug(GetCurrentState());
     }
 
     protected void SetActive()
@@ -371,7 +376,7 @@ private async Task PeriodicUpdate()
         }
         catch (Exception ex)
         {
-            Log.Logger()?.ReportError(Name, ShortId, "Failed Requesting Update", ex);
+            Log.Error(ex, "Failed Requesting Update");
         }
 
         lastUpdateRequest = DateTime.Now;
@@ -379,7 +384,7 @@ private async Task PeriodicUpdate()
 
     private void HandleDeveloperIdChange(object? sender, IDeveloperId e)
     {
-        Log.Logger()?.ReportInfo(Name, ShortId, $"Change in Developer Id,  Updating widget state.");
+        Log.Information($"Change in Developer Id,  Updating widget state.");
         UpdateActivityState();
     }
 }
diff --git a/src/GitHubExtension/Widgets/Log.cs b/src/GitHubExtension/Widgets/Log.cs
deleted file mode 100644
index b8a4ba3..0000000
--- a/src/GitHubExtension/Widgets/Log.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using DevHome.Logging;
-using Windows.Storage;
-
-namespace GitHubExtension.Widgets;
-
-public class Log
-{
-    private static Logger? _logger;
-
-    public static Logger? Logger()
-    {
-        try
-        {
-            _logger ??= new Logger("Widgets", GetLoggingOptions());
-        }
-        catch
-        {
-            // Do nothing if logger fails.
-        }
-
-        return _logger;
-    }
-
-    public static Options GetLoggingOptions()
-    {
-        return new Options
-        {
-            LogFileFolderRoot = ApplicationData.Current.TemporaryFolder.Path,
-            LogFileName = "Widgets_{now}.dhlog",
-            LogFileFolderName = "Widgets",
-            DebugListenerEnabled = true,
-#if DEBUG
-            LogStdoutEnabled = true,
-            LogStdoutFilter = SeverityLevel.Debug,
-            LogFileFilter = SeverityLevel.Debug,
-#else
-            LogStdoutEnabled = false,
-            LogStdoutFilter = SeverityLevel.Info,
-            LogFileFilter = SeverityLevel.Info,
-#endif
-            FailFastSeverity = FailFastSeverityLevel.Critical,
-        };
-    }
-}
diff --git a/src/GitHubExtension/Widgets/Templates/GitHubAssignedConfigurationTemplate.json b/src/GitHubExtension/Widgets/Templates/GitHubAssignedConfigurationTemplate.json
index dc27076..cc0bf80 100644
--- a/src/GitHubExtension/Widgets/Templates/GitHubAssignedConfigurationTemplate.json
+++ b/src/GitHubExtension/Widgets/Templates/GitHubAssignedConfigurationTemplate.json
@@ -16,6 +16,13 @@
         }
       ]
     },
+    {
+      "type": "Input.Text",
+      "placeholder": "%Widget_Template/WidgetTitlePlaceholder%",
+      "id": "widgetTitle",
+      "label": "%Widget_Template/WidgetTitleLabel%",
+      "value": "${widgetTitle}"
+    },
     {
       "type": "ColumnSet",
       "columns": [
diff --git a/src/GitHubExtension/Widgets/Templates/GitHubAssignedTemplate.json b/src/GitHubExtension/Widgets/Templates/GitHubAssignedTemplate.json
index e2835d9..46d3320 100644
--- a/src/GitHubExtension/Widgets/Templates/GitHubAssignedTemplate.json
+++ b/src/GitHubExtension/Widgets/Templates/GitHubAssignedTemplate.json
@@ -22,7 +22,7 @@
           "items": [
             {
               "type": "TextBlock",
-              "text": "${userName}",
+              "text": "${widgetTitle}",
               "size": "Large",
               "style": "Heading",
               "wrap": true
diff --git a/src/GitHubExtension/Widgets/Templates/GitHubIssuesConfigurationTemplate.json b/src/GitHubExtension/Widgets/Templates/GitHubIssuesConfigurationTemplate.json
index 29d72ec..0333c9a 100644
--- a/src/GitHubExtension/Widgets/Templates/GitHubIssuesConfigurationTemplate.json
+++ b/src/GitHubExtension/Widgets/Templates/GitHubIssuesConfigurationTemplate.json
@@ -18,6 +18,13 @@
       "placeholder": "%Widget_Template_Input/UrlPlaceholder%",
       "value": "${$root.configuration.url}"
     },
+    {
+      "type": "Input.Text",
+      "placeholder": "%Widget_Template/WidgetTitlePlaceholder%",
+      "id": "widgetTitle",
+      "label": "%Widget_Template/WidgetTitleLabel%",
+      "value": "${widgetTitle}"
+    },
     {
       "type": "Container",
       "items": [
diff --git a/src/GitHubExtension/Widgets/Templates/GitHubIssuesTemplate.json b/src/GitHubExtension/Widgets/Templates/GitHubIssuesTemplate.json
index d6d4f08..b8b4616 100644
--- a/src/GitHubExtension/Widgets/Templates/GitHubIssuesTemplate.json
+++ b/src/GitHubExtension/Widgets/Templates/GitHubIssuesTemplate.json
@@ -24,7 +24,7 @@
           "items": [
             {
               "type": "TextBlock",
-              "text": "${selected_repo}",
+              "text": "${widgetTitle}",
               "size": "large",
               "style": "heading",
               "wrap": true
diff --git a/src/GitHubExtension/Widgets/Templates/GitHubMentionedInConfigurationTemplate.json b/src/GitHubExtension/Widgets/Templates/GitHubMentionedInConfigurationTemplate.json
index 70becf0..59338b7 100644
--- a/src/GitHubExtension/Widgets/Templates/GitHubMentionedInConfigurationTemplate.json
+++ b/src/GitHubExtension/Widgets/Templates/GitHubMentionedInConfigurationTemplate.json
@@ -16,6 +16,13 @@
         }
       ]
     },
+    {
+      "type": "Input.Text",
+      "placeholder": "%Widget_Template/WidgetTitlePlaceholder%",
+      "id": "widgetTitle",
+      "label": "%Widget_Template/WidgetTitleLabel%",
+      "value": "${widgetTitle}"
+    },
     {
       "type": "ColumnSet",
       "columns": [
diff --git a/src/GitHubExtension/Widgets/Templates/GitHubMentionedInTemplate.json b/src/GitHubExtension/Widgets/Templates/GitHubMentionedInTemplate.json
index ee19fee..6985087 100644
--- a/src/GitHubExtension/Widgets/Templates/GitHubMentionedInTemplate.json
+++ b/src/GitHubExtension/Widgets/Templates/GitHubMentionedInTemplate.json
@@ -22,7 +22,7 @@
           "items": [
             {
               "type": "TextBlock",
-              "text": "${userName}",
+              "text": "${widgetTitle}",
               "size": "Large",
               "style": "Heading",
               "wrap": true
diff --git a/src/GitHubExtension/Widgets/Templates/GitHubPullsConfigurationTemplate.json b/src/GitHubExtension/Widgets/Templates/GitHubPullsConfigurationTemplate.json
index 8e7768f..881d356 100644
--- a/src/GitHubExtension/Widgets/Templates/GitHubPullsConfigurationTemplate.json
+++ b/src/GitHubExtension/Widgets/Templates/GitHubPullsConfigurationTemplate.json
@@ -18,6 +18,13 @@
       "placeholder": "%Widget_Template_Input/UrlPlaceholder%",
       "value": "${$root.configuration.url}"
     },
+    {
+      "type": "Input.Text",
+      "placeholder": "%Widget_Template/WidgetTitlePlaceholder%",
+      "id": "widgetTitle",
+      "label": "%Widget_Template/WidgetTitleLabel%",
+      "value": "${widgetTitle}"
+    },
     {
       "type": "Container",
       "items": [
diff --git a/src/GitHubExtension/Widgets/Templates/GitHubPullsTemplate.json b/src/GitHubExtension/Widgets/Templates/GitHubPullsTemplate.json
index a31ba58..41be78b 100644
--- a/src/GitHubExtension/Widgets/Templates/GitHubPullsTemplate.json
+++ b/src/GitHubExtension/Widgets/Templates/GitHubPullsTemplate.json
@@ -24,7 +24,7 @@
           "items": [
             {
               "type": "TextBlock",
-              "text": "${selected_repo}",
+              "text": "${widgetTitle}",
               "size": "large",
               "style": "heading",
               "wrap": true
diff --git a/src/GitHubExtension/Widgets/Templates/GitHubReleasesConfigurationTemplate.json b/src/GitHubExtension/Widgets/Templates/GitHubReleasesConfigurationTemplate.json
index 16b6bc4..a2af178 100644
--- a/src/GitHubExtension/Widgets/Templates/GitHubReleasesConfigurationTemplate.json
+++ b/src/GitHubExtension/Widgets/Templates/GitHubReleasesConfigurationTemplate.json
@@ -18,6 +18,13 @@
       "placeholder": "%Widget_Template_Input/UrlPlaceholder%",
       "value": "${$root.configuration.url}"
     },
+    {
+      "type": "Input.Text",
+      "placeholder": "%Widget_Template/WidgetTitlePlaceholder%",
+      "id": "widgetTitle",
+      "label": "%Widget_Template/WidgetTitleLabel%",
+      "value": "${widgetTitle}"
+    },
     {
       "type": "Container",
       "items": [
diff --git a/src/GitHubExtension/Widgets/Templates/GitHubReleasesTemplate.json b/src/GitHubExtension/Widgets/Templates/GitHubReleasesTemplate.json
index aacfb7e..ded7002 100644
--- a/src/GitHubExtension/Widgets/Templates/GitHubReleasesTemplate.json
+++ b/src/GitHubExtension/Widgets/Templates/GitHubReleasesTemplate.json
@@ -24,7 +24,7 @@
           "items": [
             {
               "type": "TextBlock",
-              "text": "${selected_repo}",
+              "text": "${widgetTitle}",
               "size": "large",
               "style": "heading",
               "wrap": true
diff --git a/src/GitHubExtension/Widgets/Templates/GitHubReviewConfigurationTemplate.json b/src/GitHubExtension/Widgets/Templates/GitHubReviewConfigurationTemplate.json
index eefd35f..f2d150b 100644
--- a/src/GitHubExtension/Widgets/Templates/GitHubReviewConfigurationTemplate.json
+++ b/src/GitHubExtension/Widgets/Templates/GitHubReviewConfigurationTemplate.json
@@ -16,6 +16,13 @@
         }
       ]
     },
+    {
+      "type": "Input.Text",
+      "placeholder": "%Widget_Template/WidgetTitlePlaceholder%",
+      "id": "widgetTitle",
+      "label": "%Widget_Template/WidgetTitleLabel%",
+      "value": "${widgetTitle}"
+    },
     {
       "type": "ColumnSet",
       "columns": [
diff --git a/src/GitHubExtension/Widgets/Templates/GitHubReviewTemplate.json b/src/GitHubExtension/Widgets/Templates/GitHubReviewTemplate.json
index cc70900..d7134c0 100644
--- a/src/GitHubExtension/Widgets/Templates/GitHubReviewTemplate.json
+++ b/src/GitHubExtension/Widgets/Templates/GitHubReviewTemplate.json
@@ -22,7 +22,7 @@
           "items": [
             {
               "type": "TextBlock",
-              "text": "${userName}",
+              "text": "${widgetTitle}",
               "size": "Large",
               "style": "Heading",
               "wrap": true
diff --git a/src/GitHubExtension/Widgets/WidgetImpl.cs b/src/GitHubExtension/Widgets/WidgetImpl.cs
index c6ee2c8..eda4398 100644
--- a/src/GitHubExtension/Widgets/WidgetImpl.cs
+++ b/src/GitHubExtension/Widgets/WidgetImpl.cs
@@ -1,25 +1,25 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using GitHubExtension.Telemetry;
 using Microsoft.Windows.Widgets.Providers;
+using Serilog;
 
 namespace GitHubExtension.Widgets;
 
 public abstract class WidgetImpl
 {
-    private readonly ILogger logger;
     private string _state = string.Empty;
 
     public WidgetImpl()
     {
-        logger = LoggerFactory.Get<ILogger>();
+        _log = new(() => Serilog.Log.ForContext("SourceContext", SourceName));
     }
 
-    protected ILogger Logger()
-    {
-        return logger;
-    }
+    private readonly Lazy<ILogger> _log;
+
+    protected ILogger Log => _log.Value;
+
+    protected string Name => GetType().Name;
 
     protected string Id { get; set; } = string.Empty;
 
@@ -27,6 +27,8 @@ protected ILogger Logger()
     // match another running widget.
     protected string ShortId => Id.Length > 6 ? Id[..6] : Id;
 
+    protected string SourceName => string.IsNullOrEmpty(ShortId) ? Name : $"{Name}/{ShortId}";
+
     public string State()
     {
         return _state;
diff --git a/src/GitHubExtension/Widgets/WidgetImplFactory`1.cs b/src/GitHubExtension/Widgets/WidgetImplFactory.cs
similarity index 54%
rename from src/GitHubExtension/Widgets/WidgetImplFactory`1.cs
rename to src/GitHubExtension/Widgets/WidgetImplFactory.cs
index b4ead9f..661ec1e 100644
--- a/src/GitHubExtension/Widgets/WidgetImplFactory`1.cs
+++ b/src/GitHubExtension/Widgets/WidgetImplFactory.cs
@@ -1,18 +1,21 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using Microsoft.Windows.Widgets.Providers;
-
-namespace GitHubExtension.Widgets;
-
-internal class WidgetImplFactory<T> : IWidgetImplFactory
-    where T : WidgetImpl, new()
-{
-    public WidgetImpl Create(WidgetContext widgetContext, string state)
-    {
-        Log.Logger()?.ReportDebug($"In WidgetImpl Create for Id {widgetContext.Id} Definition: {widgetContext.DefinitionId} and state: '{state}'");
-        WidgetImpl widgetImpl = new T();
-        widgetImpl.CreateWidget(widgetContext, state);
-        return widgetImpl;
-    }
-}
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using Microsoft.Windows.Widgets.Providers;
+using Serilog;
+
+namespace GitHubExtension.Widgets;
+
+[System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1649:File name should match first type name", Justification = "Templated class")]
+internal class WidgetImplFactory<T> : IWidgetImplFactory
+    where T : WidgetImpl, new()
+{
+    public WidgetImpl Create(WidgetContext widgetContext, string state)
+    {
+        var log = Log.ForContext("SourceContext", nameof(WidgetImpl));
+        log.Debug($"In WidgetImpl Create for Id {widgetContext.Id} Definition: {widgetContext.DefinitionId} and state: '{state}'");
+        WidgetImpl widgetImpl = new T();
+        widgetImpl.CreateWidget(widgetContext, state);
+        return widgetImpl;
+    }
+}
diff --git a/src/GitHubExtension/Widgets/WidgetProvider.cs b/src/GitHubExtension/Widgets/WidgetProvider.cs
index 9305b08..f9f1181 100644
--- a/src/GitHubExtension/Widgets/WidgetProvider.cs
+++ b/src/GitHubExtension/Widgets/WidgetProvider.cs
@@ -3,6 +3,7 @@
 
 using System.Runtime.InteropServices;
 using Microsoft.Windows.Widgets.Providers;
+using Serilog;
 
 namespace GitHubExtension.Widgets;
 
@@ -11,9 +12,11 @@ namespace GitHubExtension.Widgets;
 [Guid("F23870B0-B391-4466-84E2-42A991078613")]
 public sealed class WidgetProvider : IWidgetProvider, IWidgetProvider2
 {
+    private readonly ILogger _log = Log.ForContext("SourceContext", nameof(WidgetProvider));
+
     public WidgetProvider()
     {
-        Log.Logger()?.ReportDebug("Provider Constructed");
+        _log.Verbose("Provider Constructed");
         widgetDefinitionRegistry.Add("GitHub_Issues", new WidgetImplFactory<GitHubIssuesWidget>());
         widgetDefinitionRegistry.Add("GitHub_PullRequests", new WidgetImplFactory<GitHubPullsWidget>());
         widgetDefinitionRegistry.Add("GitHub_MentionedIns", new WidgetImplFactory<GitHubMentionedInWidget>());
@@ -23,11 +26,6 @@ public WidgetProvider()
         RecoverRunningWidgets();
     }
 
-    ~WidgetProvider()
-    {
-        Log.Logger()?.Dispose();
-    }
-
     private readonly Dictionary<string, IWidgetImplFactory> widgetDefinitionRegistry = new();
     private readonly Dictionary<string, WidgetImpl> runningWidgets = new();
 
@@ -35,7 +33,7 @@ private void InitializeWidget(WidgetContext widgetContext, string state)
     {
         var widgetId = widgetContext.Id;
         var widgetDefinitionId = widgetContext.DefinitionId;
-        Log.Logger()?.ReportDebug($"Calling Initialize for Widget Id: {widgetId} - {widgetDefinitionId}");
+        _log.Verbose($"Calling Initialize for Widget Id: {widgetId} - {widgetDefinitionId}");
         if (widgetDefinitionRegistry.ContainsKey(widgetDefinitionId))
         {
             if (!runningWidgets.ContainsKey(widgetId))
@@ -46,12 +44,12 @@ private void InitializeWidget(WidgetContext widgetContext, string state)
             }
             else
             {
-                Log.Logger()?.ReportWarn($"Attempted to initialize a widget twice: {widgetDefinitionId} - {widgetId}");
+                _log.Warning($"Attempted to initialize a widget twice: {widgetDefinitionId} - {widgetId}");
             }
         }
         else
         {
-            Log.Logger()?.ReportError($"Unknown widget DefinitionId: {widgetDefinitionId}");
+            _log.Error($"Unknown widget DefinitionId: {widgetDefinitionId}");
         }
     }
 
@@ -64,13 +62,13 @@ private void RecoverRunningWidgets()
         }
         catch (Exception e)
         {
-            Log.Logger()?.ReportError("Failed retrieving list of running widgets.", e);
+            _log.Error(e, "Failed retrieving list of running widgets.");
             return;
         }
 
         if (runningWidgets is null)
         {
-            Log.Logger()?.ReportDebug("No running widgets to recover.");
+            _log.Debug("No running widgets to recover.");
             return;
         }
 
@@ -82,18 +80,18 @@ private void RecoverRunningWidgets()
             }
         }
 
-        Log.Logger()?.ReportDebug("Finished recovering widgets.");
+        _log.Debug("Finished recovering widgets.");
     }
 
     public void CreateWidget(WidgetContext widgetContext)
     {
-        Log.Logger()?.ReportInfo($"CreateWidget id: {widgetContext.Id} definitionId: {widgetContext.DefinitionId}");
+        _log.Information($"CreateWidget id: {widgetContext.Id} definitionId: {widgetContext.DefinitionId}");
         InitializeWidget(widgetContext, string.Empty);
     }
 
     public void Activate(WidgetContext widgetContext)
     {
-        Log.Logger()?.ReportDebug($"Activate id: {widgetContext.Id} definitionId: {widgetContext.DefinitionId}");
+        _log.Verbose($"Activate id: {widgetContext.Id} definitionId: {widgetContext.DefinitionId}");
         var widgetId = widgetContext.Id;
         if (runningWidgets.ContainsKey(widgetId))
         {
@@ -102,7 +100,7 @@ public void Activate(WidgetContext widgetContext)
         else
         {
             // Called to activate a widget that we don't know about, which is unexpected. Try to recover by creating it.
-            Log.Logger()?.ReportWarn($"Found WidgetId that was not known: {widgetContext.Id}, attempting to recover by creating it.");
+            _log.Warning($"Found WidgetId that was not known: {widgetContext.Id}, attempting to recover by creating it.");
             CreateWidget(widgetContext);
             if (runningWidgets.ContainsKey(widgetId))
             {
@@ -113,7 +111,7 @@ public void Activate(WidgetContext widgetContext)
 
     public void Deactivate(string widgetId)
     {
-        Log.Logger()?.ReportDebug($"Deactivate id: {widgetId}");
+        _log.Verbose($"Deactivate id: {widgetId}");
         if (runningWidgets.ContainsKey(widgetId))
         {
             runningWidgets[widgetId].Deactivate(widgetId);
@@ -122,7 +120,7 @@ public void Deactivate(string widgetId)
 
     public void DeleteWidget(string widgetId, string customState)
     {
-        Log.Logger()?.ReportInfo($"DeleteWidget id: {widgetId}");
+        _log.Information($"DeleteWidget id: {widgetId}");
         if (runningWidgets.ContainsKey(widgetId))
         {
             runningWidgets[widgetId].DeleteWidget(widgetId, customState);
@@ -132,7 +130,7 @@ public void DeleteWidget(string widgetId, string customState)
 
     public void OnActionInvoked(WidgetActionInvokedArgs actionInvokedArgs)
     {
-        Log.Logger()?.ReportDebug($"OnActionInvoked id: {actionInvokedArgs.WidgetContext.Id} definitionId: {actionInvokedArgs.WidgetContext.DefinitionId}");
+        _log.Debug($"OnActionInvoked id: {actionInvokedArgs.WidgetContext.Id} definitionId: {actionInvokedArgs.WidgetContext.DefinitionId}");
         var widgetContext = actionInvokedArgs.WidgetContext;
         var widgetId = widgetContext.Id;
         if (runningWidgets.ContainsKey(widgetId))
@@ -143,7 +141,7 @@ public void OnActionInvoked(WidgetActionInvokedArgs actionInvokedArgs)
 
     public void OnCustomizationRequested(WidgetCustomizationRequestedArgs customizationRequestedArgs)
     {
-        Log.Logger()?.ReportDebug($"OnCustomizationRequested id: {customizationRequestedArgs.WidgetContext.Id} definitionId: {customizationRequestedArgs.WidgetContext.DefinitionId}");
+        _log.Debug($"OnCustomizationRequested id: {customizationRequestedArgs.WidgetContext.Id} definitionId: {customizationRequestedArgs.WidgetContext.DefinitionId}");
         var widgetContext = customizationRequestedArgs.WidgetContext;
         var widgetId = widgetContext.Id;
         if (runningWidgets.ContainsKey(widgetId))
@@ -154,7 +152,7 @@ public void OnCustomizationRequested(WidgetCustomizationRequestedArgs customizat
 
     public void OnWidgetContextChanged(WidgetContextChangedArgs contextChangedArgs)
     {
-        Log.Logger()?.ReportDebug($"OnWidgetContextChanged id: {contextChangedArgs.WidgetContext.Id} definitionId: {contextChangedArgs.WidgetContext.DefinitionId}");
+        _log.Debug($"OnWidgetContextChanged id: {contextChangedArgs.WidgetContext.Id} definitionId: {contextChangedArgs.WidgetContext.DefinitionId}");
         var widgetContext = contextChangedArgs.WidgetContext;
         var widgetId = widgetContext.Id;
         if (runningWidgets.ContainsKey(widgetId))
diff --git a/src/GitHubExtension/Widgets/WidgetProviderFactory`1.cs b/src/GitHubExtension/Widgets/WidgetProviderFactory.cs
similarity index 89%
rename from src/GitHubExtension/Widgets/WidgetProviderFactory`1.cs
rename to src/GitHubExtension/Widgets/WidgetProviderFactory.cs
index a72d36d..9d50b50 100644
--- a/src/GitHubExtension/Widgets/WidgetProviderFactory`1.cs
+++ b/src/GitHubExtension/Widgets/WidgetProviderFactory.cs
@@ -1,52 +1,53 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using System.Runtime.InteropServices;
-using GitHubExtension.Widgets.COM;
-using Microsoft.Windows.Widgets.Providers;
-using WinRT;
-
-namespace GitHubExtension.Widgets;
-
-public class WidgetProviderFactory<T> : IClassFactory
-where T : IWidgetProvider
-{
-    private readonly Func<T> _createWidget;
-
-    public WidgetProviderFactory(Func<T> createWidget)
-    {
-        _createWidget = createWidget;
-    }
-
-    public int CreateInstance(IntPtr pUnkOuter, ref Guid riid, out IntPtr ppvObject)
-    {
-        ppvObject = IntPtr.Zero;
-
-        if (pUnkOuter != IntPtr.Zero)
-        {
-            Marshal.ThrowExceptionForHR(CLASSENOAGGREGATION);
-        }
-
-        if (riid == typeof(T).GUID || riid == Guid.Parse(Guids.IUnknown))
-        {
-            // Create the instance of the .NET object
-            ppvObject = MarshalInspectable<IWidgetProvider>.FromManaged(_createWidget());
-        }
-        else
-        {
-            // The object that ppvObject points to does not support the
-            // interface identified by riid.
-            Marshal.ThrowExceptionForHR(ENOINTERFACE);
-        }
-
-        return 0;
-    }
-
-    int IClassFactory.LockServer(bool fLock)
-    {
-        return 0;
-    }
-
-    private const int CLASSENOAGGREGATION = unchecked((int)0x80040110);
-    private const int ENOINTERFACE = unchecked((int)0x80004002);
-}
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using System.Runtime.InteropServices;
+using GitHubExtension.Widgets.COM;
+using Microsoft.Windows.Widgets.Providers;
+using WinRT;
+
+namespace GitHubExtension.Widgets;
+
+[System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1649:File name should match first type name", Justification = "Templated class")]
+public class WidgetProviderFactory<T> : IClassFactory
+where T : IWidgetProvider
+{
+    private readonly Func<T> _createWidget;
+
+    public WidgetProviderFactory(Func<T> createWidget)
+    {
+        _createWidget = createWidget;
+    }
+
+    public int CreateInstance(IntPtr pUnkOuter, ref Guid riid, out IntPtr ppvObject)
+    {
+        ppvObject = IntPtr.Zero;
+
+        if (pUnkOuter != IntPtr.Zero)
+        {
+            Marshal.ThrowExceptionForHR(CLASSENOAGGREGATION);
+        }
+
+        if (riid == typeof(T).GUID || riid == Guid.Parse(Guids.IUnknown))
+        {
+            // Create the instance of the .NET object
+            ppvObject = MarshalInspectable<IWidgetProvider>.FromManaged(_createWidget());
+        }
+        else
+        {
+            // The object that ppvObject points to does not support the
+            // interface identified by riid.
+            Marshal.ThrowExceptionForHR(ENOINTERFACE);
+        }
+
+        return 0;
+    }
+
+    int IClassFactory.LockServer(bool fLock)
+    {
+        return 0;
+    }
+
+    private const int CLASSENOAGGREGATION = unchecked((int)0x80040110);
+    private const int ENOINTERFACE = unchecked((int)0x80004002);
+}
diff --git a/src/GitHubExtension/Widgets/WidgetServer.cs b/src/GitHubExtension/Widgets/WidgetServer.cs
index 3cb7146..d3a0128 100644
--- a/src/GitHubExtension/Widgets/WidgetServer.cs
+++ b/src/GitHubExtension/Widgets/WidgetServer.cs
@@ -5,6 +5,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
 using Microsoft.Windows.Widgets.Providers;
+using Serilog;
 
 namespace GitHubExtension.Widgets;
 
@@ -19,9 +20,10 @@ public sealed class WidgetServer : IDisposable
     public void RegisterWidget<T>(Func<T> createWidget)
         where T : IWidgetProvider
     {
-        Log.Logger()?.ReportDebug($"Registering class object:");
-        Log.Logger()?.ReportDebug($"CLSID: {typeof(T).GUID:B}");
-        Log.Logger()?.ReportDebug($"Type: {typeof(T)}");
+        var log = Log.ForContext("SourceContext", nameof(WidgetServer));
+        log.Debug($"Registering class object:");
+        log.Debug($"CLSID: {typeof(T).GUID:B}");
+        log.Debug($"Type: {typeof(T)}");
 
         int cookie;
         var clsid = typeof(T).GUID;
@@ -38,7 +40,7 @@ public void RegisterWidget<T>(Func<T> createWidget)
         }
 
         registrationCookies.Add(cookie);
-        Log.Logger()?.ReportDebug($"Cookie: {cookie}");
+        log.Debug($"Cookie: {cookie}");
         hr = Ole32.CoResumeClassObjects();
         if (hr < 0)
         {
@@ -53,10 +55,11 @@ public void Run()
 
     public void Dispose()
     {
-        Log.Logger()?.ReportDebug($"Revoking class object registrations:");
+        var log = Log.ForContext("SourceContext", nameof(WidgetServer));
+        log.Debug($"Revoking class object registrations:");
         foreach (var cookie in registrationCookies)
         {
-            Log.Logger()?.ReportDebug($"Cookie: {cookie}");
+            log.Debug($"Cookie: {cookie}");
             var hr = Ole32.CoRevokeClassObject(cookie);
             Debug.Assert(hr >= 0, $"CoRevokeClassObject failed ({hr:x}). Cookie: {cookie}");
         }
diff --git a/src/GitHubExtensionServer/GitHubExtensionServer.csproj b/src/GitHubExtensionServer/GitHubExtensionServer.csproj
index 5eb4554..e9f52f6 100644
--- a/src/GitHubExtensionServer/GitHubExtensionServer.csproj
+++ b/src/GitHubExtensionServer/GitHubExtensionServer.csproj
@@ -44,6 +44,22 @@
     <Folder Include="Assets\" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
+    <PackageReference Include="Serilog" Version="3.1.1" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
+    <PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="appsettings.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
   <PropertyGroup>
     <DefineConstants Condition="'$(BuildRing)'=='Canary'">$(DefineConstants);CANARY_BUILD</DefineConstants>
     <DefineConstants Condition="'$(BuildRing)'=='Stable'">$(DefineConstants);STABLE_BUILD</DefineConstants>
diff --git a/src/GitHubExtensionServer/Log.cs b/src/GitHubExtensionServer/Log.cs
deleted file mode 100644
index f120878..0000000
--- a/src/GitHubExtensionServer/Log.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using DevHome.Logging;
-using Windows.Storage;
-
-namespace GitHubExtension.ExtensionServer;
-
-public class Log
-{
-    private static Logger? _logger;
-
-    public static Logger? Logger()
-    {
-        try
-        {
-            _logger ??= new Logger("Extension", GetLoggingOptions());
-        }
-        catch
-        {
-            // Do nothing if logger fails.
-        }
-
-        return _logger;
-    }
-
-    public static Options GetLoggingOptions()
-    {
-        return new Options
-        {
-            LogFileFolderRoot = ApplicationData.Current.TemporaryFolder.Path,
-            LogFileName = "ExtensionServer_{now}.dhlog",
-            LogFileFolderName = "ExtensionServer",
-            DebugListenerEnabled = true,
-#if DEBUG
-            LogStdoutEnabled = true,
-            LogStdoutFilter = SeverityLevel.Debug,
-            LogFileFilter = SeverityLevel.Debug,
-#else
-            LogStdoutEnabled = false,
-            LogStdoutFilter = SeverityLevel.Info,
-            LogFileFilter = SeverityLevel.Info,
-#endif
-            FailFastSeverity = FailFastSeverityLevel.Critical,
-        };
-    }
-}
diff --git a/src/GitHubExtensionServer/Program.cs b/src/GitHubExtensionServer/Program.cs
index 17b0a19..0e99d46 100644
--- a/src/GitHubExtensionServer/Program.cs
+++ b/src/GitHubExtensionServer/Program.cs
@@ -1,11 +1,13 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using GitHubExtension.ExtensionServer;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Windows.AppLifecycle;
 using Microsoft.Windows.AppNotifications;
+using Serilog;
 using Windows.ApplicationModel.Activation;
 using Windows.Management.Deployment;
+using Windows.Storage;
 
 namespace GitHubExtension;
 
@@ -14,7 +16,16 @@ public sealed class Program
     [MTAThread]
     public static void Main([System.Runtime.InteropServices.WindowsRuntime.ReadOnlyArray] string[] args)
     {
-        Log.Logger()?.ReportInfo($"Launched with args: {string.Join(' ', args.ToArray())}");
+        // Setup Logging
+        Environment.SetEnvironmentVariable("DEVHOME_LOGS_ROOT", ApplicationData.Current.TemporaryFolder.Path);
+        var configuration = new ConfigurationBuilder()
+            .AddJsonFile("appsettings.json")
+            .Build();
+        Log.Logger = new LoggerConfiguration()
+            .ReadFrom.Configuration(configuration)
+            .CreateLogger();
+
+        Log.Information($"Launched with args: {string.Join(' ', args.ToArray())}");
         LogPackageInformation();
 
         // Set up notification handling. This must happen before GetActivatedEventArgs().
@@ -26,9 +37,10 @@ public static void Main([System.Runtime.InteropServices.WindowsRuntime.ReadOnlyA
         var activationArgs = AppInstance.GetCurrent().GetActivatedEventArgs();
         if (!mainInstance.IsCurrent)
         {
-            Log.Logger()?.ReportInfo($"Not main instance, redirecting.");
+            Log.Information($"Not main instance, redirecting.");
             mainInstance.RedirectActivationToAsync(activationArgs).AsTask().Wait();
             notificationManager.Unregister();
+            Log.CloseAndFlush();
             return;
         }
 
@@ -45,16 +57,16 @@ public static void Main([System.Runtime.InteropServices.WindowsRuntime.ReadOnlyA
         }
         else
         {
-            Log.Logger()?.ReportWarn("Not being launched as a ComServer... exiting.");
+            Log.Warning("Not being launched as a ComServer... exiting.");
         }
 
         notificationManager.Unregister();
-        Log.Logger()?.Dispose();
+        Log.CloseAndFlush();
     }
 
     private static void AppActivationRedirected(object? sender, Microsoft.Windows.AppLifecycle.AppActivationArguments activationArgs)
     {
-        Log.Logger()?.ReportInfo($"Redirected with kind: {activationArgs.Kind}");
+        Log.Information($"Redirected with kind: {activationArgs.Kind}");
 
         // Handle COM server.
         if (activationArgs.Kind == ExtendedActivationKind.Launch)
@@ -64,7 +76,7 @@ private static void AppActivationRedirected(object? sender, Microsoft.Windows.Ap
 
             if (args?.Length > 0 && args[1] == "-RegisterProcessAsComServer")
             {
-                Log.Logger()?.ReportInfo($"Activation COM Registration Redirect: {string.Join(' ', args.ToList())}");
+                Log.Information($"Activation COM Registration Redirect: {string.Join(' ', args.ToList())}");
                 HandleCOMServerActivation();
             }
         }
@@ -81,7 +93,7 @@ private static void AppActivationRedirected(object? sender, Microsoft.Windows.Ap
             var d = activationArgs.Data as IProtocolActivatedEventArgs;
             if (d is not null)
             {
-                Log.Logger()?.ReportInfo($"Protocol Activation redirected from: {d.Uri}");
+                Log.Information($"Protocol Activation redirected from: {d.Uri}");
                 HandleProtocolActivation(d.Uri);
             }
         }
@@ -92,7 +104,7 @@ private static void HandleNotificationActivation(AppActivationArguments activati
         var notificationArgs = activationArgs.Data as AppNotificationActivatedEventArgs;
         if (notificationArgs != null)
         {
-            Log.Logger()?.ReportInfo($"Notification Activation.");
+            Log.Information($"Notification Activation.");
             Notifications.NotificationHandler.NotificationActivation(notificationArgs);
         }
     }
@@ -104,7 +116,7 @@ private static void HandleProtocolActivation(Uri oauthRedirectUri)
 
     private static void HandleCOMServerActivation()
     {
-        Log.Logger()?.ReportInfo($"Activating COM Server");
+        Log.Information($"Activating COM Server");
 
         // Register and run COM server.
         // This could be called by either of the COM registrations, we will do them all to avoid deadlock and bind all on the extension's lifetime.
@@ -130,7 +142,7 @@ private static void HandleCOMServerActivation()
         // This will make the main thread wait until the event is signaled by the extension class.
         // Since we have single instance of the extension object, we exit as soon as it is disposed.
         extensionDisposedEvent.WaitOne();
-        Log.Logger()?.ReportInfo($"Extension is disposed.");
+        Log.Information($"Extension is disposed.");
     }
 
     private static void LogPackageInformation()
@@ -140,6 +152,7 @@ private static void LogPackageInformation()
               "MicrosoftWindows.Client.WebExperience_cw5n1h2txyewy",
               "Microsoft.Windows.DevHome_8wekyb3d8bbwe",
               "Microsoft.Windows.DevHomeGitHubExtension_8wekyb3d8bbwe",
+              "Microsoft.Windows.DevHomeGitHubExtension.Dev_8wekyb3d8bbwe",
         };
 
         try
@@ -149,13 +162,13 @@ private static void LogPackageInformation()
             {
                 foreach (var package in packageManager.FindPackagesForUser(string.Empty, pfn))
                 {
-                    Log.Logger()?.ReportInfo($"{package.Id.FullName}  DevMode: {package.IsDevelopmentMode}  Signature: {package.SignatureKind}");
+                    Log.Information($"{package.Id.FullName}  DevMode: {package.IsDevelopmentMode}  Signature: {package.SignatureKind}");
                 }
             }
         }
         catch (Exception ex)
         {
-            Log.Logger()?.ReportError("Failed getting package information.", ex);
+            Log.Error(ex, "Failed getting package information.");
         }
     }
 }
diff --git a/src/GitHubExtensionServer/appsettings.json b/src/GitHubExtensionServer/appsettings.json
new file mode 100644
index 0000000..a96f270
--- /dev/null
+++ b/src/GitHubExtensionServer/appsettings.json
@@ -0,0 +1,31 @@
+{
+  "Serilog": {
+    "Using": [ "Serilog.Sinks.Console", "Serilog.Sinks.File", "Serilog.Sinks.Debug" ],
+    "MinimumLevel": "Debug",
+    "WriteTo": [
+      {
+        "Name": "Console",
+        "Args": {
+          "outputTemplate": "[{Timestamp:yyyy/MM/dd HH:mm:ss.fff} {Level:u3}] ({SourceContext}) {Message:lj}{NewLine}{Exception}",
+          "restrictedToMinimumLevel": "Debug"
+        }
+      },
+      {
+        "Name": "File",
+        "Args": {
+          "path": "%DEVHOME_LOGS_ROOT%\\log.dhlog",
+          "outputTemplate": "[{Timestamp:yyyy/MM/dd HH:mm:ss.fff} {Level:u3}] ({SourceContext}) {Message:lj}{NewLine}{Exception}",
+          "restrictedToMinimumLevel": "Information",
+          "rollingInterval": "Day"
+        }
+      },
+      {
+        "Name" : "Debug"
+      }
+    ],
+    "Enrich": [ "FromLogContext" ],
+    "Properties": {
+      "SourceContext": "GitHubExtension"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/Logging/DevHome.Logging.csproj b/src/Logging/DevHome.Logging.csproj
deleted file mode 100644
index e6e1d30..0000000
--- a/src/Logging/DevHome.Logging.csproj
+++ /dev/null
@@ -1,17 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(SolutionDir)ToolingVersions.props" />
-
-  <PropertyGroup>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <Platforms>x86;x64;arm64</Platforms>
-    <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
-  </PropertyGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <ControlFlowGuard>Guard</ControlFlowGuard>
-      <SpectreMitigation>Spectre</SpectreMitigation>
-    </ClCompile>
-  </ItemDefinitionGroup>
-</Project>
diff --git a/src/Logging/helpers/DictionaryExtensions.cs b/src/Logging/helpers/DictionaryExtensions.cs
deleted file mode 100644
index fdc5427..0000000
--- a/src/Logging/helpers/DictionaryExtensions.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-namespace DevHome.Logging.Helpers;
-
-public static class DictionaryExtensions
-{
-    public static void DisposeAll<TKey, TValue>(this IDictionary<TKey, TValue> dictionary)
-    {
-        if (dictionary is null)
-        {
-            throw new ArgumentNullException(nameof(dictionary));
-        }
-
-        foreach (var kv in dictionary)
-        {
-            if (kv.Key is IDisposable keyDisposable)
-            {
-                keyDisposable.Dispose();
-            }
-
-            if (kv.Value is IDisposable valDisposable)
-            {
-                valDisposable.Dispose();
-            }
-        }
-    }
-}
diff --git a/src/Logging/helpers/StringExtensions.cs b/src/Logging/helpers/StringExtensions.cs
deleted file mode 100644
index 24eb5c4..0000000
--- a/src/Logging/helpers/StringExtensions.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using System.Globalization;
-
-namespace DevHome.Logging.Helpers;
-
-public static class StringExtensions
-{
-    public static string ToStringInvariant<T>(this T value) => Convert.ToString(value, CultureInfo.InvariantCulture)!;
-
-    public static string FormatInvariant(this string value, params object[] arguments)
-    {
-        return string.Format(CultureInfo.InvariantCulture, value, arguments);
-    }
-}
diff --git a/src/Logging/listeners/DebugListener.cs b/src/Logging/listeners/DebugListener.cs
deleted file mode 100644
index 2f5fa8f..0000000
--- a/src/Logging/listeners/DebugListener.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using System.Diagnostics;
-using System.Globalization;
-using System.Text;
-
-namespace DevHome.Logging.Listeners;
-
-public class DebugListener : ListenerBase
-{
-    public DebugListener(string name)
-        : base(name)
-    {
-    }
-
-    public override void HandleLogEvent(LogEvent evt)
-    {
-        // This listener does nothing unless a Debugger is attached.
-        // All events will be sent to the debugger.
-        if (Debugger.IsAttached)
-        {
-            DebugHandleLogEvent(evt);
-        }
-    }
-
-    private void DebugHandleLogEvent(LogEvent evt)
-    {
-        var sb = new StringBuilder();
-        sb.Append(CultureInfo.InvariantCulture, $"[{evt.FullSourceName}] {evt.Severity.ToString().ToUpper(CultureInfo.InvariantCulture)}: {evt.Message}");
-        if (evt.Exception != null)
-        {
-            sb.Append(CultureInfo.InvariantCulture, $"{Environment.NewLine}{evt.Exception}");
-        }
-
-        Trace.WriteLine(sb.ToString());
-    }
-}
diff --git a/src/Logging/listeners/DebugListenerOptions.cs b/src/Logging/listeners/DebugListenerOptions.cs
deleted file mode 100644
index bdf9fd4..0000000
--- a/src/Logging/listeners/DebugListenerOptions.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-namespace DevHome.Logging;
-
-public partial class Options
-{
-    public bool DebugListenerEnabled { get; set; } = true;
-}
diff --git a/src/Logging/listeners/IListener.cs b/src/Logging/listeners/IListener.cs
deleted file mode 100644
index 6bb582e..0000000
--- a/src/Logging/listeners/IListener.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-namespace DevHome.Logging.Listeners;
-
-public interface IListener
-{
-    string Name
-    {
-        get;
-    }
-
-    ILoggerHost? Host
-    {
-        get;
-        set;
-    }
-
-    void HandleLogEvent(LogEvent evt);
-}
diff --git a/src/Logging/listeners/ListenerBase.cs b/src/Logging/listeners/ListenerBase.cs
deleted file mode 100644
index 03c37bd..0000000
--- a/src/Logging/listeners/ListenerBase.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-namespace DevHome.Logging.Listeners;
-
-public abstract class ListenerBase : IListener
-{
-    public ILoggerHost? Host
-    {
-        get;
-        set;
-    }
-
-    public Options? Options => Host?.Options;
-
-    public string Name
-    {
-        get;
-    }
-
-    public ListenerBase(string name)
-    {
-        Host = null;
-        Name = name;
-    }
-
-    public abstract void HandleLogEvent(LogEvent evt);
-}
diff --git a/src/Logging/listeners/LogFileListener.cs b/src/Logging/listeners/LogFileListener.cs
deleted file mode 100644
index 72d505e..0000000
--- a/src/Logging/listeners/LogFileListener.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using System.Globalization;
-
-namespace DevHome.Logging.Listeners;
-
-public class LogFileListener : ListenerBase, IDisposable
-{
-    private readonly TextWriter? writer;
-
-    public LogFileListener(string name, string filename)
-        : base(name)
-    {
-        // Should handle locked file situation better.
-        // For now assume one process is writing each file.
-        // And fail silently if we can't write for whatever reason.
-        try
-        {
-            var options = new FileStreamOptions
-            {
-                Access = FileAccess.Write,
-                Mode = FileMode.Append,
-                Share = FileShare.ReadWrite,
-            };
-            writer = TextWriter.Synchronized(new StreamWriter(filename, options));
-        }
-        catch (IOException)
-        {
-            // Do nothing, we don't want to crash the program because
-            // the log file couldn't be written, carry on without it.
-        }
-    }
-
-    public override void HandleLogEvent(LogEvent evt)
-    {
-        HandleLogFileEvent(evt, true);
-    }
-
-    private void HandleLogFileEvent(LogEvent evt, bool newline)
-    {
-        HandleLogFileEvent(evt, newline, LogEvent.NoElapsed);
-    }
-
-    private void HandleLogFileEvent(LogEvent evt, bool newline, TimeSpan elapsed)
-    {
-        if (!MeetsFilter(evt))
-        {
-            return;
-        }
-
-        writer?.Write($"[{evt.Created:yyyy/MM/dd hh\\:mm\\:ss\\.ffff}][{evt.FullSourceName}] {evt.Severity.ToString().ToUpper(CultureInfo.InvariantCulture)}: {evt.Message}");
-        if (elapsed != LogEvent.NoElapsed)
-        {
-            writer?.Write($" [Elapsed: {elapsed:hh\\:mm\\:ss\\.ffffff}]");
-        }
-
-        if (evt.Exception != null)
-        {
-            WriteLine(newline);
-            writer?.Write(evt?.Exception.ToString());
-        }
-
-        if (newline)
-        {
-            writer?.WriteLine();
-        }
-
-        writer?.Flush();
-    }
-
-    private void WriteLine(bool newline)
-    {
-        if (newline)
-        {
-            writer?.WriteLine();
-        }
-    }
-
-    private bool MeetsFilter(LogEvent evt) => evt?.Severity >= Options?.LogFileFilter;
-
-    private bool disposed; // To detect redundant calls
-
-    protected virtual void Dispose(bool disposing)
-    {
-        if (disposed)
-        {
-            return;
-        }
-
-        if (disposing)
-        {
-            writer?.Dispose();
-        }
-
-        disposed = true;
-    }
-
-    public void Dispose()
-    {
-        // Do not change this code. Put cleanup code in Dispose(bool disposing) above.
-        Dispose(true);
-        GC.SuppressFinalize(this);
-    }
-}
diff --git a/src/Logging/listeners/LogFileListenerOptions.cs b/src/Logging/listeners/LogFileListenerOptions.cs
deleted file mode 100644
index 557f8b6..0000000
--- a/src/Logging/listeners/LogFileListenerOptions.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-namespace DevHome.Logging;
-
-public partial class Options
-{
-    private const string LogFileNameDefault = "DevHomeGitHubExtension.dhlog";
-    private const string LogFileFolderNameDefault = "{now}";
-
-    public string LogFileName { get; set; } = LogFileNameDefault;
-
-    public string LogFileFolderName { get; set; } = LogFileFolderNameDefault;
-
-    // The Temp Path is used for storage by default so tests can run this code without being packaged.
-    // If we directly put in the ApplicationData folder, it would fail anytime the program was not packaged.
-    // For use with packaged application, set in Options to:
-    //     ApplicationData.Current.TemporaryFolder.Path
-    public string LogFileFolderRoot { get; set; } = Path.GetTempPath();
-
-    public string LogFileFolderPath => Path.Combine(LogFileFolderRoot, LogFileFolderName);
-
-    public bool LogFileEnabled { get; set; } = true;
-
-    public SeverityLevel LogFileFilter { get; set; } = SeverityLevel.Info;
-}
diff --git a/src/Logging/listeners/StdoutListener.cs b/src/Logging/listeners/StdoutListener.cs
deleted file mode 100644
index 7f80c01..0000000
--- a/src/Logging/listeners/StdoutListener.cs
+++ /dev/null
@@ -1,133 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using System.Globalization;
-
-namespace DevHome.Logging.Listeners;
-
-public class StdoutListener : ListenerBase
-{
-    private static readonly ConsoleColor CDefaultColor = ConsoleColor.White;
-    private static readonly ConsoleColor CDebugColor = ConsoleColor.DarkGray;
-    private static readonly ConsoleColor CInfoColor = ConsoleColor.White;
-    private static readonly ConsoleColor CWarnColor = ConsoleColor.Yellow;
-    private static readonly ConsoleColor CErrorColor = ConsoleColor.Red;
-    private static readonly ConsoleColor CCriticalColor = ConsoleColor.Magenta;
-    private static readonly ConsoleColor CExceptionColor = ConsoleColor.Red;
-    private static readonly ConsoleColor CElapsedColor = ConsoleColor.Green;
-    private static readonly ConsoleColor CSourceColor = ConsoleColor.Cyan;
-
-    // Static lock object so different instances of the Stdout listener do not simultaneously write
-    // to stdout and have interleaved tearing of messages.
-    private static readonly object _stdoutLock = new();
-
-    public StdoutListener(string name)
-        : base(name)
-    {
-    }
-
-    public override void HandleLogEvent(LogEvent evt)
-    {
-        ConsoleHandleLogEvent(evt, true);
-    }
-
-    private void ConsoleHandleLogEvent(LogEvent evt, bool newline)
-    {
-        ConsoleHandleLogEvent(evt, newline, LogEvent.NoElapsed);
-    }
-
-    private void ConsoleHandleLogEvent(LogEvent evt, bool newline, TimeSpan elapsed)
-    {
-        if (!MeetsFilter(evt))
-        {
-            return;
-        }
-
-        var line = new List<Tuple<ConsoleColor, string>>
-        {
-            Tuple.Create(CDefaultColor, "["),
-            Tuple.Create(CSourceColor, (evt.SubSource != null) ? $"{evt.Source}/{evt.SubSource}" : $"{evt.Source}"),
-            Tuple.Create(CDefaultColor, "] "),
-            Tuple.Create(GetSeverityColor(evt.Severity), evt.Severity.ToString().ToUpper(CultureInfo.InvariantCulture)),
-            Tuple.Create(CDefaultColor, ": "),
-            Tuple.Create(GetSeverityColor(evt.Severity), evt.Message),
-        };
-
-        if (elapsed != LogEvent.NoElapsed)
-        {
-            line.Add(Tuple.Create(CDefaultColor, " ["));
-            line.Add(Tuple.Create(CElapsedColor, $"Elapsed: {elapsed:hh\\:mm\\:ss\\.ffffff}"));
-            line.Add(Tuple.Create(CDefaultColor, "]"));
-        }
-
-        if (evt.Exception != null)
-        {
-            line.Add(Tuple.Create(CExceptionColor, $"{Environment.NewLine}{evt.Exception}"));
-        }
-
-        if (newline)
-        {
-            line.Add(Tuple.Create(CDefaultColor, Environment.NewLine));
-        }
-
-        // Do this in a static lock to prevent tearing.
-        lock (_stdoutLock)
-        {
-            try
-            {
-                WriteColor(line);
-                Console.ResetColor();
-                Console.Out.Flush();
-            }
-            catch
-            {
-            }
-        }
-    }
-
-    private bool MeetsFilter(LogEvent evt)
-    {
-        return evt.Severity >= Options?.LogStdoutFilter;
-    }
-
-    private void WriteColor(List<Tuple<ConsoleColor, string>> strings)
-    {
-        if (strings == null)
-        {
-            return;
-        }
-
-        foreach (var s in strings)
-        {
-            WriteColor(s);
-        }
-    }
-
-    private void WriteColor(Tuple<ConsoleColor, string> s)
-    {
-        if (Console.IsOutputRedirected)
-        {
-            Console.Write(s.Item2);
-        }
-        else
-        {
-            var currentColor = Console.ForegroundColor;
-            Console.ForegroundColor = s.Item1;
-            Console.Write(s.Item2);
-            Console.ForegroundColor = currentColor;
-        }
-    }
-
-    private ConsoleColor GetSeverityColor(SeverityLevel severity)
-    {
-        return severity switch
-        {
-            SeverityLevel.Debug => CDebugColor,
-            SeverityLevel.Info => CInfoColor,
-            SeverityLevel.Warn => CWarnColor,
-            SeverityLevel.Error => CErrorColor,
-            SeverityLevel.Critical => CCriticalColor,
-            _ => CDefaultColor,
-        };
-    }
-}
diff --git a/src/Logging/listeners/StdoutListenerOptions.cs b/src/Logging/listeners/StdoutListenerOptions.cs
deleted file mode 100644
index bbfe3aa..0000000
--- a/src/Logging/listeners/StdoutListenerOptions.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-namespace DevHome.Logging;
-
-public partial class Options
-{
-    public bool LogStdoutEnabled { get; set; } = true;
-
-    public SeverityLevel LogStdoutFilter { get; set; } = SeverityLevel.Info;
-}
diff --git a/src/Logging/logger/FailFast.cs b/src/Logging/logger/FailFast.cs
deleted file mode 100644
index a5565a3..0000000
--- a/src/Logging/logger/FailFast.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-namespace DevHome.Logging;
-
-public enum SeverityLevel
-{
-    Debug,
-    Info,
-    Warn,
-    Error,
-    Critical,
-}
-
-// For setting fail-fast behavior, at what level of failure will we conduct a fail-fast?
-// This is mostly intended for specifying whether any error or any critical error causes an FailFast.
-// By default we assume any critical failure is by definition something we should not continue after detecting.
-public enum FailFastSeverityLevel
-{
-    Ignore = -1,
-    Warning = SeverityLevel.Warn,
-    Error = SeverityLevel.Error,
-    Critical = SeverityLevel.Critical,
-}
-
-public class FailFast
-{
-    public static bool IsFailFastSeverityLevel(SeverityLevel severity, FailFastSeverityLevel failFastSeverity)
-    {
-        return failFastSeverity switch
-        {
-            FailFastSeverityLevel.Warning => severity >= SeverityLevel.Warn,
-            FailFastSeverityLevel.Error => severity >= SeverityLevel.Error,
-            FailFastSeverityLevel.Critical => severity >= SeverityLevel.Critical,
-            _ => false,
-        };
-    }
-}
diff --git a/src/Logging/logger/ILoggerHost.cs b/src/Logging/logger/ILoggerHost.cs
deleted file mode 100644
index c085283..0000000
--- a/src/Logging/logger/ILoggerHost.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using DevHome.Logging.Listeners;
-
-namespace DevHome.Logging;
-
-public interface ILoggerHost : IDisposable
-{
-    string Name
-    {
-        get;
-    }
-
-    Options Options
-    {
-        get;
-    }
-
-    void AddListener(IListener listener);
-
-    void ReportEvent(LogEvent evt);
-
-    void ReportEvent(string component, SeverityLevel severity, string message);
-
-    void ReportEvent(string component, SeverityLevel severity, string message, System.Exception exception);
-
-    void ReportEvent(string component, string subComponent, SeverityLevel severity, string message);
-
-    void ReportEvent(string component, string subComponent, SeverityLevel severity, string message, System.Exception exception);
-
-    void ReportDebug(string component, string message);
-
-    void ReportDebug(string component, string message, Exception exception);
-
-    void ReportDebug(string component, string subComponent, string message);
-
-    void ReportDebug(string component, string subComponent, string message, Exception exception);
-
-    void ReportInfo(string component, string message);
-
-    void ReportInfo(string component, string message, Exception exception);
-
-    void ReportInfo(string component, string subComponent, string message);
-
-    void ReportInfo(string component, string subComponent, string message, Exception exception);
-
-    void ReportWarn(string component, string message);
-
-    void ReportWarn(string component, string message, Exception exception);
-
-    void ReportWarn(string component, string subComponent, string message);
-
-    void ReportWarn(string component, string subComponent, string message, Exception exception);
-
-    void ReportError(string component, string message);
-
-    void ReportError(string component, string message, Exception exception);
-
-    void ReportError(string component, string subComponent, string message);
-
-    void ReportError(string component, string subComponent, string message, Exception exception);
-
-    void ReportCritical(string component, string message);
-
-    void ReportCritical(string component, string message, Exception exception);
-
-    void ReportCritical(string component, string subComponent, string message);
-
-    void ReportCritical(string component, string subComponent, string message, Exception exception);
-}
diff --git a/src/Logging/logger/LogEvent.cs b/src/Logging/logger/LogEvent.cs
deleted file mode 100644
index b1ef61d..0000000
--- a/src/Logging/logger/LogEvent.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using DevHome.Logging.Helpers;
-
-namespace DevHome.Logging;
-
-public class LogEvent
-{
-    public string Source
-    {
-        get;
-    }
-
-    public string? SubSource
-    {
-        get;
-    }
-
-    public SeverityLevel Severity
-    {
-        get;
-    }
-
-    public string Message
-    {
-        get;
-    }
-
-    public Exception? Exception
-    {
-        get;
-    }
-
-    public DateTime Created
-    {
-        get;
-    }
-
-    public TimeSpan Elapsed
-    {
-        get;
-        private set;
-    }
-
-    internal void SetElapsed(TimeSpan elapsed) => Elapsed = elapsed;
-
-    public static long NoElapsedTicks => -1L;
-
-    public static TimeSpan NoElapsed => new(NoElapsedTicks);
-
-    public bool HasElapsed => Elapsed.Ticks >= 0;
-
-    private LogEvent(string source, string subSource, SeverityLevel severity, string message, Exception exception, TimeSpan elapsed)
-    {
-        Source = source;
-        SubSource = subSource;
-        Severity = severity;
-        Message = message;
-        Exception = exception;
-        Elapsed = elapsed;
-        Created = DateTime.UtcNow;
-    }
-
-    public static LogEvent Create(string source, string subSource, SeverityLevel severity, string message) => Create(source, subSource, severity, message, null, NoElapsed);
-
-    public static LogEvent Create(string source, string subSource, SeverityLevel severity, string message, Exception exception) => Create(source, subSource, severity, message, exception, NoElapsed);
-
-    public static LogEvent Create(string source, string subSource, SeverityLevel severity, string message, TimeSpan elapsed) => Create(source, subSource, severity, message, null, elapsed);
-
-    public static LogEvent Create(string source, string subSource, SeverityLevel severity, string message, Exception? exception, TimeSpan elapsed) => new(source, subSource, severity, message, exception!, elapsed);
-
-    public string FullSourceName
-    {
-        get
-        {
-            if (SubSource != null)
-            {
-                return $"{Source}/{SubSource}";
-            }
-            else
-            {
-                return Source;
-            }
-        }
-    }
-
-    public override string ToString()
-    {
-        var hasException = Exception != null;
-
-        if (hasException && HasElapsed)
-        {
-            return "[{0}] {1} {2} {3} {4}".FormatInvariant(FullSourceName, Severity.ToString(), Message, Exception!, Elapsed);
-        }
-        else if (hasException && !HasElapsed)
-        {
-            return "[{0}] {1} {2} {3}".FormatInvariant(FullSourceName, Severity.ToString(), Message, Exception!);
-        }
-        else if (!hasException && HasElapsed)
-        {
-            return "[{0}] {1} {2} {3}".FormatInvariant(FullSourceName, Severity.ToString(), Message, Elapsed);
-        }
-        else
-        {
-            return "[{0}] {1} {2}".FormatInvariant(FullSourceName, Severity.ToString(), Message);
-        }
-    }
-}
diff --git a/src/Logging/logger/Logger.cs b/src/Logging/logger/Logger.cs
deleted file mode 100644
index 932c79d..0000000
--- a/src/Logging/logger/Logger.cs
+++ /dev/null
@@ -1,417 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using System.Collections.Concurrent;
-using DevHome.Logging.Helpers;
-using DevHome.Logging.Listeners;
-
-namespace DevHome.Logging;
-
-public class Logger : ILoggerHost, IDisposable
-{
-    public Logger(string name, Options options)
-    {
-        Name = name;
-        Options = options;
-
-        // Debug listener
-        if (options.DebugListenerEnabled)
-        {
-            var debugListener = new DebugListener("Debug");
-            AddListenerInternal(debugListener);
-        }
-
-        // Console listener
-        if (options.LogStdoutEnabled)
-        {
-            var stdoutListener = new StdoutListener("Stdout");
-            AddListenerInternal(stdoutListener);
-        }
-
-        // Log to file listener
-        if (options.LogFileEnabled)
-        {
-            var logFilename = FileSystem.BuildOutputFilename(options.LogFileName, options.LogFileFolderPath);
-            var logFileListener = new LogFileListener("LogFile", logFilename);
-            ReportInfo($"Logging to {logFilename}");
-            AddListenerInternal(logFileListener);
-        }
-
-        StartLogEventProcessor();
-    }
-
-    ~Logger()
-    {
-        Dispose();
-    }
-
-    private readonly BlockingCollection<LogEvent> eventQueue = new(new ConcurrentQueue<LogEvent>());
-
-    private readonly ManualResetEvent processorCanceledEvent = new(true);
-
-    private CancellationTokenSource? cancelTokenSource;
-
-    private bool _logEventProcessorIsStopped = true;
-
-    private ConcurrentDictionary<string, IListener> Listeners { get; } = new ConcurrentDictionary<string, IListener>();
-
-    public Options Options
-    {
-        get;
-    }
-
-    public string Name
-    {
-        get;
-    }
-
-    public void AddListener(IListener listener)
-    {
-        // External adds outside the constructor need to stop the log event processor.
-        // Otherwise we could be adding while iterating through the list.
-        StopLogEventProcessor();
-        AddListenerInternal(listener);
-        StartLogEventProcessor();
-    }
-
-    private void AddListenerInternal(IListener listener)
-    {
-        listener.Host = this;
-        Listeners.TryAdd(listener.Name, listener);
-    }
-
-    public void ReportEvent(LogEvent evt)
-    {
-        try
-        {
-            _ = eventQueue.TryAdd(evt);
-        }
-        catch
-        {
-            // Errors trying to add to the log are ignored.
-        }
-    }
-
-    private void StartLogEventProcessor()
-    {
-        _ = Task.Run(() =>
-        {
-            _logEventProcessorIsStopped = false;
-            cancelTokenSource = new CancellationTokenSource();
-            processorCanceledEvent.Reset();
-            while (!eventQueue.IsCompleted)
-            {
-                LogEvent? logEvent;
-                try
-                {
-                    _ = eventQueue.TryTake(out logEvent, -1, cancelTokenSource.Token);
-                }
-                catch (OperationCanceledException)
-                {
-                    // It is possible we miss events because cancellation occurred while there was
-                    // still an event queue. Drain the remaining queue and process those events
-                    // before terminating.
-                    try
-                    {
-                        // This is a snapshot of the current collection, it will not block or handle
-                        // new items added after this point.
-                        foreach (var evt in eventQueue)
-                        {
-                            ProcessLogEvent(evt);
-                        }
-                    }
-                    catch
-                    {
-                        // This is best effort, if there are problems, carry on.
-                    }
-
-                    _logEventProcessorIsStopped = true;
-                    processorCanceledEvent.Set();
-                    break;
-                }
-
-                if (logEvent is not null)
-                {
-                    ProcessLogEventFailFast(logEvent);
-                }
-            }
-        });
-    }
-
-    private void StopLogEventProcessor()
-    {
-        if (_logEventProcessorIsStopped)
-        {
-            return;
-        }
-
-        try
-        {
-            cancelTokenSource?.Cancel();
-        }
-        catch
-        {
-            // if there is a problem cancelling the task, don't wait on it finishing.
-            return;
-        }
-
-        // Give the logger at most five seconds to finish writing out events.
-        processorCanceledEvent.WaitOne(5 * 1000);
-    }
-
-    private void ProcessLogEvent(LogEvent evt)
-    {
-        foreach (var listener in Listeners)
-        {
-            try
-            {
-                listener.Value.HandleLogEvent(evt);
-            }
-            catch
-            {
-                // Do not take down the entire app if a listener fails to log; ignore it.
-#if DEBUG
-                // Throw on debug builds.
-                throw;
-#endif
-            }
-        }
-    }
-
-    private void ProcessLogEventFailFast(LogEvent evt)
-    {
-        ProcessLogEvent(evt);
-        FailFastIfMeetsFailFastSeverity(evt);
-    }
-
-    private void FailFastIfMeetsFailFastSeverity(LogEvent evt)
-    {
-        if (FailFast.IsFailFastSeverityLevel(evt.Severity, Options.FailFastSeverity))
-        {
-            // Send a final critical event indicating we are intentionally failing fast here.
-            var failFastNotice = LogEvent.Create(
-                Name,
-                null!,
-                SeverityLevel.Critical,
-                $"Terminating program: failure event meets FailFast threshold of '{Options.FailFastSeverity}'.\n{Environment.StackTrace}");
-            ProcessLogEvent(failFastNotice);
-            Environment.FailFast(evt.Message, evt.Exception);
-        }
-    }
-
-    public void ReportEvent(SeverityLevel severity, string message)
-    {
-        ReportEvent(severity, message, null!);
-    }
-
-    public void ReportEvent(SeverityLevel severity, string message, Exception exception)
-    {
-        var evt = LogEvent.Create(Name, null!, severity, message, exception);
-        ReportEvent(evt);
-    }
-
-    public void ReportEvent(string component, SeverityLevel severity, string message)
-    {
-        ReportEvent(component, null!, severity, message, null!);
-    }
-
-    public void ReportEvent(string component, SeverityLevel severity, string message, Exception exception)
-    {
-        ReportEvent(component, null!, severity, message, exception);
-    }
-
-    public void ReportEvent(string component, string subComponent, SeverityLevel severity, string message)
-    {
-        ReportEvent(component, subComponent, severity, message, null!);
-    }
-
-    public void ReportEvent(string component, string subComponent, SeverityLevel severity, string message, System.Exception exception)
-    {
-        var evt = LogEvent.Create(component, subComponent, severity, message, exception);
-        ReportEvent(evt);
-    }
-
-    public void ReportDebug(string message)
-    {
-#if DEBUG
-        ReportEvent(SeverityLevel.Debug, message);
-#endif
-    }
-
-    public void ReportDebug(string message, Exception exception)
-    {
-#if DEBUG
-        ReportEvent(SeverityLevel.Debug, message, exception);
-#endif
-    }
-
-    public void ReportDebug(string component, string message)
-    {
-#if DEBUG
-        ReportEvent(component, SeverityLevel.Debug, message);
-#endif
-    }
-
-    public void ReportDebug(string component, string message, Exception exception)
-    {
-#if DEBUG
-        ReportEvent(component, SeverityLevel.Debug, message, exception);
-#endif
-    }
-
-    public void ReportDebug(string component, string subComponent, string message)
-    {
-#if DEBUG
-        ReportEvent(component, subComponent, SeverityLevel.Debug, message);
-#endif
-    }
-
-    public void ReportDebug(string component, string subComponent, string message, Exception exception)
-    {
-#if DEBUG
-        ReportEvent(component, subComponent, SeverityLevel.Debug, message, exception);
-#endif
-    }
-
-    public void ReportInfo(string message)
-    {
-        ReportEvent(SeverityLevel.Info, message);
-    }
-
-    public void ReportInfo(string message, Exception exception)
-    {
-        ReportEvent(SeverityLevel.Info, message, exception);
-    }
-
-    public void ReportInfo(string component, string message)
-    {
-        ReportEvent(component, SeverityLevel.Info, message);
-    }
-
-    public void ReportInfo(string component, string message, Exception exception)
-    {
-        ReportEvent(component, SeverityLevel.Info, message, exception);
-    }
-
-    public void ReportInfo(string component, string subComponent, string message)
-    {
-        ReportEvent(component, subComponent, SeverityLevel.Info, message);
-    }
-
-    public void ReportInfo(string component, string subComponent, string message, Exception exception)
-    {
-        ReportEvent(component, subComponent, SeverityLevel.Info, message, exception);
-    }
-
-    public void ReportWarn(string message)
-    {
-        ReportEvent(SeverityLevel.Warn, message);
-    }
-
-    public void ReportWarn(string message, Exception exception)
-    {
-        ReportEvent(SeverityLevel.Warn, message, exception);
-    }
-
-    public void ReportWarn(string component, string message)
-    {
-        ReportEvent(component, SeverityLevel.Warn, message);
-    }
-
-    public void ReportWarn(string component, string message, Exception exception)
-    {
-        ReportEvent(component, SeverityLevel.Warn, message, exception);
-    }
-
-    public void ReportWarn(string component, string subComponent, string message)
-    {
-        ReportEvent(component, subComponent, SeverityLevel.Warn, message);
-    }
-
-    public void ReportWarn(string component, string subComponent, string message, Exception exception)
-    {
-        ReportEvent(component, subComponent, SeverityLevel.Warn, message, exception);
-    }
-
-    public void ReportError(string message)
-    {
-        ReportEvent(SeverityLevel.Error, message);
-    }
-
-    public void ReportError(string message, Exception exception)
-    {
-        ReportEvent(SeverityLevel.Error, message, exception);
-    }
-
-    public void ReportError(string component, string message)
-    {
-        ReportEvent(component, SeverityLevel.Error, message);
-    }
-
-    public void ReportError(string component, string message, Exception exception)
-    {
-        ReportEvent(component, SeverityLevel.Error, message, exception);
-    }
-
-    public void ReportError(string component, string subComponent, string message)
-    {
-        ReportEvent(component, subComponent, SeverityLevel.Error, message);
-    }
-
-    public void ReportError(string component, string subComponent, string message, Exception exception)
-    {
-        ReportEvent(component, subComponent, SeverityLevel.Error, message, exception);
-    }
-
-    public void ReportCritical(string message)
-    {
-        ReportEvent(SeverityLevel.Critical, message);
-    }
-
-    public void ReportCritical(string message, Exception exception)
-    {
-        ReportEvent(SeverityLevel.Critical, message, exception);
-    }
-
-    public void ReportCritical(string component, string message)
-    {
-        ReportEvent(component, SeverityLevel.Critical, message);
-    }
-
-    public void ReportCritical(string component, string message, Exception exception)
-    {
-        ReportEvent(component, SeverityLevel.Critical, message, exception);
-    }
-
-    public void ReportCritical(string component, string subComponent, string message)
-    {
-        ReportEvent(component, subComponent, SeverityLevel.Critical, message);
-    }
-
-    public void ReportCritical(string component, string subComponent, string message, Exception exception)
-    {
-        ReportEvent(component, subComponent, SeverityLevel.Critical, message, exception);
-    }
-
-    private bool disposed; // To detect redundant calls
-
-    protected virtual void Dispose(bool disposing)
-    {
-        if (!disposed)
-        {
-            var disposingEvent = LogEvent.Create(Name, null!, SeverityLevel.Debug, "Disposing of all logging listeners.");
-            ReportEvent(disposingEvent);
-            StopLogEventProcessor();
-            Listeners.DisposeAll();
-            disposed = true;
-        }
-    }
-
-    // This code added to correctly implement the disposable pattern.
-    public void Dispose()
-    {
-        // Do not change this code. Put cleanup code in Dispose(bool disposing) above.
-        Dispose(true);
-        GC.SuppressFinalize(this);
-    }
-}
diff --git a/src/Logging/logger/Options.cs b/src/Logging/logger/Options.cs
deleted file mode 100644
index d0cbfb1..0000000
--- a/src/Logging/logger/Options.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-namespace DevHome.Logging;
-
-public partial class Options : ICloneable
-{
-    public FailFastSeverityLevel FailFastSeverity { get; set; } = FailFastSeverityLevel.Critical;
-
-    public object Clone() => MemberwiseClone();
-}
diff --git a/src/Telemetry/GitHubExtension.Telemetry.csproj b/src/Telemetry/GitHubExtension.Telemetry.csproj
index 5647434..81f308a 100644
--- a/src/Telemetry/GitHubExtension.Telemetry.csproj
+++ b/src/Telemetry/GitHubExtension.Telemetry.csproj
@@ -13,4 +13,14 @@
       <SpectreMitigation>Spectre</SpectreMitigation>
     </ClCompile>
   </ItemDefinitionGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
+    <PackageReference Include="Serilog" Version="3.1.1" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
+    <PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+  </ItemGroup>
 </Project>
diff --git a/test/Console/GitHubExtension.TestConsole.csproj b/test/Console/GitHubExtension.TestConsole.csproj
index cc2ab6f..a3403e7 100644
--- a/test/Console/GitHubExtension.TestConsole.csproj
+++ b/test/Console/GitHubExtension.TestConsole.csproj
@@ -39,7 +39,23 @@
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
+    <PackageReference Include="Serilog" Version="3.1.1" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
+    <PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\src\GitHubExtension\GitHubExtension.csproj" />
   </ItemGroup>
+
+  <ItemGroup>
+    <None Update="appsettings.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
 </Project>
diff --git a/test/Console/Program.cs b/test/Console/Program.cs
index d6d9c0b..8383f18 100644
--- a/test/Console/Program.cs
+++ b/test/Console/Program.cs
@@ -1,32 +1,26 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using GitHubExtension;
+using Microsoft.Extensions.Configuration;
+using Serilog;
+using Windows.Storage;
 
 internal class Program
 {
     private static void Main(string[] args)
     {
-        using var dataManager = GitHubDataManager.CreateInstance();
-        Task.Run(async () =>
-        {
-            var parameters = new RequestOptions
-            {
-                SearchIssuesRequest = new Octokit.SearchIssuesRequest(args[0]),
-            };
-            await dataManager!.UpdateIssuesForRepositoryAsync("microsoft", "devhome", parameters);
-        }).Wait();
+        // Test console is set up with logging to test any component manually.
+        Environment.SetEnvironmentVariable("DEVHOME_LOGS_ROOT", ApplicationData.Current.TemporaryFolder.Path);
+        var configuration = new ConfigurationBuilder()
+            .AddJsonFile("appsettings.json")
+            .Build();
 
-        var repository = dataManager!.GetRepository("microsoft/devhome");
-        if (repository == null)
-        {
-            Console.WriteLine("No results");
-            return;
-        }
+        Log.Logger = new LoggerConfiguration()
+            .ReadFrom.Configuration(configuration)
+            .CreateLogger();
 
-        foreach (var issue in repository.GetIssuesForQuery(args[0]))
-        {
-            Console.WriteLine($"  Issue: {issue.Number} {issue.Author.Login} {issue.Title}");
-        }
+        Log.Information("Hello GitHub!");
+
+        Log.CloseAndFlush();
     }
 }
diff --git a/test/Console/appsettings.json b/test/Console/appsettings.json
new file mode 100644
index 0000000..ad28c78
--- /dev/null
+++ b/test/Console/appsettings.json
@@ -0,0 +1,31 @@
+{
+  "Serilog": {
+    "Using": [ "Serilog.Sinks.Console", "Serilog.Sinks.File", "Serilog.Sinks.Debug" ],
+    "MinimumLevel": "Debug",
+    "WriteTo": [
+      {
+        "Name": "Console",
+        "Args": {
+          "outputTemplate": "[{Timestamp:yyyy/MM/dd HH:mm:ss.fff} {Level:u3}] ({SourceContext}) {Message:lj}{NewLine}{Exception}",
+          "restrictedToMinimumLevel": "Debug"
+        }
+      },
+      {
+        "Name": "File",
+        "Args": {
+          "path": "%DEVHOME_LOGS_ROOT%\\log.dhlog",
+          "outputTemplate": "[{Timestamp:yyyy/MM/dd HH:mm:ss.fff} {Level:u3}] ({SourceContext}) {Message:lj}{NewLine}{Exception}",
+          "restrictedToMinimumLevel": "Information",
+          "rollingInterval": "Day"
+        }
+      },
+      {
+        "Name" : "Debug"
+      }
+    ],
+    "Enrich": [ "FromLogContext" ],
+    "Properties": {
+      "SourceContext": "GitHubExtensionTest"
+    }
+  }
+}
\ No newline at end of file
diff --git a/test/GitHubExtension/DataStore/DataManagerTests.cs b/test/GitHubExtension/DataStore/DataManagerTests.cs
index fc9313f..af4d6a8 100644
--- a/test/GitHubExtension/DataStore/DataManagerTests.cs
+++ b/test/GitHubExtension/DataStore/DataManagerTests.cs
@@ -9,27 +9,14 @@ public partial class DataStoreTests
     [TestCategory("Unit")]
     public void DataManagerCreate()
     {
-        using var log = new DevHome.Logging.Logger("TestStore", TestOptions.LogOptions);
-        var testListener = new TestListener("TestListener", TestContext!);
-        log.AddListener(testListener);
-        DataModel.Log.Attach(log);
-
         using var dataManager = GitHubDataManager.CreateInstance(TestOptions.DataStoreOptions);
         Assert.IsNotNull(dataManager);
-
-        testListener.PrintEventCounts();
-        Assert.AreEqual(false, testListener.FoundErrors());
     }
 
     [TestMethod]
     [TestCategory("Unit")]
     public void DataManagerGetRepositories()
     {
-        using var log = new DevHome.Logging.Logger("TestStore", TestOptions.LogOptions);
-        var testListener = new TestListener("TestListener", TestContext!);
-        log.AddListener(testListener);
-        DataModel.Log.Attach(log);
-
         using var dataManager = GitHubDataManager.CreateInstance(TestOptions.DataStoreOptions);
         Assert.IsNotNull(dataManager);
 
@@ -41,21 +28,12 @@ public void DataManagerGetRepositories()
 
         noSuchRepo = dataManager.GetRepository("foo", "bar");
         Assert.IsNull(noSuchRepo);
-
-        testListener.PrintEventCounts();
-        Assert.AreEqual(false, testListener.FoundErrors());
     }
 
     [TestMethod]
     [TestCategory("LiveData")]
     public async Task DataManagerUpdateRepository()
     {
-        using var log = new DevHome.Logging.Logger("TestStore", TestOptions.LogOptions);
-        var testListener = new TestListener("TestListener", TestContext!);
-        log.AddListener(testListener);
-        DataModel.Log.Attach(log);
-        DeveloperId.Log.Attach(log);
-
         using var dataManager = GitHubDataManager.CreateInstance(TestOptions.DataStoreOptions);
         Assert.IsNotNull(dataManager);
 
@@ -72,22 +50,12 @@ public async Task DataManagerUpdateRepository()
         };
 
         await dataManager.UpdateAllDataForRepositoryAsync("microsoft/windowsappsdk", requestOptions);
-
-        // Add Update Data test
-        testListener.PrintEventCounts();
-        Assert.AreEqual(false, testListener.FoundErrors());
     }
 
     [TestMethod]
     [TestCategory("LiveData")]
     public async Task DataManagerUpdatePullRequests()
     {
-        using var log = new DevHome.Logging.Logger("TestStore", TestOptions.LogOptions);
-        var testListener = new TestListener("TestListener", TestContext!);
-        log.AddListener(testListener);
-        DataModel.Log.Attach(log);
-        DeveloperId.Log.Attach(log);
-
         using var dataManager = GitHubDataManager.CreateInstance(TestOptions.DataStoreOptions);
         Assert.IsNotNull(dataManager);
 
@@ -105,21 +73,12 @@ public async Task DataManagerUpdatePullRequests()
 
         await dataManager.UpdatePullRequestsForRepositoryAsync("octokit/octokit.net", requestOptions);
         await dataManager.UpdatePullRequestsForRepositoryAsync("microsoft/powertoys", requestOptions);
-
-        testListener.PrintEventCounts();
-        Assert.AreEqual(false, testListener.FoundErrors());
     }
 
     [TestMethod]
     [TestCategory("LiveData")]
     public async Task DataManagerUpdateIssues()
     {
-        using var log = new DevHome.Logging.Logger("TestStore", TestOptions.LogOptions);
-        var testListener = new TestListener("TestListener", TestContext!);
-        log.AddListener(testListener);
-        DataModel.Log.Attach(log);
-        DeveloperId.Log.Attach(log);
-
         using var dataManager = GitHubDataManager.CreateInstance(TestOptions.DataStoreOptions);
         Assert.IsNotNull(dataManager);
 
@@ -136,22 +95,12 @@ public async Task DataManagerUpdateIssues()
         };
 
         await dataManager.UpdateIssuesForRepositoryAsync("octokit/octokit.net", requestOptions);
-
-        // Add Update Data test
-        testListener.PrintEventCounts();
-        Assert.AreEqual(false, testListener.FoundErrors());
     }
 
     [TestMethod]
     [TestCategory("LiveData")]
     public async Task DataManagerUpdatePullRequestsForDeveloper()
     {
-        using var log = new DevHome.Logging.Logger("TestStore", TestOptions.LogOptions);
-        var testListener = new TestListener("TestListener", TestContext!);
-        log.AddListener(testListener);
-        DataModel.Log.Attach(log);
-        DeveloperId.Log.Attach(log);
-
         using var dataManager = GitHubDataManager.CreateInstance(TestOptions.DataStoreOptions);
         Assert.IsNotNull(dataManager);
 
@@ -166,21 +115,12 @@ public async Task DataManagerUpdatePullRequestsForDeveloper()
         {
             TestContext?.WriteLine($"  User: {pull.Author.Login}  Repo: {pull.Repository.FullName} - {pull.Number} - {pull.Title}");
         }
-
-        // Add Update Data test
-        testListener.PrintEventCounts();
-        Assert.AreEqual(false, testListener.FoundErrors());
     }
 
     [TestMethod]
     [TestCategory("Unit")]
     public void DataUpdater()
     {
-        using var log = new DevHome.Logging.Logger("TestStore", TestOptions.LogOptions);
-        var testListener = new TestListener("TestListener", TestContext!);
-        log.AddListener(testListener);
-        DataModel.Log.Attach(log);
-
         var countingDoneEvent = new ManualResetEvent(false);
         var count = 0;
 #pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously
@@ -219,20 +159,5 @@ public void DataUpdater()
         // This test can randomly fail based on timings in builds, so disabling this check to avoid
         // 1-off errors from tanking a build.
         // Assert.AreEqual(1, count);
-        testListener.PrintEventCounts();
-        Assert.AreEqual(false, testListener.FoundErrors());
-    }
-
-    [TestMethod]
-    [TestCategory("Manual")]
-    public void ShowNotificationToast()
-    {
-        using var log = new DevHome.Logging.Logger("TestStore", TestOptions.LogOptions);
-        var testListener = new TestListener("TestListener", TestContext!);
-        log.AddListener(testListener);
-        DataModel.Log.Attach(log);
-        DeveloperId.Log.Attach(log);
-        testListener.PrintEventCounts();
-        Assert.AreEqual(false, testListener.FoundErrors());
     }
 }
diff --git a/test/GitHubExtension/DataStore/DataObjectTests.cs b/test/GitHubExtension/DataStore/DataObjectTests.cs
index 82ce2ab..098ede5 100644
--- a/test/GitHubExtension/DataStore/DataObjectTests.cs
+++ b/test/GitHubExtension/DataStore/DataObjectTests.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT License.
 
 using Dapper.Contrib.Extensions;
-using DevHome.Logging;
 using GitHubExtension.DataModel;
 using GitHubExtension.Helpers;
 
@@ -14,11 +13,6 @@ public partial class DataStoreTests
     [TestCategory("Unit")]
     public void DateTimeExtension()
     {
-        using var log = new Logger("TestStore", TestOptions.LogOptions);
-        var testListener = new TestListener("TestListener", TestContext!);
-        log.AddListener(testListener);
-        Log.Attach(log);
-
         var now = DateTime.Now;
         TestContext?.WriteLine($"Now: {now}");
         var nowAsInteger = now.ToDataStoreInteger();
@@ -61,20 +55,12 @@ public void DateTimeExtension()
         Assert.IsNotNull(thirtyDaysFromMetaData);
         Assert.AreEqual(now, nowFromMetaData.ToDateTime());
         Assert.AreEqual(thirtyDays, thirtyDaysFromMetaData.ToTimeSpan());
-
-        testListener.PrintEventCounts();
-        Assert.AreEqual(false, testListener.FoundErrors());
     }
 
     [TestMethod]
     [TestCategory("Unit")]
     public void ReadAndWriteMetaData()
     {
-        using var log = new Logger("TestStore", TestOptions.LogOptions);
-        var testListener = new TestListener("TestListener", TestContext!);
-        log.AddListener(testListener);
-        Log.Attach(log);
-
         using var dataStore = new DataStore("TestStore", TestHelpers.GetDataStoreFilePath(TestOptions), TestOptions.DataStoreOptions.DataStoreSchema!);
         Assert.IsNotNull(dataStore);
         dataStore.Create();
@@ -124,20 +110,12 @@ public void ReadAndWriteMetaData()
         {
             TestContext?.WriteLine($"  Id: {metaData.Id}  Key: {metaData.Key}  Value: {metaData.Value}");
         }
-
-        testListener.PrintEventCounts();
-        Assert.AreEqual(false, testListener.FoundErrors());
     }
 
     [TestMethod]
     [TestCategory("Unit")]
     public void ReadAndWriteUser()
     {
-        using var log = new Logger("TestStore", TestOptions.LogOptions);
-        var testListener = new TestListener("TestListener", TestContext!);
-        log.AddListener(testListener);
-        Log.Attach(log);
-
         using var dataStore = new DataStore("TestStore", TestHelpers.GetDataStoreFilePath(TestOptions), TestOptions.DataStoreOptions.DataStoreSchema!);
         Assert.IsNotNull(dataStore);
         dataStore.Create();
@@ -179,20 +157,12 @@ public void ReadAndWriteUser()
                 Assert.AreEqual("https://www.microsoft.com", user.AvatarUrl);
             }
         }
-
-        testListener.PrintEventCounts();
-        Assert.AreEqual(false, testListener.FoundErrors());
     }
 
     [TestMethod]
     [TestCategory("Unit")]
     public void ReadAndWriteRepository()
     {
-        using var log = new Logger("TestStore", TestOptions.LogOptions);
-        var testListener = new TestListener("TestListener", TestContext!);
-        log.AddListener(testListener);
-        Log.Attach(log);
-
         using var dataStore = new DataStore("TestStore", TestHelpers.GetDataStoreFilePath(TestOptions), TestOptions.DataStoreOptions.DataStoreSchema!);
         Assert.IsNotNull(dataStore);
         dataStore.Create();
@@ -240,20 +210,12 @@ public void ReadAndWriteRepository()
                 Assert.AreEqual("https://www.microsoft.com", repo.HtmlUrl);
             }
         }
-
-        testListener.PrintEventCounts();
-        Assert.AreEqual(false, testListener.FoundErrors());
     }
 
     [TestMethod]
     [TestCategory("Unit")]
     public void ReadAndWriteIssue()
     {
-        using var log = new Logger("TestStore", TestOptions.LogOptions);
-        var testListener = new TestListener("TestListener", TestContext!);
-        log.AddListener(testListener);
-        Log.Attach(log);
-
         using var dataStore = new DataStore("TestStore", TestHelpers.GetDataStoreFilePath(TestOptions), TestOptions.DataStoreOptions.DataStoreSchema!);
         Assert.IsNotNull(dataStore);
         dataStore.Create();
@@ -306,20 +268,12 @@ public void ReadAndWriteIssue()
                 Assert.AreEqual("Missing Tests", issue.Title);
             }
         }
-
-        testListener.PrintEventCounts();
-        Assert.AreEqual(false, testListener.FoundErrors());
     }
 
     [TestMethod]
     [TestCategory("Unit")]
     public void ReadAndWritePullRequest()
     {
-        using var log = new Logger("TestStore", TestOptions.LogOptions);
-        var testListener = new TestListener("TestListener", TestContext!);
-        log.AddListener(testListener);
-        Log.Attach(log);
-
         using var dataStore = new DataStore("TestStore", TestHelpers.GetDataStoreFilePath(TestOptions), TestOptions.DataStoreOptions.DataStoreSchema!);
         Assert.IsNotNull(dataStore);
         dataStore.Create();
@@ -378,20 +332,12 @@ public void ReadAndWritePullRequest()
             Assert.AreEqual(0, pull.Checks.Count());
             Assert.AreEqual(0, pull.FailedChecks.Count());
         }
-
-        testListener.PrintEventCounts();
-        Assert.AreEqual(false, testListener.FoundErrors());
     }
 
     [TestMethod]
     [TestCategory("Unit")]
     public void ReadAndWriteCheckRun()
     {
-        using var log = new Logger("TestStore", TestOptions.LogOptions);
-        var testListener = new TestListener("TestListener", TestContext!);
-        log.AddListener(testListener);
-        Log.Attach(log);
-
         using var dataStore = new DataStore("TestStore", TestHelpers.GetDataStoreFilePath(TestOptions), TestOptions.DataStoreOptions.DataStoreSchema!);
         Assert.IsNotNull(dataStore);
         dataStore.Create();
@@ -463,21 +409,12 @@ public void ReadAndWriteCheckRun()
 
         Assert.AreEqual(CheckStatus.Completed, pullRequest.ChecksStatus);
         Assert.AreEqual(CheckConclusion.Failure, pullRequest.ChecksConclusion);
-
-        testListener.PrintEventCounts();
-        Assert.AreEqual(false, testListener.FoundErrors());
     }
 
     [TestMethod]
     [TestCategory("Unit")]
     public void ReadAndWriteStatusAndNotification()
     {
-        // Also includes notifications.
-        using var log = new Logger("TestStore", TestOptions.LogOptions);
-        var testListener = new TestListener("TestListener", TestContext!);
-        log.AddListener(testListener);
-        Log.Attach(log);
-
         using var dataStore = new DataStore("TestStore", TestHelpers.GetDataStoreFilePath(TestOptions), TestOptions.DataStoreOptions.DataStoreSchema!);
         Assert.IsNotNull(dataStore);
         dataStore.Create();
@@ -524,20 +461,12 @@ public void ReadAndWriteStatusAndNotification()
         TestContext?.WriteLine($"  {notification.Title}");
         TestContext?.WriteLine($"  {notification.Description}");
         TestContext?.WriteLine($"  {notification.DetailsUrl}");
-
-        testListener.PrintEventCounts();
-        Assert.AreEqual(false, testListener.FoundErrors());
     }
 
     [TestMethod]
     [TestCategory("Unit")]
     public void ReadAndWriteReview()
     {
-        using var log = new Logger("TestStore", TestOptions.LogOptions);
-        var testListener = new TestListener("TestListener", TestContext!);
-        log.AddListener(testListener);
-        Log.Attach(log);
-
         using var dataStore = new DataStore("TestStore", TestHelpers.GetDataStoreFilePath(TestOptions), TestOptions.DataStoreOptions.DataStoreSchema!);
         Assert.IsNotNull(dataStore);
         dataStore.Create();
@@ -590,20 +519,12 @@ public void ReadAndWriteReview()
             TestContext?.WriteLine($"  PR 1 - Review: {review}");
             Assert.IsTrue(review.PullRequestId == 1);
         }
-
-        testListener.PrintEventCounts();
-        Assert.AreEqual(false, testListener.FoundErrors());
     }
 
     [TestMethod]
     [TestCategory("Unit")]
     public void ReadAndWriteRelease()
     {
-        using var log = new Logger("TestStore", TestOptions.LogOptions);
-        var testListener = new TestListener("TestListener", TestContext!);
-        log.AddListener(testListener);
-        Log.Attach(log);
-
         using var dataStore = new DataStore("TestStore", TestHelpers.GetDataStoreFilePath(TestOptions), TestOptions.DataStoreOptions.DataStoreSchema!);
         Assert.IsNotNull(dataStore);
         dataStore.Create();
@@ -653,8 +574,5 @@ public void ReadAndWriteRelease()
                 Assert.AreEqual("https://www.microsoft.com", release.HtmlUrl);
             }
         }
-
-        testListener.PrintEventCounts();
-        Assert.AreEqual(false, testListener.FoundErrors());
     }
 }
diff --git a/test/GitHubExtension/DataStore/DataStoreTestsSetup.cs b/test/GitHubExtension/DataStore/DataStoreTestsSetup.cs
index 407cbc1..180b544 100644
--- a/test/GitHubExtension/DataStore/DataStoreTestsSetup.cs
+++ b/test/GitHubExtension/DataStore/DataStoreTestsSetup.cs
@@ -24,11 +24,13 @@ private TestOptions TestOptions
     public void TestInitialize()
     {
         TestOptions = TestHelpers.SetupTempTestOptions(TestContext!);
+        TestHelpers.ConfigureTestLog(TestOptions, TestContext!);
     }
 
     [TestCleanup]
     public void Cleanup()
     {
+        TestHelpers.CloseTestLog();
         TestHelpers.CleanupTempTestOptions(TestOptions, TestContext!);
     }
 }
diff --git a/test/GitHubExtension/DataStore/OctokitIngestionTests.cs b/test/GitHubExtension/DataStore/OctokitIngestionTests.cs
index f916d6d..e1417bc 100644
--- a/test/GitHubExtension/DataStore/OctokitIngestionTests.cs
+++ b/test/GitHubExtension/DataStore/OctokitIngestionTests.cs
@@ -14,11 +14,6 @@ public partial class DataStoreTests
     [TestCategory("LiveData")]
     public void AddUserFromOctokit()
     {
-        using var log = new DevHome.Logging.Logger("TestStore", TestOptions.LogOptions);
-        var testListener = new TestListener("TestListener", TestContext!);
-        log.AddListener(testListener);
-        Log.Attach(log);
-
         using var dataStore = new DataStore("TestStore", TestHelpers.GetDataStoreFilePath(TestOptions), TestOptions.DataStoreOptions.DataStoreSchema!);
         Assert.IsNotNull(dataStore);
         dataStore.Create();
@@ -65,20 +60,12 @@ public void AddUserFromOctokit()
         // The update code will have set a timestamp on updating the record, and we will
         // be within that window of don't update. This value should not have updated.
         Assert.AreNotEqual("https://some.new.url", afterUpdate.AvatarUrl);
-
-        testListener.PrintEventCounts();
-        Assert.AreEqual(false, testListener.FoundErrors());
     }
 
     [TestMethod]
     [TestCategory("LiveData")]
     public void AddRepositoryFromOctokit()
     {
-        using var log = new DevHome.Logging.Logger("TestStore", TestOptions.LogOptions);
-        var testListener = new TestListener("TestListener", TestContext!);
-        log.AddListener(testListener);
-        DataModel.Log.Attach(log);
-
         using var dataStore = new DataStore("TestStore", TestHelpers.GetDataStoreFilePath(TestOptions), TestOptions.DataStoreOptions.DataStoreSchema!);
         Assert.IsNotNull(dataStore);
         dataStore.Create();
@@ -140,20 +127,12 @@ public void AddRepositoryFromOctokit()
             Assert.AreEqual(repo1.Id, repo2.Id);
             TestContext?.WriteLine($"  FullName: {repo1.FullName}  User: {repo1.Owner.Login}  Repo: {repo1.Name}");
         }
-
-        testListener.PrintEventCounts();
-        Assert.AreEqual(false, testListener.FoundErrors());
     }
 
     [TestMethod]
     [TestCategory("LiveData")]
     public void AddPullRequestFromOctokit()
     {
-        using var log = new DevHome.Logging.Logger("TestStore", TestOptions.LogOptions);
-        var testListener = new TestListener("TestListener", TestContext!);
-        log.AddListener(testListener);
-        Log.Attach(log);
-
         using var dataStore = new DataStore("TestStore", TestHelpers.GetDataStoreFilePath(TestOptions), TestOptions.DataStoreOptions.DataStoreSchema!);
         Assert.IsNotNull(dataStore);
         dataStore.Create();
@@ -240,20 +219,12 @@ public void AddPullRequestFromOctokit()
                 TestContext?.WriteLine($"    Id: {pull.Id}  User: {pull.Author.Login} - {pull.Number} - {pull.Title}");
             }
         }
-
-        testListener.PrintEventCounts();
-        Assert.AreEqual(false, testListener.FoundErrors());
     }
 
     [TestMethod]
     [TestCategory("LiveData")]
     public void AddIssueFromOctokit()
     {
-        using var log = new DevHome.Logging.Logger("TestStore", TestOptions.LogOptions);
-        var testListener = new TestListener("TestListener", TestContext!);
-        log.AddListener(testListener);
-        Log.Attach(log);
-
         using var dataStore = new DataStore("TestStore", TestHelpers.GetDataStoreFilePath(TestOptions), TestOptions.DataStoreOptions.DataStoreSchema!);
         Assert.IsNotNull(dataStore);
         dataStore.Create();
@@ -340,20 +311,12 @@ public void AddIssueFromOctokit()
                 TestContext?.WriteLine($"    Id: {issue.Id}  User: {issue.Author.Login} - {issue.Number} - {issue.Title}");
             }
         }
-
-        testListener.PrintEventCounts();
-        Assert.AreEqual(false, testListener.FoundErrors());
     }
 
     [TestMethod]
     [TestCategory("LiveData")]
     public void AddPullRequestLabelFromOctokit()
     {
-        using var log = new DevHome.Logging.Logger("TestStore", TestOptions.LogOptions);
-        var testListener = new TestListener("TestListener", TestContext!);
-        log.AddListener(testListener);
-        Log.Attach(log);
-
         using var dataStore = new DataStore("TestStore", TestHelpers.GetDataStoreFilePath(TestOptions), TestOptions.DataStoreOptions.DataStoreSchema!);
         Assert.IsNotNull(dataStore);
         dataStore.Create();
@@ -404,20 +367,12 @@ public void AddPullRequestLabelFromOctokit()
         {
             TestContext?.WriteLine($"  Id: {label.Id}  InternalId: {label.InternalId}  Name: {label.Name}  Color: {label.Color}  Default: {label.IsDefault}  Desc: {label.Description}");
         }
-
-        testListener.PrintEventCounts();
-        Assert.AreEqual(false, testListener.FoundErrors());
     }
 
     [TestMethod]
     [TestCategory("LiveData")]
     public void AddIssueLabelFromOctokit()
     {
-        using var log = new DevHome.Logging.Logger("TestStore", TestOptions.LogOptions);
-        var testListener = new TestListener("TestListener", TestContext!);
-        log.AddListener(testListener);
-        Log.Attach(log);
-
         using var dataStore = new DataStore("TestStore", TestHelpers.GetDataStoreFilePath(TestOptions), TestOptions.DataStoreOptions.DataStoreSchema!);
         Assert.IsNotNull(dataStore);
         dataStore.Create();
@@ -467,20 +422,12 @@ public void AddIssueLabelFromOctokit()
         {
             TestContext?.WriteLine($"  Id: {label.Id}  InternalId: {label.InternalId}  Name: {label.Name}  Color: {label.Color}  Default: {label.IsDefault}  Desc: {label.Description}");
         }
-
-        testListener.PrintEventCounts();
-        Assert.AreEqual(false, testListener.FoundErrors());
     }
 
     [TestMethod]
     [TestCategory("LiveData")]
     public void AddCheckRunFromOctokit()
     {
-        using var log = new DevHome.Logging.Logger("TestStore", TestOptions.LogOptions);
-        var testListener = new TestListener("TestListener", TestContext!);
-        log.AddListener(testListener);
-        Log.Attach(log);
-
         using var dataStore = new DataStore("TestStore", TestHelpers.GetDataStoreFilePath(TestOptions), TestOptions.DataStoreOptions.DataStoreSchema!);
         Assert.IsNotNull(dataStore);
         dataStore.Create();
@@ -524,20 +471,12 @@ public void AddCheckRunFromOctokit()
         {
             TestContext?.WriteLine($"    Name: {check.Name}  Status: {check.Status}  Conclusion: {check.Conclusion}");
         }
-
-        testListener.PrintEventCounts();
-        Assert.AreEqual(false, testListener.FoundErrors());
     }
 
     [TestMethod]
     [TestCategory("LiveData")]
     public void AddReviewFromOctokit()
     {
-        using var log = new DevHome.Logging.Logger("TestStore", TestOptions.LogOptions);
-        var testListener = new TestListener("TestListener", TestContext!);
-        log.AddListener(testListener);
-        Log.Attach(log);
-
         using var dataStore = new DataStore("TestStore", TestHelpers.GetDataStoreFilePath(TestOptions), TestOptions.DataStoreOptions.DataStoreSchema!);
         Assert.IsNotNull(dataStore);
         dataStore.Create();
@@ -573,8 +512,5 @@ public void AddReviewFromOctokit()
         {
             TestContext?.WriteLine($"  Id: {review.Id}  PullId: {review.PullRequestId}  InternalId: {review.InternalId}  AuthorId: {review.AuthorId}  Author:{review.Author.Login}  State: {review.State}  Submitted: {review.SubmittedAt}");
         }
-
-        testListener.PrintEventCounts();
-        Assert.AreEqual(false, testListener.FoundErrors());
     }
 }
diff --git a/test/GitHubExtension/DeveloperId/DeveloperIdTestsSetup.cs b/test/GitHubExtension/DeveloperId/DeveloperIdTestsSetup.cs
index c0a0e8d..cf35522 100644
--- a/test/GitHubExtension/DeveloperId/DeveloperIdTestsSetup.cs
+++ b/test/GitHubExtension/DeveloperId/DeveloperIdTestsSetup.cs
@@ -53,12 +53,8 @@ private TestOptions TestOptions
     [TestInitialize]
     public void TestInitialize()
     {
-        using var log = new DevHome.Logging.Logger("TestStore", TestOptions.LogOptions);
-        var testListener = new TestListener("TestListener", TestContext!);
-        log.AddListener(testListener);
-        DataModel.Log.Attach(log);
-        DeveloperId.Log.Attach(log);
         TestOptions = TestHelpers.SetupTempTestOptions(TestContext!);
+        TestHelpers.ConfigureTestLog(TestOptions, TestContext!);
 
         TestContext?.WriteLine("DeveloperIdTests may use the same credential store as Dev Home Github Extension");
 
@@ -70,6 +66,7 @@ public void TestInitialize()
     [TestCleanup]
     public void Cleanup()
     {
+        TestHelpers.CloseTestLog();
         TestHelpers.CleanupTempTestOptions(TestOptions, TestContext!);
     }
 }
diff --git a/test/GitHubExtension/DeveloperId/LoginUITests.cs b/test/GitHubExtension/DeveloperId/LoginUITests.cs
index 618270b..8181ca0 100644
--- a/test/GitHubExtension/DeveloperId/LoginUITests.cs
+++ b/test/GitHubExtension/DeveloperId/LoginUITests.cs
@@ -153,7 +153,7 @@ public async Task LoginUI_ControllerPATLoginTest_Success()
         // Create DataRows during Runtime since these need Env vars
         RuntimeDataRow[] dataRows =
                                 {
-                                    new RuntimeDataRow()
+                                    new()
                                     {
                                         InitialState = "EnterpriseServerPATPage",
                                         Actions = LoginUITestData.ConnectButtonAction,
@@ -161,7 +161,7 @@ public async Task LoginUI_ControllerPATLoginTest_Success()
                                         FinalState = "LoginSucceededPage",
                                         HostAddress = Environment.GetEnvironmentVariable("DEV_HOME_TEST_GITHUB_ENTERPRISE_SERVER"),
                                     },
-                                    new RuntimeDataRow()
+                                    new()
                                     {
                                         InitialState = "EnterpriseServerPATPage",
                                         Actions = LoginUITestData.ConnectButtonAction,
diff --git a/test/GitHubExtension/GitHubExtension.Test.csproj b/test/GitHubExtension/GitHubExtension.Test.csproj
index 25c16d1..efbf298 100644
--- a/test/GitHubExtension/GitHubExtension.Test.csproj
+++ b/test/GitHubExtension/GitHubExtension.Test.csproj
@@ -16,9 +16,16 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
     <PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
+    <PackageReference Include="Serilog" Version="3.1.1" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
+    <PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Logging/helpers/FileSystem.cs b/test/GitHubExtension/Helpers/FileSystem.cs
similarity index 93%
rename from src/Logging/helpers/FileSystem.cs
rename to test/GitHubExtension/Helpers/FileSystem.cs
index c867934..f2a52d5 100644
--- a/src/Logging/helpers/FileSystem.cs
+++ b/test/GitHubExtension/Helpers/FileSystem.cs
@@ -1,36 +1,36 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-namespace DevHome.Logging.Helpers;
-
-public class FileSystem
-{
-    public static string BuildOutputFilename(string filename, string outputFolder, bool createPathIfNecessary = true)
-    {
-        var outputFilename = SubstituteOutputFilename(filename, outputFolder);
-        var file = new FileInfo(outputFilename);
-        if (createPathIfNecessary)
-        {
-            file.Directory?.Create();
-        }
-
-        return file.FullName;
-    }
-
-    public static string SubstituteNow(string s)
-    {
-        if (s.Contains("{now}", StringComparison.CurrentCulture))
-        {
-            var now = DateTime.Now;
-            var nowAsString = $"{now:yyyyMMdd-HHmmss}";
-            return s.Replace("{now}", nowAsString);
-        }
-
-        return s;
-    }
-
-    public static string SubstituteOutputFilename(string filename, string outputDirectory)
-    {
-        return Path.Combine(SubstituteNow(outputDirectory), SubstituteNow(filename));
-    }
-}
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+namespace GitHubExtension.Test;
+
+public class FileSystem
+{
+    public static string BuildOutputFilename(string filename, string outputFolder, bool createPathIfNecessary = true)
+    {
+        var outputFilename = SubstituteOutputFilename(filename, outputFolder);
+        var file = new FileInfo(outputFilename);
+        if (createPathIfNecessary)
+        {
+            file.Directory?.Create();
+        }
+
+        return file.FullName;
+    }
+
+    public static string SubstituteNow(string s)
+    {
+        if (s.Contains("{now}", StringComparison.CurrentCulture))
+        {
+            var now = DateTime.Now;
+            var nowAsString = $"{now:yyyyMMdd-HHmmss}";
+            return s.Replace("{now}", nowAsString);
+        }
+
+        return s;
+    }
+
+    public static string SubstituteOutputFilename(string filename, string outputDirectory)
+    {
+        return Path.Combine(SubstituteNow(outputDirectory), SubstituteNow(filename));
+    }
+}
diff --git a/test/GitHubExtension/Helpers/TestOptions.cs b/test/GitHubExtension/Helpers/TestOptions.cs
index a2b8865..34a3039 100644
--- a/test/GitHubExtension/Helpers/TestOptions.cs
+++ b/test/GitHubExtension/Helpers/TestOptions.cs
@@ -1,20 +1,24 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using DevHome.Logging;
 using GitHubExtension.DataModel;
 
 namespace GitHubExtension.Test;
 
 public partial class TestOptions
 {
-    public Options LogOptions { get; set; }
+    public string LogFileFolderRoot { get; set; } = string.Empty;
+
+    public string LogFileFolderName { get; set; } = "{now}";
+
+    public string LogFileName { get; set; } = string.Empty;
+
+    public string LogFileFolderPath => Path.Combine(LogFileFolderRoot, LogFileFolderName);
 
     public DataStoreOptions DataStoreOptions { get; set; }
 
     public TestOptions()
     {
-        LogOptions = new Options();
         DataStoreOptions = new DataStoreOptions();
     }
 }
diff --git a/test/GitHubExtension/Helpers/TestSetupHelpers.cs b/test/GitHubExtension/Helpers/TestSetupHelpers.cs
index e4a332d..9242616 100644
--- a/test/GitHubExtension/Helpers/TestSetupHelpers.cs
+++ b/test/GitHubExtension/Helpers/TestSetupHelpers.cs
@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using DevHome.Logging;
-using DevHome.Logging.Helpers;
+using System.Globalization;
 using GitHubExtension.DataModel;
+using Serilog;
 
 namespace GitHubExtension.Test;
 
@@ -42,10 +42,8 @@ public static TestOptions SetupTempTestOptions(TestContext context)
         // to be consistent in test setup/cleanup.
         var path = GetUniqueFolderPath("GHPT");
         var options = new TestOptions();
-        options.LogOptions.FailFastSeverity = FailFastSeverityLevel.Ignore;
-        options.LogOptions.LogFileFilter = SeverityLevel.Debug;
-        options.LogOptions.LogFileFolderRoot = path;
-        options.LogOptions.LogFileName = LogFileName;
+        options.LogFileFolderRoot = path;
+        options.LogFileName = LogFileName;
         options.DataStoreOptions.DataStoreFileName = DataBaseFileName;
         options.DataStoreOptions.DataStoreFolderPath = path;
         options.DataStoreOptions.DataStoreSchema = new GitHubDataStoreSchema();
@@ -69,6 +67,26 @@ public static string GetDataStoreFilePath(TestOptions options)
 
     public static string GetLogFilePath(TestOptions options)
     {
-        return FileSystem.SubstituteOutputFilename(options.LogOptions.LogFileName, options.LogOptions.LogFileFolderPath);
+        return FileSystem.SubstituteOutputFilename(options.LogFileName, options.LogFileFolderPath);
+    }
+
+    public static void ConfigureTestLog(TestOptions options, TestContext context)
+    {
+        Log.Logger = new LoggerConfiguration()
+            .MinimumLevel.Debug()
+            .WriteTo.File(
+                path: GetLogFilePath(options),
+                formatProvider: CultureInfo.InvariantCulture,
+                outputTemplate: "[{Timestamp:yyyy/MM/dd HH:mm:ss.fff} {Level:u3}] ({SourceContext}) {Message:lj}{NewLine}{Exception}")
+            .WriteTo.TestContextSink(
+                context: context,
+                formatProvider: CultureInfo.InvariantCulture,
+                outputTemplate: "[{Timestamp:yyyy/MM/dd HH:mm:ss.fff} {Level:u3}] ({SourceContext}) {Message:lj}{NewLine}{Exception}")
+            .CreateLogger();
+    }
+
+    public static void CloseTestLog()
+    {
+        Log.CloseAndFlush();
     }
 }
diff --git a/test/GitHubExtension/TestContextSink/TestContextSink.cs b/test/GitHubExtension/TestContextSink/TestContextSink.cs
new file mode 100644
index 0000000..60e51b4
--- /dev/null
+++ b/test/GitHubExtension/TestContextSink/TestContextSink.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using Serilog.Core;
+using Serilog.Events;
+using Serilog.Formatting.Display;
+
+namespace GitHubExtension.Test;
+
+public class TestContextSink : ILogEventSink
+{
+    private readonly TestContext? _testContext;
+
+    private readonly MessageTemplateTextFormatter _formatter;
+
+    public TestContextSink(IFormatProvider formatProvider, TestContext testContext, string outputTemplate)
+    {
+        _testContext = testContext;
+        _formatter = new MessageTemplateTextFormatter(outputTemplate, formatProvider);
+    }
+
+    public void Emit(LogEvent logEvent)
+    {
+        using var writer = new StringWriter();
+        _formatter.Format(logEvent, writer);
+        _testContext?.Write(writer.ToString());
+    }
+}
diff --git a/test/GitHubExtension/TestContextSink/TestContextSinkExtensions.cs b/test/GitHubExtension/TestContextSink/TestContextSinkExtensions.cs
new file mode 100644
index 0000000..41476ef
--- /dev/null
+++ b/test/GitHubExtension/TestContextSink/TestContextSinkExtensions.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using Serilog;
+using Serilog.Configuration;
+
+namespace GitHubExtension.Test;
+
+public static class TestContextSinkExtensions
+{
+    public static LoggerConfiguration TestContextSink(
+              this LoggerSinkConfiguration loggerConfiguration,
+              string outputTemplate,
+              TestContext? context = null,
+              IFormatProvider? formatProvider = null)
+    {
+        return loggerConfiguration.Sink(new TestContextSink(formatProvider!, context!, outputTemplate));
+    }
+}
diff --git a/test/GitHubExtension/TestListener.cs b/test/GitHubExtension/TestListener.cs
deleted file mode 100644
index c08f48e..0000000
--- a/test/GitHubExtension/TestListener.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using System.Globalization;
-using DevHome.Logging;
-using DevHome.Logging.Listeners;
-
-namespace GitHubExtension.Test;
-
-public class TestListener : ListenerBase
-{
-    private TestContext? TestContext
-    {
-        get;
-        set;
-    }
-
-    public Dictionary<SeverityLevel, int> EventCounts { get; } = new Dictionary<SeverityLevel, int>();
-
-    public TestListener(string name, TestContext testContext)
-        : base(name)
-    {
-        TestContext = testContext;
-        EventCounts.Add(SeverityLevel.Critical, 0);
-        EventCounts.Add(SeverityLevel.Error, 0);
-        EventCounts.Add(SeverityLevel.Warn, 0);
-        EventCounts.Add(SeverityLevel.Info, 0);
-        EventCounts.Add(SeverityLevel.Debug, 0);
-    }
-
-    public void Reset()
-    {
-        foreach (var kvp in EventCounts)
-        {
-            EventCounts[kvp.Key] = 0;
-        }
-    }
-
-    public bool FoundErrors()
-    {
-        return EventCounts[SeverityLevel.Critical] > 0 || EventCounts[SeverityLevel.Error] > 0;
-    }
-
-    public override void HandleLogEvent(LogEvent evt)
-    {
-        switch (evt.Severity)
-        {
-            case SeverityLevel.Critical:
-                ++EventCounts[SeverityLevel.Critical];
-                PrintEvent(evt);
-                break;
-            case SeverityLevel.Error:
-                ++EventCounts[SeverityLevel.Error];
-                PrintEvent(evt);
-                break;
-            case SeverityLevel.Warn:
-                ++EventCounts[SeverityLevel.Warn];
-                PrintEvent(evt);
-                break;
-            case SeverityLevel.Info:
-                ++EventCounts[SeverityLevel.Info];
-                PrintEvent(evt);
-                break;
-            case SeverityLevel.Debug:
-                ++EventCounts[SeverityLevel.Debug];
-
-                PrintEvent(evt);
-                break;
-        }
-    }
-
-    private void PrintEvent(LogEvent evt)
-    {
-        TestContext?.WriteLine($"[{evt.Source}] {evt.Severity.ToString().ToUpper(CultureInfo.InvariantCulture)}: {evt.Message}");
-        if (evt.Exception != null)
-        {
-            TestContext?.WriteLine(evt.Exception.ToString());
-        }
-    }
-
-    public void PrintEventCounts()
-    {
-        TestContext?.WriteLine($"Critical: {EventCounts[SeverityLevel.Critical]}  Error: {EventCounts[SeverityLevel.Error]}  Warning: {EventCounts[SeverityLevel.Warn]}");
-    }
-}
diff --git a/test/GitHubExtension/Widgets/Icons.cs b/test/GitHubExtension/Widgets/Icons.cs
index bc745f1..c4ee02f 100644
--- a/test/GitHubExtension/Widgets/Icons.cs
+++ b/test/GitHubExtension/Widgets/Icons.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using DevHome.Logging;
-
 namespace GitHubExtension.Test;
 
 public partial class WidgetTests
@@ -11,11 +9,6 @@ public partial class WidgetTests
     [TestCategory("Unit")]
     public void IconsTest()
     {
-        using var log = new Logger("TestStore", TestOptions.LogOptions);
-        var testListener = new TestListener("TestListener", TestContext!);
-        log.AddListener(testListener);
-        DataModel.Log.Attach(log);
-
         var icon = Helpers.IconLoader.GetIconAsBase64("arrow.png");
 
         Assert.IsNotNull(icon);
diff --git a/test/GitHubExtension/Widgets/Validation.cs b/test/GitHubExtension/Widgets/Validation.cs
index 4f8cc0d..31a49a2 100644
--- a/test/GitHubExtension/Widgets/Validation.cs
+++ b/test/GitHubExtension/Widgets/Validation.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using DevHome.Logging;
-
 namespace GitHubExtension.Test;
 
 public partial class WidgetTests
@@ -11,11 +9,6 @@ public partial class WidgetTests
     [TestCategory("Unit")]
     public void UriParsingValidation()
     {
-        using var log = new Logger("TestStore", TestOptions.LogOptions);
-        var testListener = new TestListener("TestListener", TestContext!);
-        log.AddListener(testListener);
-        DataModel.Log.Attach(log);
-
         var testUrisValid = new List<string>
         {
             "https://github.com/owner/repo",
@@ -79,8 +72,5 @@ public void UriParsingValidation()
             Assert.IsFalse(Client.Validation.IsValidGitHubIssueQueryURL(uriString));
             TestContext?.WriteLine($"Is not query URL: {uriString}");
         }
-
-        testListener.PrintEventCounts();
-        Assert.AreEqual(false, testListener.FoundErrors());
     }
 }
diff --git a/test/GitHubExtension/Widgets/WidgetTestsSetup.cs b/test/GitHubExtension/Widgets/WidgetTestsSetup.cs
index a699992..3090c20 100644
--- a/test/GitHubExtension/Widgets/WidgetTestsSetup.cs
+++ b/test/GitHubExtension/Widgets/WidgetTestsSetup.cs
@@ -24,11 +24,13 @@ private TestOptions TestOptions
     public void TestInitialize()
     {
         TestOptions = TestHelpers.SetupTempTestOptions(TestContext!);
+        TestHelpers.ConfigureTestLog(TestOptions, TestContext!);
     }
 
     [TestCleanup]
     public void Cleanup()
     {
+        TestHelpers.CloseTestLog();
         TestHelpers.CleanupTempTestOptions(TestOptions, TestContext!);
     }
 }
diff --git a/test/UITest/GitHubExtension.UITest.csproj b/test/UITest/GitHubExtension.UITest.csproj
index 62cfac2..d8c27ae 100644
--- a/test/UITest/GitHubExtension.UITest.csproj
+++ b/test/UITest/GitHubExtension.UITest.csproj
@@ -16,10 +16,17 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
     <PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
     <PackageReference Include="Appium.WebDriver" Version="4.4.5" />
+    <PackageReference Include="Serilog" Version="3.1.1" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
+    <PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>