diff --git a/services/.editorconfig b/services/.editorconfig
index 79fe8b9e9..e71640ae5 100644
--- a/services/.editorconfig
+++ b/services/.editorconfig
@@ -7,6 +7,15 @@ root = true
 # All files
 [*]
 indent_style = space
+
+# XML project files
+[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}]
+indent_size = 2
+
+# XML config files
+[*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct}]
+indent_size = 2
+
 # Code files
 [*.{cs,csx,vb,vbx}]
 indent_size = 4
@@ -124,9 +133,9 @@ csharp_preserve_single_line_blocks = true
 # Modifier preferences
 visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public,Friend,NotOverridable,Overridable,MustOverride,Overloads,Overrides,MustInherit,NotInheritable,Static,Shared,Shadows,ReadOnly,WriteOnly,Dim,Const,WithEvents,Widening,Narrowing,Custom,Async:suggestion
 
-
-# FilterLists Services custom pairs
+# FilterLists custom
 [*.cs]
-dotnet_diagnostic.CA1062.severity = suggestion
-dotnet_diagnostic.CA1812.severity = suggestion
-dotnet_diagnostic.CA2007.severity = none
\ No newline at end of file
+dotnet_diagnostic.CS1591.severity = silent
+
+#https://github.com/JosefPihrt/Roslynator/blob/master/docs/Options.md
+roslynator.RCS1090.invert = true
\ No newline at end of file
diff --git a/services/Archival/FilterLists.Archival.Api/.editorconfig b/services/Archival/FilterLists.Archival.Api/.editorconfig
deleted file mode 100644
index bbc524b6f..000000000
--- a/services/Archival/FilterLists.Archival.Api/.editorconfig
+++ /dev/null
@@ -1,4 +0,0 @@
-# To learn more about .editorconfig see https://aka.ms/editorconfigdocs
-
-[*.cs]
-dotnet_diagnostic.CS1591.severity = suggestion
\ No newline at end of file
diff --git a/services/Archival/FilterLists.Archival.Api/Controllers/PingController.cs b/services/Archival/FilterLists.Archival.Api/Controllers/PingController.cs
index 75555eba7..10f008b01 100644
--- a/services/Archival/FilterLists.Archival.Api/Controllers/PingController.cs
+++ b/services/Archival/FilterLists.Archival.Api/Controllers/PingController.cs
@@ -14,9 +14,7 @@ public class PingController : ControllerBase
         /// <returns>Pong.</returns>
         [HttpGet]
         [ProducesResponseType(typeof(string), StatusCodes.Status200OK)]
-#pragma warning disable CA1822 // Mark members as static
         public ActionResult<string> Ping()
-#pragma warning restore CA1822 // Mark members as static
         {
             return "pong";
         }
