diff --git a/archive/MAINTAINERS b/archive/MAINTAINERS
index 1e998f8ac..43ec1d150 100644
--- a/archive/MAINTAINERS
+++ b/archive/MAINTAINERS
@@ -1 +1,2 @@
 Michael Crosby <michael@crosbymichael.com> (@crosbymichael)
+Tibor Vass <teabee89@gmail.com> (@tiborvass)
diff --git a/hack/MAINTAINERS b/hack/MAINTAINERS
index 299d9a14a..5bc02cd42 100644
--- a/hack/MAINTAINERS
+++ b/hack/MAINTAINERS
@@ -1,2 +1,3 @@
 Tianon Gravi <admwiggin@gmail.com> (@tianon)
+Tibor Vass <teabee89@gmail.com> (@tiborvass)
 dind: Jerome Petazzoni <jerome@docker.com> (@jpetazzo)
diff --git a/integration/MAINTAINERS b/integration/MAINTAINERS
index d7bef621c..4d803a11a 100644
--- a/integration/MAINTAINERS
+++ b/integration/MAINTAINERS
@@ -1,4 +1 @@
-Solomon Hykes <s@docker.com> (@shykes)
-# WE ARE LOOKING FOR VOLUNTEERS TO HELP CLEAN THIS UP.
-# TO VOLUNTEER PLEASE OPEN A PULL REQUEST ADDING YOURSELF TO THIS FILE.
-# WE WILL HELP YOU GET STARTED. THANKS!
+Tibor Vass <teabee89@gmail.com> (@tiborvass)
diff --git a/server/MAINTAINERS b/server/MAINTAINERS
index e35518a6d..c00f91652 100644
--- a/server/MAINTAINERS
+++ b/server/MAINTAINERS
@@ -1,2 +1,3 @@
 Solomon Hykes <solomon@docker.com> (@shykes)
 Victor Vieux <vieux@docker.com> (@vieux)
+buildfile.go: Tibor Vass <teabee89@gmail.com> (@tiborvass)