diff --git a/services/Archival/FilterLists.Archival.Infrastructure/Options/GitOptions.cs b/services/Archival/FilterLists.Archival.Infrastructure/Options/GitOptions.cs
index c891b486b..dec71053f 100644
--- a/services/Archival/FilterLists.Archival.Infrastructure/Options/GitOptions.cs
+++ b/services/Archival/FilterLists.Archival.Infrastructure/Options/GitOptions.cs
@@ -4,8 +4,8 @@ internal class GitOptions
     {
         public const string Key = "Git";
 
-        public string RepositoryPath { get; set; } = null!;
-        public string UserName { get; set; } = null!;
-        public string UserEmail { get; set; } = null!;
+        public string RepositoryPath { get; init; } = null!;
+        public string UserName { get; init; } = null!;
+        public string UserEmail { get; init; } = null!;
     }
 }
diff --git a/services/Directory/FilterLists.Directory.Api.Contracts/Models/ListDetailsVm.cs b/services/Directory/FilterLists.Directory.Api.Contracts/Models/ListDetailsVm.cs
index adf77a21c..75fd20f99 100644
--- a/services/Directory/FilterLists.Directory.Api.Contracts/Models/ListDetailsVm.cs
+++ b/services/Directory/FilterLists.Directory.Api.Contracts/Models/ListDetailsVm.cs
@@ -5,36 +5,36 @@ namespace FilterLists.Directory.Api.Contracts.Models
 {
     public class ListDetailsVm
     {
-        public int Id { get; private set; }
-        public string Name { get; private set; } = null!;
-        public string? Description { get; private set; }
-        public int? LicenseId { get; private set; }
-        public IEnumerable<int>? SyntaxIds { get; private set; }
-        public IEnumerable<string>? Iso6391s { get; private set; }
-        public IEnumerable<int>? TagIds { get; private set; }
-        public IEnumerable<ViewUrlVm>? ViewUrls { get; private set; }
-        public Uri? HomeUrl { get; private set; }
-        public Uri? OnionUrl { get; private set; }
-        public Uri? PolicyUrl { get; private set; }
-        public Uri? SubmissionUrl { get; private set; }
-        public Uri? IssuesUrl { get; private set; }
-        public Uri? ForumUrl { get; private set; }
-        public Uri? ChatUrl { get; private set; }
-        public string? EmailAddress { get; private set; }
-        public Uri? DonateUrl { get; private set; }
-        public IEnumerable<int>? MaintainerIds { get; private set; }
-        public IEnumerable<int>? UpstreamFilterListIds { get; private set; }
-        public IEnumerable<int>? ForkFilterListIds { get; private set; }
-        public IEnumerable<int>? IncludedInFilterListIds { get; private set; }
-        public IEnumerable<int>? IncludesFilterListIds { get; private set; }
-        public IEnumerable<int>? DependencyFilterListIds { get; private set; }
-        public IEnumerable<int>? DependentFilterListIds { get; private set; }
+        public int Id { get; init; }
+        public string Name { get; init; } = null!;
+        public string? Description { get; init; }
+        public int? LicenseId { get; init; }
+        public IEnumerable<int>? SyntaxIds { get; init; }
+        public IEnumerable<string>? Iso6391s { get; init; }
+        public IEnumerable<int>? TagIds { get; init; }
+        public IEnumerable<ViewUrlVm>? ViewUrls { get; init; }
+        public Uri? HomeUrl { get; init; }
+        public Uri? OnionUrl { get; init; }
+        public Uri? PolicyUrl { get; init; }
+        public Uri? SubmissionUrl { get; init; }
+        public Uri? IssuesUrl { get; init; }
+        public Uri? ForumUrl { get; init; }
+        public Uri? ChatUrl { get; init; }
+        public string? EmailAddress { get; init; }
+        public Uri? DonateUrl { get; init; }
+        public IEnumerable<int>? MaintainerIds { get; init; }
+        public IEnumerable<int>? UpstreamFilterListIds { get; init; }
+        public IEnumerable<int>? ForkFilterListIds { get; init; }
+        public IEnumerable<int>? IncludedInFilterListIds { get; init; }
+        public IEnumerable<int>? IncludesFilterListIds { get; init; }
+        public IEnumerable<int>? DependencyFilterListIds { get; init; }
+        public IEnumerable<int>? DependentFilterListIds { get; init; }
 
         public class ViewUrlVm
         {
-            public short SegmentNumber { get; private set; }
-            public short Primariness { get; private set; }
-            public Uri Url { get; private set; } = null!;
+            public short SegmentNumber { get; init; }
+            public short Primariness { get; init; }
+            public Uri Url { get; init; } = null!;
         }
     }
 }
