diff --git a/csharp/ql/src/Diagnostics/CompilerError.ql b/csharp/ql/src/Diagnostics/CompilerError.ql
index 11c89b89e53..1a3c2c6db49 100644
--- a/csharp/ql/src/Diagnostics/CompilerError.ql
+++ b/csharp/ql/src/Diagnostics/CompilerError.ql
@@ -1,9 +1,7 @@
 /**
  * @name Compilation error
  * @description A compilation error can cause extraction problems, and could lead to inaccurate results.
- * @kind problem
- * @problem.severity recommendation
- * @precision high
+ * @kind diagnostic
  * @id cs/compilation-error
  * @tags internal non-attributable
  */
diff --git a/csharp/ql/src/Diagnostics/CompilerMessage.ql b/csharp/ql/src/Diagnostics/CompilerMessage.ql
index bf160fa94cc..2a974f4367f 100644
--- a/csharp/ql/src/Diagnostics/CompilerMessage.ql
+++ b/csharp/ql/src/Diagnostics/CompilerMessage.ql
@@ -1,9 +1,7 @@
 /**
  * @name Compilation message
  * @description A message emitted by the compiler, including warnings and errors.
- * @kind problem
- * @problem.severity recommendation
- * @precision high
+ * @kind diagnostic
  * @id cs/compilation-message
  * @tags internal non-attributable
  */
diff --git a/csharp/ql/src/Diagnostics/ExtractorError.ql b/csharp/ql/src/Diagnostics/ExtractorError.ql
index 1711792b520..b98dbd373ba 100644
--- a/csharp/ql/src/Diagnostics/ExtractorError.ql
+++ b/csharp/ql/src/Diagnostics/ExtractorError.ql
@@ -3,9 +3,7 @@
  * @description An error message reported by the extractor, limited to those files where there are no
  *              compilation errors. This indicates a bug or limitation in the extractor, and could lead
  *              to inaccurate results.
- * @kind problem
- * @problem.severity recommendation
- * @precision high
+ * @kind diagnostic
  * @id cs/extraction-error
  * @tags internal non-attributable
  */
diff --git a/csharp/ql/src/Diagnostics/ExtractorMessage.ql b/csharp/ql/src/Diagnostics/ExtractorMessage.ql
index 882b7ef89d5..4a3cb728d11 100644
--- a/csharp/ql/src/Diagnostics/ExtractorMessage.ql
+++ b/csharp/ql/src/Diagnostics/ExtractorMessage.ql
@@ -1,9 +1,7 @@
 /**
  * @name Extraction message
  * @description An error message reported by the extractor. This could lead to inaccurate results.
- * @kind problem
- * @problem.severity recommendation
- * @precision high
+ * @kind diagnostic
  * @id cs/extraction-message
  * @tags internal non-attributable
  */
diff --git a/csharp/ql/src/change-notes/2022-06-15-diagnostic-query-metadata.md b/csharp/ql/src/change-notes/2022-06-15-diagnostic-query-metadata.md
new file mode 100644
index 00000000000..d5cfc4d35e1
--- /dev/null
+++ b/csharp/ql/src/change-notes/2022-06-15-diagnostic-query-metadata.md
@@ -0,0 +1,4 @@
+---
+category: queryMetadata
+---
+* The `kind` query metadata was changed to `diagnostic` on `cs/compilation-error`, `cs/compilation-message`, `cs/extraction-error`, and `cs/extraction-message`.