diff --git a/.editorconfig b/.editorconfig
index 68eb1c950c6..59553a55eee 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -319,6 +319,8 @@ dotnet_diagnostic.RCS1214.severity = warning
 dotnet_diagnostic.RCS1217.severity = warning
 # Unused element in a documentation comment.
 dotnet_diagnostic.RCS1228.severity = warning
+# Fix documentation comment tag.
+dotnet_diagnostic.RCS1247.severity = warning
 # Unnecessary null-forgiving operator.
 dotnet_diagnostic.RCS1249.severity = warning
 # Remove unnecessary braces.
diff --git a/src/HotChocolate/ApolloFederation/src/ApolloFederation/Types/Policy.cs b/src/HotChocolate/ApolloFederation/src/ApolloFederation/Types/Policy.cs
index e02617ba2fd..62bcd4a77ae 100644
--- a/src/HotChocolate/ApolloFederation/src/ApolloFederation/Types/Policy.cs
+++ b/src/HotChocolate/ApolloFederation/src/ApolloFederation/Types/Policy.cs
@@ -1,7 +1,7 @@
 namespace HotChocolate.ApolloFederation.Types;
 
 /// <summary>
-/// Scalar <code>Policy</code> representation.
+/// Scalar <c>Policy</c> representation.
 /// </summary>
 public readonly record struct Policy
 {
diff --git a/src/HotChocolate/ApolloFederation/src/ApolloFederation/Types/PolicyType.cs b/src/HotChocolate/ApolloFederation/src/ApolloFederation/Types/PolicyType.cs
index e6aeb5f76cf..7b2ee8a8dfa 100644
--- a/src/HotChocolate/ApolloFederation/src/ApolloFederation/Types/PolicyType.cs
+++ b/src/HotChocolate/ApolloFederation/src/ApolloFederation/Types/PolicyType.cs
@@ -7,7 +7,7 @@
 namespace HotChocolate.ApolloFederation.Types;
 
 /// <summary>
-/// The <code>Policy</code> scalar representing an authorization policy. Serializes as a string.
+/// The <c>Policy</c> scalar representing an authorization policy. Serializes as a string.
 /// </summary>
 public sealed class PolicyType : ScalarType<Policy, StringValueNode>
 {
diff --git a/src/HotChocolate/ApolloFederation/src/ApolloFederation/Types/Scope.cs b/src/HotChocolate/ApolloFederation/src/ApolloFederation/Types/Scope.cs
index 3b0dffdf734..5031c392d58 100644
--- a/src/HotChocolate/ApolloFederation/src/ApolloFederation/Types/Scope.cs
+++ b/src/HotChocolate/ApolloFederation/src/ApolloFederation/Types/Scope.cs
@@ -1,7 +1,7 @@
 namespace HotChocolate.ApolloFederation.Types;
 
 /// <summary>
-/// Scalar <code>Scope</code> representation.
+/// Scalar <c>Scope</c> representation.
 /// </summary>
 public readonly record struct Scope
 {
diff --git a/src/HotChocolate/ApolloFederation/src/ApolloFederation/Types/ScopeType.cs b/src/HotChocolate/ApolloFederation/src/ApolloFederation/Types/ScopeType.cs
index 6a034d6a1fa..642c3a10f32 100644
--- a/src/HotChocolate/ApolloFederation/src/ApolloFederation/Types/ScopeType.cs
+++ b/src/HotChocolate/ApolloFederation/src/ApolloFederation/Types/ScopeType.cs
@@ -7,7 +7,7 @@
 namespace HotChocolate.ApolloFederation.Types;
 
 /// <summary>
-/// The <code>Scope</code> scalar representing a JWT scope. Serializes as a string.
+/// The <c>Scope</c> scalar representing a JWT scope. Serializes as a string.
 /// </summary>
 public sealed class ScopeType : ScalarType<Scope, StringValueNode>
 {
diff --git a/src/HotChocolate/Core/src/Subscriptions.Nats/DependencyInjection/NatsPubSubExtensions.cs b/src/HotChocolate/Core/src/Subscriptions.Nats/DependencyInjection/NatsPubSubExtensions.cs
index f1bd6b061fb..3369be1e742 100644
--- a/src/HotChocolate/Core/src/Subscriptions.Nats/DependencyInjection/NatsPubSubExtensions.cs
+++ b/src/HotChocolate/Core/src/Subscriptions.Nats/DependencyInjection/NatsPubSubExtensions.cs
@@ -14,7 +14,7 @@ public static class NatsPubSubExtensions
 {
     /// <summary>
     /// Adds support for using NATS as a subscription provider.
-    /// Ensure you have configured the NATS client using <code>AddNatsClient(...)</code>
+    /// Ensure you have configured the NATS client using <c>AddNatsClient(...)</c>
     /// before calling this method.
     /// </summary>
     /// <param name="builder">
diff --git a/src/HotChocolate/Core/src/Types.Mutations/MutationConventionOptions.cs b/src/HotChocolate/Core/src/Types.Mutations/MutationConventionOptions.cs
index 7bf2379930d..7c06e1d2424 100644
--- a/src/HotChocolate/Core/src/Types.Mutations/MutationConventionOptions.cs
+++ b/src/HotChocolate/Core/src/Types.Mutations/MutationConventionOptions.cs
@@ -10,7 +10,7 @@ public struct MutationConventionOptions
     /// <summary>
     /// Specifies a name pattern for the input type name of a mutation.
     /// The pattern is specified like the following:
-    /// <code>"{MutationName}Input"</code>
+    /// <c>"{MutationName}Input"</c>
     ///
     /// <code>
     /// type Mutation {
@@ -43,7 +43,7 @@ public struct MutationConventionOptions
     /// <summary>
     /// Specifies a name pattern for the payload type name of a mutation.
     /// The pattern is specified like the following:
-    /// <code>"{MutationName}Payload"</code>
+    /// <c>"{MutationName}Payload"</c>
     ///
     /// <code>
     /// type Mutation {
@@ -61,7 +61,7 @@ public struct MutationConventionOptions
     /// <summary>
     /// Specifies a name pattern for the error union type name of a mutation.
     /// The pattern is specified like the following:
-    /// <code>"{MutationName}Error"</code>
+    /// <c>"{MutationName}Error"</c>
     ///
     /// <code>
     /// type Mutation {