diff --git a/services/Archival/FilterLists.Archival.Application/.editorconfig b/services/Archival/FilterLists.Archival.Application/.editorconfig
deleted file mode 100644
index db21036ca..000000000
--- a/services/Archival/FilterLists.Archival.Application/.editorconfig
+++ /dev/null
@@ -1,5 +0,0 @@
-# To learn more about .editorconfig see https://aka.ms/editorconfigdocs
-
-[*.cs]
-dotnet_diagnostic.CA1034.severity = suggestion
-dotnet_diagnostic.CA1724.severity = suggestion
\ No newline at end of file
diff --git a/services/Archival/FilterLists.Archival.Domain/Extensions/UriExtension.cs b/services/Archival/FilterLists.Archival.Domain/Extensions/UriExtension.cs
index 5f7cc3d96..ae8c5e971 100644
--- a/services/Archival/FilterLists.Archival.Domain/Extensions/UriExtension.cs
+++ b/services/Archival/FilterLists.Archival.Domain/Extensions/UriExtension.cs
@@ -5,7 +5,7 @@ namespace FilterLists.Archival.Domain.Extensions
 {
     internal static class UriExtension
     {
-        private static readonly Uri DummyBaseUri = new Uri("http://localhost");
+        private static readonly Uri DummyBaseUri = new("http://localhost");
 
         public static string GetFileExtension(this Uri uri)
         {
diff --git a/services/Archival/azure-pipelines.api.yaml b/services/Archival/azure-pipelines.api.yaml
index 6e8ad2a7c..49ff554de 100644
--- a/services/Archival/azure-pipelines.api.yaml
+++ b/services/Archival/azure-pipelines.api.yaml
@@ -12,6 +12,7 @@ trigger:
         services/Archival/FilterLists.Archival.Infrastructure/*,
         services/Archival/FilterLists.Archival.Application/*,
         services/Archival/FilterLists.Archival.Api/*,
+        services/.editorignore,
         services/.dockerignore,
         docker-compose/docker-compose.yml,
         docker-compose/docker-compose.prod.yml,
@@ -34,6 +35,7 @@ pr:
         services/Archival/FilterLists.Archival.Infrastructure/*,
         services/Archival/FilterLists.Archival.Application/*,
         services/Archival/FilterLists.Archival.Api/*,
+        services/.editorignore,
         services/.dockerignore,
         docker-compose/docker-compose.yml,
         docker-compose/docker-compose.prod.yml,
diff --git a/services/Directory/FilterLists.Directory.Api/.editorconfig b/services/Directory/FilterLists.Directory.Api/.editorconfig
deleted file mode 100644
index bbc524b6f..000000000
--- a/services/Directory/FilterLists.Directory.Api/.editorconfig
+++ /dev/null
@@ -1,4 +0,0 @@
-# To learn more about .editorconfig see https://aka.ms/editorconfigdocs
-
-[*.cs]
-dotnet_diagnostic.CS1591.severity = suggestion
\ No newline at end of file
diff --git a/services/Directory/FilterLists.Directory.Application/.editorconfig b/services/Directory/FilterLists.Directory.Application/.editorconfig
deleted file mode 100644
index db21036ca..000000000
--- a/services/Directory/FilterLists.Directory.Application/.editorconfig
+++ /dev/null
@@ -1,5 +0,0 @@
-# To learn more about .editorconfig see https://aka.ms/editorconfigdocs
-
-[*.cs]
-dotnet_diagnostic.CA1034.severity = suggestion
-dotnet_diagnostic.CA1724.severity = suggestion
\ No newline at end of file
diff --git a/services/Directory/FilterLists.Directory.Infrastructure.Migrations.Tests/.editorconfig b/services/Directory/FilterLists.Directory.Infrastructure.Migrations.Tests/.editorconfig
deleted file mode 100644
index 6e1fa0dd2..000000000
--- a/services/Directory/FilterLists.Directory.Infrastructure.Migrations.Tests/.editorconfig
+++ /dev/null
@@ -1,4 +0,0 @@
-# To learn more about .editorconfig see https://aka.ms/editorconfigdocs
-
-[*.cs]
-dotnet_diagnostic.CA1707.severity = suggestion
\ No newline at end of file
diff --git a/services/Directory/FilterLists.Directory.Infrastructure.Migrations/.editorconfig b/services/Directory/FilterLists.Directory.Infrastructure.Migrations/.editorconfig
index 200712ce2..67b5fa6c9 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure.Migrations/.editorconfig
+++ b/services/Directory/FilterLists.Directory.Infrastructure.Migrations/.editorconfig
@@ -1,4 +1,4 @@
 # To learn more about .editorconfig see https://aka.ms/editorconfigdocs
 
 [*.cs]
-dotnet_diagnostic.CS8625.severity = suggestion
\ No newline at end of file
+dotnet_diagnostic.CS8625.severity = silent
\ No newline at end of file
diff --git a/services/Directory/azure-pipelines.api.yaml b/services/Directory/azure-pipelines.api.yaml
index 6195c209c..75fb863d2 100644
--- a/services/Directory/azure-pipelines.api.yaml
+++ b/services/Directory/azure-pipelines.api.yaml
@@ -12,6 +12,7 @@ trigger:
         services/Directory/FilterLists.Directory.Api.Contracts/*,
         services/Directory/FilterLists.Directory.Application/*,
         services/Directory/FilterLists.Directory.Api/*,
+        services/.editorignore,
         services/.dockerignore,
         docker-compose/docker-compose.yml,
         docker-compose/docker-compose.prod.yml,
@@ -35,6 +36,7 @@ pr:
         services/Directory/FilterLists.Directory.Api.Contracts/*,
         services/Directory/FilterLists.Directory.Application/*,
         services/Directory/FilterLists.Directory.Api/*,
+        services/.editorignore,
         services/.dockerignore,
         docker-compose/docker-compose.yml,
         docker-compose/docker-compose.prod.yml,