diff --git a/contrib/zfs/MAINTAINERS b/contrib/zfs/MAINTAINERS
index 90bc6e3d60..05fb572459 100644
--- a/contrib/zfs/MAINTAINERS
+++ b/contrib/zfs/MAINTAINERS
@@ -1 +1 @@
-Gurjeet Singh <gurjeet@singh.im> (gurjeet.singh.im)
+Gurjeet Singh <gurjeet@singh.im> (@gurjeet)
diff --git a/engine/MAINTAINERS b/engine/MAINTAINERS
index db33365bcd..aee10c8421 100644
--- a/engine/MAINTAINERS
+++ b/engine/MAINTAINERS
@@ -1 +1 @@
-Solomon Hykes <solomon@docker.com>
+Solomon Hykes <solomon@docker.com> (@shykes)
diff --git a/integration/MAINTAINERS b/integration/MAINTAINERS
index 2d47d7a711..d7bef621cf 100644
--- a/integration/MAINTAINERS
+++ b/integration/MAINTAINERS
@@ -1,4 +1,4 @@
-Solomon Hykes <s@docker.com>
+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!
diff --git a/pkg/beam/MAINTAINERS b/pkg/beam/MAINTAINERS
index db33365bcd..aee10c8421 100644
--- a/pkg/beam/MAINTAINERS
+++ b/pkg/beam/MAINTAINERS
@@ -1 +1 @@
-Solomon Hykes <solomon@docker.com>
+Solomon Hykes <solomon@docker.com> (@shykes)
diff --git a/pkg/dockerscript/MAINTAINERS b/pkg/dockerscript/MAINTAINERS
index db33365bcd..aee10c8421 100644
--- a/pkg/dockerscript/MAINTAINERS
+++ b/pkg/dockerscript/MAINTAINERS
@@ -1 +1 @@
-Solomon Hykes <solomon@docker.com>
+Solomon Hykes <solomon@docker.com> (@shykes)
diff --git a/pkg/signal/MAINTAINERS b/pkg/signal/MAINTAINERS
index 3300331598..acf6f21b63 100644
--- a/pkg/signal/MAINTAINERS
+++ b/pkg/signal/MAINTAINERS
@@ -1,2 +1 @@
 Guillaume J. Charmes <guillaume@docker.com> (@creack)
-
diff --git a/server/MAINTAINERS b/server/MAINTAINERS
index db33365bcd..aee10c8421 100644
--- a/server/MAINTAINERS
+++ b/server/MAINTAINERS
@@ -1 +1 @@
-Solomon Hykes <solomon@docker.com>
+Solomon Hykes <solomon@docker.com> (@shykes)