diff --git a/services/Directory/FilterLists.Directory.Api.Contracts/Models/ListVm.cs b/services/Directory/FilterLists.Directory.Api.Contracts/Models/ListVm.cs
index 8195e2e6a..7a1611e17 100644
--- a/services/Directory/FilterLists.Directory.Api.Contracts/Models/ListVm.cs
+++ b/services/Directory/FilterLists.Directory.Api.Contracts/Models/ListVm.cs
@@ -4,13 +4,13 @@ namespace FilterLists.Directory.Api.Contracts.Models
 {
     public class ListVm
     {
-        public int Id { get; private set; }
-        public string Name { get; private set; } = null!;
-        public string? Description { get; private set; }
-        public int? LicenseId { get; private set; }
-        public IEnumerable<int>? SyntaxIds { get; private set; }
-        public IEnumerable<string>? Iso6391s { get; private set; }
-        public IEnumerable<int>? TagIds { get; private set; }
-        public IEnumerable<int>? MaintainerIds { get; private set; }
+        public int Id { get; init; }
+        public string Name { get; init; } = null!;
+        public string? Description { get; init; }
+        public int? LicenseId { get; init; }
+        public IEnumerable<int>? SyntaxIds { get; init; }
+        public IEnumerable<string>? Iso6391s { get; init; }
+        public IEnumerable<int>? TagIds { get; init; }
+        public IEnumerable<int>? MaintainerIds { get; init; }
     }
 }
diff --git a/services/Directory/FilterLists.Directory.Api.Contracts/Options/ApiOptions.cs b/services/Directory/FilterLists.Directory.Api.Contracts/Options/ApiOptions.cs
index df3bf7fa3..67d00124b 100644
--- a/services/Directory/FilterLists.Directory.Api.Contracts/Options/ApiOptions.cs
+++ b/services/Directory/FilterLists.Directory.Api.Contracts/Options/ApiOptions.cs
@@ -4,6 +4,6 @@ internal class ApiOptions
     {
         public const string Key = "Api";
 
-        public string DirectoryHost { get; set; } = null!;
+        public string DirectoryHost { get; init; } = null!;
     }
 }
diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetLanguages.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetLanguages.cs
index 7145f2d6b..26814fa94 100644
--- a/services/Directory/FilterLists.Directory.Application/Queries/GetLanguages.cs
+++ b/services/Directory/FilterLists.Directory.Application/Queries/GetLanguages.cs
@@ -54,9 +54,9 @@ public LanguageVmProfile()
 
         public class LanguageVm
         {
-            public string Iso6391 { get; private set; } = null!;
-            public string Name { get; private set; } = null!;
-            public IEnumerable<int>? FilterListIds { get; private set; }
+            public string Iso6391 { get; init; } = null!;
+            public string Name { get; init; } = null!;
+            public IEnumerable<int>? FilterListIds { get; init; }
         }
     }
 }
diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetLicenses.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetLicenses.cs
index b19cdc706..2f3378a4a 100644
--- a/services/Directory/FilterLists.Directory.Application/Queries/GetLicenses.cs
+++ b/services/Directory/FilterLists.Directory.Application/Queries/GetLicenses.cs
@@ -53,13 +53,13 @@ public LicenseVmProfile()
 
         public class LicenseVm
         {
-            public int Id { get; private set; }
-            public string Name { get; private set; } = null!;
-            public Uri? Url { get; private set; }
-            public bool PermitsModification { get; private set; }
-            public bool PermitsDistribution { get; private set; }
-            public bool PermitsCommercialUse { get; private set; }
-            public IEnumerable<int>? FilterListIds { get; private set; }
+            public int Id { get; init; }
+            public string Name { get; init; } = null!;
+            public Uri? Url { get; init; }
+            public bool PermitsModification { get; init; }
+            public bool PermitsDistribution { get; init; }
+            public bool PermitsCommercialUse { get; init; }
+            public IEnumerable<int>? FilterListIds { get; init; }
         }
     }
 }
diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetMaintainers.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetMaintainers.cs
index 1d3ea5470..a99d38700 100644
--- a/services/Directory/FilterLists.Directory.Application/Queries/GetMaintainers.cs
+++ b/services/Directory/FilterLists.Directory.Application/Queries/GetMaintainers.cs
@@ -54,12 +54,12 @@ public MaintainerVmProfile()
 
         public class MaintainerVm
         {
-            public int Id { get; private set; }
-            public string Name { get; private set; } = null!;
-            public Uri? Url { get; private set; }
-            public string? EmailAddress { get; private set; }
-            public string? TwitterHandle { get; private set; }
-            public IEnumerable<int>? FilterListIds { get; private set; }
+            public int Id { get; init; }
+            public string Name { get; init; } = null!;
+            public Uri? Url { get; init; }
+            public string? EmailAddress { get; init; }
+            public string? TwitterHandle { get; init; }
+            public IEnumerable<int>? FilterListIds { get; init; }
         }
     }
 }
diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetSoftware.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetSoftware.cs
index d5d34a413..75504efae 100644
--- a/services/Directory/FilterLists.Directory.Application/Queries/GetSoftware.cs
+++ b/services/Directory/FilterLists.Directory.Application/Queries/GetSoftware.cs
@@ -53,13 +53,13 @@ public SoftwareVmProfile()
 
         public class SoftwareVm
         {
-            public int Id { get; private set; }
-            public string Name { get; private set; } = null!;
-            public string? Description { get; private set; }
-            public Uri? HomeUrl { get; private set; }
-            public Uri? DownloadUrl { get; private set; }
-            public bool SupportsAbpUrlScheme { get; private set; }
-            public IEnumerable<int>? SyntaxIds { get; private set; }
+            public int Id { get; init; }
+            public string Name { get; init; } = null!;
+            public string? Description { get; init; }
+            public Uri? HomeUrl { get; init; }
+            public Uri? DownloadUrl { get; init; }
+            public bool SupportsAbpUrlScheme { get; init; }
+            public IEnumerable<int>? SyntaxIds { get; init; }
         }
     }
 }
diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetSyntaxes.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetSyntaxes.cs
index 8b40e5c34..fee8a254b 100644
--- a/services/Directory/FilterLists.Directory.Application/Queries/GetSyntaxes.cs
+++ b/services/Directory/FilterLists.Directory.Application/Queries/GetSyntaxes.cs
@@ -56,12 +56,12 @@ public SyntaxVmProfile()
 
         public class SyntaxVm
         {
-            public int Id { get; private set; }
-            public string Name { get; private set; } = null!;
-            public string? Description { get; private set; }
-            public Uri? Url { get; private set; }
-            public IEnumerable<int>? FilterListIds { get; private set; }
-            public IEnumerable<int>? SoftwareIds { get; private set; }
+            public int Id { get; init; }
+            public string Name { get; init; } = null!;
+            public string? Description { get; init; }
+            public Uri? Url { get; init; }
+            public IEnumerable<int>? FilterListIds { get; init; }
+            public IEnumerable<int>? SoftwareIds { get; init; }
         }
     }
 }
diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetTags.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetTags.cs
index 7f4142645..c06f5687e 100644
--- a/services/Directory/FilterLists.Directory.Application/Queries/GetTags.cs
+++ b/services/Directory/FilterLists.Directory.Application/Queries/GetTags.cs
@@ -52,10 +52,10 @@ public TagVmProfile()
 
         public class TagVm
         {
-            public int Id { get; private set; }
-            public string Name { get; private set; } = null!;
-            public string? Description { get; private set; }
-            public IEnumerable<int>? FilterListIds { get; private set; }
+            public int Id { get; init; }
+            public string Name { get; init; } = null!;
+            public string? Description { get; init; }
+            public IEnumerable<int>? FilterListIds { get; init; }
         }
     }
 }
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Dependent.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Dependent.cs
index 7805601ef..39be9c67f 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Dependent.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Dependent.cs
@@ -5,9 +5,9 @@ namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities
 {
     public class Dependent
     {
-        public int DependencyFilterListId { get; private set; }
+        public int DependencyFilterListId { get; init; }
         public FilterList DependencyFilterList { get; } = null!;
-        public int DependentFilterListId { get; private set; }
+        public int DependentFilterListId { get; init; }
         public FilterList DependentFilterList { get; } = null!;
     }
 
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterList.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterList.cs
index d562d8a93..a5aa00ec3 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterList.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterList.cs
@@ -7,24 +7,24 @@ namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities
 {
     public class FilterList
     {
-        public int Id { get; private set; }
-        public string Name { get; private set; } = null!;
-        public string? Description { get; private set; }
-        public int? LicenseId { get; private set; }
+        public int Id { get; init; }
+        public string Name { get; init; } = null!;
+        public string? Description { get; init; }
+        public int? LicenseId { get; init; }
         public License? License { get; }
         public IReadOnlyCollection<FilterListSyntax> FilterListSyntaxes { get; } = new HashSet<FilterListSyntax>();
         public IReadOnlyCollection<FilterListLanguage> FilterListLanguages { get; } = new HashSet<FilterListLanguage>();
         public IReadOnlyCollection<FilterListTag> FilterListTags { get; } = new HashSet<FilterListTag>();
         public IReadOnlyCollection<FilterListViewUrl> ViewUrls { get; } = new HashSet<FilterListViewUrl>();
-        public Uri? HomeUrl { get; private set; }
-        public Uri? OnionUrl { get; private set; }
-        public Uri? PolicyUrl { get; private set; }
-        public Uri? SubmissionUrl { get; private set; }
-        public Uri? IssuesUrl { get; private set; }
-        public Uri? ForumUrl { get; private set; }
-        public Uri? ChatUrl { get; private set; }
-        public string? EmailAddress { get; private set; }
-        public Uri? DonateUrl { get; private set; }
+        public Uri? HomeUrl { get; init; }
+        public Uri? OnionUrl { get; init; }
+        public Uri? PolicyUrl { get; init; }
+        public Uri? SubmissionUrl { get; init; }
+        public Uri? IssuesUrl { get; init; }
+        public Uri? ForumUrl { get; init; }
+        public Uri? ChatUrl { get; init; }
+        public string? EmailAddress { get; init; }
+        public Uri? DonateUrl { get; init; }
         public IReadOnlyCollection<FilterListMaintainer> FilterListMaintainers { get; } = new HashSet<FilterListMaintainer>();
         public IReadOnlyCollection<Fork> UpstreamFilterLists { get; } = new HashSet<Fork>();
         public IReadOnlyCollection<Fork> ForkFilterLists { get; } = new HashSet<Fork>();
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListLanguage.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListLanguage.cs
index 73f03ed5c..458b952fb 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListLanguage.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListLanguage.cs
@@ -5,9 +5,9 @@ namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities
 {
     public class FilterListLanguage
     {
-        public int FilterListId { get; private set; }
+        public int FilterListId { get; init; }
         public FilterList FilterList { get; } = null!;
-        public string Iso6391 { get; private set; } = null!;
+        public string Iso6391 { get; init; } = null!;
         public Language Language { get; } = null!;
     }
 
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListMaintainer.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListMaintainer.cs
index 7dafb4dec..cabdc3c96 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListMaintainer.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListMaintainer.cs
@@ -5,9 +5,9 @@ namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities
 {
     public class FilterListMaintainer
     {
-        public int FilterListId { get; private set; }
+        public int FilterListId { get; init; }
         public FilterList FilterList { get; } = null!;
-        public int MaintainerId { get; private set; }
+        public int MaintainerId { get; init; }
         public Maintainer Maintainer { get; } = null!;
     }
 
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListSyntax.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListSyntax.cs
index 940e3ef06..4fbd1cb46 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListSyntax.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListSyntax.cs
@@ -5,9 +5,9 @@ namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities
 {
     public class FilterListSyntax
     {
-        public int FilterListId { get; private set; }
+        public int FilterListId { get; init; }
         public FilterList FilterList { get; } = null!;
-        public int SyntaxId { get; private set; }
+        public int SyntaxId { get; init; }
         public Syntax Syntax { get; } = null!;
     }
 
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListTag.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListTag.cs
index ddee67eb2..a72b725f8 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListTag.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListTag.cs
@@ -5,9 +5,9 @@ namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities
 {
     public class FilterListTag
     {
-        public int FilterListId { get; private set; }
+        public int FilterListId { get; init; }
         public FilterList FilterList { get; } = null!;
-        public int TagId { get; private set; }
+        public int TagId { get; init; }
         public Tag Tag { get; } = null!;
     }
 
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListViewUrl.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListViewUrl.cs
index 56266a5e7..6051178b9 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListViewUrl.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListViewUrl.cs
@@ -6,12 +6,12 @@ namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities
 {
     public class FilterListViewUrl
     {
-        public int Id { get; private set; }
-        public int FilterListId { get; private set; }
+        public int Id { get; init; }
+        public int FilterListId { get; init; }
         public FilterList FilterList { get; } = null!;
-        public short SegmentNumber { get; private set; }
-        public short Primariness { get; private set; }
-        public Uri Url { get; private set; } = null!;
+        public short SegmentNumber { get; init; }
+        public short Primariness { get; init; }
+        public Uri Url { get; init; } = null!;
     }
 
     internal class FilterListViewUrlConfiguration : IEntityTypeConfiguration<FilterListViewUrl>
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Fork.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Fork.cs
index 41ce958e0..22349247f 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Fork.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Fork.cs
@@ -5,9 +5,9 @@ namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities
 {
     public class Fork
     {
-        public int UpstreamFilterListId { get; private set; }
+        public int UpstreamFilterListId { get; init; }
         public FilterList UpstreamFilterList { get; } = null!;
-        public int ForkFilterListId { get; private set; }
+        public int ForkFilterListId { get; init; }
         public FilterList ForkFilterList { get; } = null!;
     }
 
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Language.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Language.cs
index e2be5cfca..91b9d6c25 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Language.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Language.cs
@@ -6,8 +6,8 @@ namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities
 {
     public class Language
     {
-        public string Iso6391 { get; private set; } = null!;
-        public string Name { get; private set; } = null!;
+        public string Iso6391 { get; init; } = null!;
+        public string Name { get; init; } = null!;
         public IReadOnlyCollection<FilterListLanguage> FilterListLanguages { get; } = new HashSet<FilterListLanguage>();
     }
 
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/License.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/License.cs
index 3f1f46f18..3a24ac5a8 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/License.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/License.cs
@@ -7,12 +7,12 @@ namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities
 {
     public class License
     {
-        public int Id { get; private set; }
-        public string Name { get; private set; } = null!;
-        public Uri? Url { get; private set; }
-        public bool PermitsModification { get; private set; }
-        public bool PermitsDistribution { get; private set; }
-        public bool PermitsCommercialUse { get; private set; }
+        public int Id { get; init; }
+        public string Name { get; init; } = null!;
+        public Uri? Url { get; init; }
+        public bool PermitsModification { get; init; }
+        public bool PermitsDistribution { get; init; }
+        public bool PermitsCommercialUse { get; init; }
         public IReadOnlyCollection<FilterList> FilterLists { get; } = new HashSet<FilterList>();
     }
 
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Maintainer.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Maintainer.cs
index ba4909352..0340dba59 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Maintainer.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Maintainer.cs
@@ -7,11 +7,11 @@ namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities
 {
     public class Maintainer
     {
-        public int Id { get; private set; }
-        public string Name { get; private set; } = null!;
-        public Uri? Url { get; private set; }
-        public string? EmailAddress { get; private set; }
-        public string? TwitterHandle { get; private set; }
+        public int Id { get; init; }
+        public string Name { get; init; } = null!;
+        public Uri? Url { get; init; }
+        public string? EmailAddress { get; init; }
+        public string? TwitterHandle { get; init; }
         public IReadOnlyCollection<FilterListMaintainer> FilterListMaintainers { get; } = new HashSet<FilterListMaintainer>();
     }
 
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Merge.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Merge.cs
index ce1a7ea30..62a0a59c0 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Merge.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Merge.cs
@@ -5,9 +5,9 @@ namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities
 {
     public class Merge
     {
-        public int IncludedInFilterListId { get; private set; }
+        public int IncludedInFilterListId { get; init; }
         public FilterList IncludedInFilterList { get; } = null!;
-        public int IncludesFilterListId { get; private set; }
+        public int IncludesFilterListId { get; init; }
         public FilterList IncludesFilterList { get; } = null!;
     }
 
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Software.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Software.cs
index 5c800fd84..2e2a8a2a2 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Software.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Software.cs
@@ -7,12 +7,12 @@ namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities
 {
     public class Software
     {
-        public int Id { get; private set; }
-        public string Name { get; private set; } = null!;
-        public string? Description { get; private set; }
-        public Uri? HomeUrl { get; private set; }
-        public Uri? DownloadUrl { get; private set; }
-        public bool SupportsAbpUrlScheme { get; private set; }
+        public int Id { get; init; }
+        public string Name { get; init; } = null!;
+        public string? Description { get; init; }
+        public Uri? HomeUrl { get; init; }
+        public Uri? DownloadUrl { get; init; }
+        public bool SupportsAbpUrlScheme { get; init; }
         public IReadOnlyCollection<SoftwareSyntax> SoftwareSyntaxes { get; } = new HashSet<SoftwareSyntax>();
     }
 
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/SoftwareSyntax.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/SoftwareSyntax.cs
index a2cfdad14..7245e27c9 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/SoftwareSyntax.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/SoftwareSyntax.cs
@@ -5,9 +5,9 @@ namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities
 {
     public class SoftwareSyntax
     {
-        public int SoftwareId { get; private set; }
+        public int SoftwareId { get; init; }
         public Software Software { get; } = null!;
-        public int SyntaxId { get; private set; }
+        public int SyntaxId { get; init; }
         public Syntax Syntax { get; } = null!;
     }
 
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Syntax.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Syntax.cs
index 0c2cd67c4..6c366a465 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Syntax.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Syntax.cs
@@ -7,10 +7,10 @@ namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities
 {
     public class Syntax
     {
-        public int Id { get; private set; }
-        public string Name { get; private set; } = null!;
-        public string? Description { get; private set; }
-        public Uri? Url { get; private set; }
+        public int Id { get; init; }
+        public string Name { get; init; } = null!;
+        public string? Description { get; init; }
+        public Uri? Url { get; init; }
         public IReadOnlyCollection<FilterListSyntax> FilterListSyntaxes { get; } = new HashSet<FilterListSyntax>();
         public IReadOnlyCollection<SoftwareSyntax> SoftwareSyntaxes { get; } = new HashSet<SoftwareSyntax>();
     }
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Tag.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Tag.cs
index 2f88f91d9..c1c5d75a3 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Tag.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Tag.cs
@@ -6,9 +6,9 @@ namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities
 {
     public class Tag
     {
-        public int Id { get; private set; }
-        public string Name { get; private set; } = null!;
-        public string? Description { get; private set; }
+        public int Id { get; init; }
+        public string Name { get; init; } = null!;
+        public string? Description { get; init; }
         public IReadOnlyCollection<FilterListTag> FilterListTags { get; } = new HashSet<FilterListTag>();
     }
 
diff --git a/services/SharedKernel/FilterLists.SharedKernel.Logging/Options/ApplicationInsightsOptions.cs b/services/SharedKernel/FilterLists.SharedKernel.Logging/Options/ApplicationInsightsOptions.cs
index 21a233811..2b7f5c4f3 100644
--- a/services/SharedKernel/FilterLists.SharedKernel.Logging/Options/ApplicationInsightsOptions.cs
+++ b/services/SharedKernel/FilterLists.SharedKernel.Logging/Options/ApplicationInsightsOptions.cs
@@ -4,6 +4,6 @@ internal class ApplicationInsightsOptions
     {
         public const string Key = "ApplicationInsights";
 
-        public string ServerTelemetryChannelStoragePath { get; set; } = null!;
+        public string ServerTelemetryChannelStoragePath { get; init; } = null!;
     }
 }