diff --git a/data/tags.yml b/data/tags.yml
index 0a9783786..6c96673d7 100644
--- a/data/tags.yml
+++ b/data/tags.yml
@@ -238,6 +238,9 @@
 - name: PowerShell
   value: powershell
   type: language
+- name: Prometheus
+  value: prometheus
+  type: other
 - name: Protocol Buffers
   value: protobuf
   type: other
diff --git a/data/tools/promformat.yml b/data/tools/promformat.yml
new file mode 100644
index 000000000..6efc67bfc
--- /dev/null
+++ b/data/tools/promformat.yml
@@ -0,0 +1,12 @@
+name: promformat
+categories:
+  - formatter
+tags:
+  - prometheus
+license: GPL-3.0
+types:
+  - cli
+source: "https://github.com/facetoe/promformat"
+homepage: "https://github.com/facetoe/promformat"
+description: >-
+  Promformat is a PromQL formatter written in Python.
diff --git a/data/tools/promval.yml b/data/tools/promval.yml
new file mode 100644
index 000000000..6166a45f8
--- /dev/null
+++ b/data/tools/promval.yml
@@ -0,0 +1,13 @@
+name: promval
+categories:
+  - linter
+tags:
+  - prometheus
+license: MIT
+types:
+  - cli
+source: "https://github.com/facetoe/promval"
+homepage: "https://github.com/facetoe/promval"
+description: >-
+  PromQL validator written in Python.
+  It can be used to validate that PromQL expressions are written as expected.