diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterList.cs b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterList.cs
index 1cd26eb88..42bf696d7 100644
--- a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterList.cs
+++ b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterList.cs
@@ -10,12 +10,12 @@ public class FilterList
         public string Name { get; private set; } = null!;
         public string? Description { get; private set; }
         public License? License { get; private set; }
-        public ICollection<FilterListSyntax> FilterListSyntaxes { get; private set; } = new HashSet<FilterListSyntax>();
-        public ICollection<FilterListLanguage> FilterListLanguages { get; private set; } = new HashSet<FilterListLanguage>();
-        public ICollection<FilterListTag> FilterListTags { get; private set; } = new HashSet<FilterListTag>();
+        public IReadOnlyCollection<FilterListSyntax> FilterListSyntaxes { get; private set; } = new HashSet<FilterListSyntax>();
+        public IReadOnlyCollection<FilterListLanguage> FilterListLanguages { get; private set; } = new HashSet<FilterListLanguage>();
+        public IReadOnlyCollection<FilterListTag> FilterListTags { get; private set; } = new HashSet<FilterListTag>();
         public Uri ViewUrl { get; private set; } = null!;
-        public ICollection<ViewUrlPartial> ViewUrlPartials { get; private set; } = new HashSet<ViewUrlPartial>();
-        public ICollection<ViewUrlMirror> ViewUrlMirrors { get; private set; } = new HashSet<ViewUrlMirror>();
+        public IReadOnlyCollection<ViewUrlPartial> ViewUrlPartials { get; private set; } = new HashSet<ViewUrlPartial>();
+        public IReadOnlyCollection<ViewUrlMirror> ViewUrlMirrors { get; private set; } = new HashSet<ViewUrlMirror>();
         public Uri? HomeUrl { get; private set; }
         public Uri? OnionUrl { get; private set; }
         public Uri? PolicyUrl { get; private set; }
@@ -25,13 +25,13 @@ public class FilterList
         public Uri? ChatUrl { get; private set; }
         public string? EmailAddress { get; private set; }
         public Uri? DonateUrl { get; private set; }
-        public ICollection<FilterListMaintainer> FilterListMaintainers { get; private set; } = new HashSet<FilterListMaintainer>();
-        public ICollection<Fork> UpstreamFilterLists { get; private set; } = new HashSet<Fork>();
-        public ICollection<Fork> ForkFilterLists { get; private set; } = new HashSet<Fork>();
-        public ICollection<Merge> IncludedInFilterLists { get; private set; } = new HashSet<Merge>();
-        public ICollection<Merge> IncludesFilterLists { get; private set; } = new HashSet<Merge>();
-        public ICollection<Dependent> DependencyFilterLists { get; private set; } = new HashSet<Dependent>();
-        public ICollection<Dependent> DependentFilterLists { get; private set; } = new HashSet<Dependent>();
+        public IReadOnlyCollection<FilterListMaintainer> FilterListMaintainers { get; private set; } = new HashSet<FilterListMaintainer>();
+        public IReadOnlyCollection<Fork> UpstreamFilterLists { get; private set; } = new HashSet<Fork>();
+        public IReadOnlyCollection<Fork> ForkFilterLists { get; private set; } = new HashSet<Fork>();
+        public IReadOnlyCollection<Merge> IncludedInFilterLists { get; private set; } = new HashSet<Merge>();
+        public IReadOnlyCollection<Merge> IncludesFilterLists { get; private set; } = new HashSet<Merge>();
+        public IReadOnlyCollection<Dependent> DependencyFilterLists { get; private set; } = new HashSet<Dependent>();
+        public IReadOnlyCollection<Dependent> DependentFilterLists { get; private set; } = new HashSet<Dependent>();
     }
 
     internal class FilterListTypeConfiguration<TEntity> : IEntityTypeConfiguration<TEntity> where TEntity : FilterList
diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Language.cs b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Language.cs
index c2f096450..c2f3fd04c 100644
--- a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Language.cs
+++ b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Language.cs
@@ -9,7 +9,7 @@ public class Language
     {
         public string Iso6391 { get; private set; } = null!;
         public string Name { get; private set; } = null!;
-        public ICollection<FilterListLanguage> FilterListLanguages { get; private set; } = new HashSet<FilterListLanguage>();
+        public IReadOnlyCollection<FilterListLanguage> FilterListLanguages { get; private set; } = new HashSet<FilterListLanguage>();
     }
 
     internal class LanguageTypeConfiguration<TEntity> : IEntityTypeConfiguration<TEntity>
diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/License.cs b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/License.cs
index 85c385e87..99fd72cc6 100644
--- a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/License.cs
+++ b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/License.cs
@@ -10,7 +10,7 @@ public class License
         public string Name { get; private set; } = null!;
         public string? GitHubKey { get; private set; }
         public Uri? Url { get; private set; }
-        public ICollection<FilterList> FilterLists { get; private set; } = new HashSet<FilterList>();
+        public IReadOnlyCollection<FilterList> FilterLists { get; private set; } = new HashSet<FilterList>();
     }
 
     internal class LicenseTypeConfiguration<TEntity> : IEntityTypeConfiguration<TEntity> where TEntity : License
diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Maintainer.cs b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Maintainer.cs
index f339be800..8b4e63f59 100644
--- a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Maintainer.cs
+++ b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Maintainer.cs
@@ -11,7 +11,7 @@ public class Maintainer
         public Uri? Url { get; private set; }
         public string? EmailAddress { get; private set; }
         public string? TwitterHandle { get; private set; }
-        public ICollection<FilterListMaintainer> FilterListMaintainers { get; private set; } = new HashSet<FilterListMaintainer>();
+        public IReadOnlyCollection<FilterListMaintainer> FilterListMaintainers { get; private set; } = new HashSet<FilterListMaintainer>();
     }
 
     internal class MaintainerTypeConfiguration<TEntity> : IEntityTypeConfiguration<TEntity> where TEntity : Maintainer
diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Software.cs b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Software.cs
index 504914d72..1aa624eca 100644
--- a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Software.cs
+++ b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Software.cs
@@ -12,7 +12,7 @@ public class Software
         public Uri? HomeUrl { get; private set; }
         public Uri? DownloadUrl { get; private set; }
         public bool SupportsAbpUrlScheme { get; private set; }
-        public ICollection<SoftwareSyntax> SoftwareSyntaxes { get; private set; } = new HashSet<SoftwareSyntax>();
+        public IReadOnlyCollection<SoftwareSyntax> SoftwareSyntaxes { get; private set; } = new HashSet<SoftwareSyntax>();
     }
 
     internal class SoftwareTypeConfiguration<TEntity> : IEntityTypeConfiguration<TEntity> where TEntity : Software
diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Syntax.cs b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Syntax.cs
index dc09c2b87..f68a5b009 100644
--- a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Syntax.cs
+++ b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Syntax.cs
@@ -10,8 +10,8 @@ public class Syntax
         public string Name { get; private set; } = null!;
         public string? Description { get; private set; }
         public Uri? Url { get; private set; }
-        public ICollection<FilterListSyntax> FilterListSyntaxes { get; private set; } = new HashSet<FilterListSyntax>();
-        public ICollection<SoftwareSyntax> SoftwareSyntaxes { get; private set; } = new HashSet<SoftwareSyntax>();
+        public IReadOnlyCollection<FilterListSyntax> FilterListSyntaxes { get; private set; } = new HashSet<FilterListSyntax>();
+        public IReadOnlyCollection<SoftwareSyntax> SoftwareSyntaxes { get; private set; } = new HashSet<SoftwareSyntax>();
     }
 
     internal class SyntaxTypeConfiguration<TEntity> : IEntityTypeConfiguration<TEntity> where TEntity : Syntax
diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Tag.cs b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Tag.cs
index 2ccb92425..d0ec56689 100644
--- a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Tag.cs
+++ b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Tag.cs
@@ -9,7 +9,7 @@ public class Tag
     {
         public string Name { get; private set; } = null!;
         public string? Description { get; private set; }
-        public ICollection<FilterListTag> FilterListTags { get; private set; } = new HashSet<FilterListTag>();
+        public IReadOnlyCollection<FilterListTag> FilterListTags { get; private set; } = new HashSet<FilterListTag>();
     }
 
     internal class TagTypeConfiguration<TEntity> : IEntityTypeConfiguration<TEntity> where TEntity : Tag