diff --git a/GOVERNANCE.md b/GOVERNANCE.md
index 6126c53c65b..e047b78e8fe 100644
--- a/GOVERNANCE.md
+++ b/GOVERNANCE.md
@@ -80,7 +80,6 @@ The current team members are:
 - Emil Tullstedt ([Grafana Labs](https://grafana.com/))
 - Erik Sundell ([Grafana Labs](https://grafana.com/))
 - Fredrik Enestad ([Embark Studios](https://www.embark-studios.com/))
-- Hugo Häggmark ([Grafana Labs](https://grafana.com/))
 - Ivana Huckova ([Grafana Labs](https://grafana.com/))
 - Jeroen Op 't Eynde ([Grafana Labs](https://grafana.com/))
 - Jessica Müller ([Grafana Labs](https://grafana.com/))
diff --git a/HALL_OF_FAME.md b/HALL_OF_FAME.md
new file mode 100644
index 00000000000..18fd83f6c21
--- /dev/null
+++ b/HALL_OF_FAME.md
@@ -0,0 +1,5 @@
+# Hall of fame
+
+List of previous team members that have had a big impact on the company or the product and contributed during a long period of time.
+
+- Hugo Häggmark ([School of applied technology](https://salt.study))