diff --git a/MAINTAINERS b/MAINTAINERS
index b857d13dc..b74cb28fd 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -11,7 +11,8 @@
 [Org]
 	[Org."Core maintainers"]
 		people = [
-			"shin-",
+			"aiordache",
+			"ulyssessouza",
 		]
 	[Org.Alumni]
 		people = [
@@ -20,6 +21,7 @@
 			"dnephin",
 			"mnowster",
 			"mpetazzoni",
+			"shin-",
 		]
 
 [people]
@@ -35,6 +37,11 @@
 	Email = "aanand@docker.com"
 	GitHub = "aanand"
 
+	[people.aiordache]
+	Name = "Anca Iordache"
+	Email = "anca.iordache@docker.com"
+	GitHub = "aiordache"
+
 	[people.bfirsh]
 	Name = "Ben Firshman"
 	Email = "b@fir.sh"
@@ -59,3 +66,8 @@
 	Name = "Joffrey F"
 	Email = "joffrey@docker.com"
 	GitHub = "shin-"
+
+	[people.ulyssessouza]
+	Name = "Ulysses Domiciano Souza"
+	Email = "ulysses.souza@docker.com"
+	GitHub = "ulyssessouza"
diff --git a/setup.py b/setup.py
index b692eabd8..ec1a51deb 100644
--- a/setup.py
+++ b/setup.py
@@ -80,6 +80,6 @@
         'Topic :: Utilities',
         'License :: OSI Approved :: Apache Software License',
     ],
-    maintainer='Joffrey F',
-    maintainer_email='joffrey@docker.com',
+    maintainer='Ulysses Souza',
+    maintainer_email='ulysses.souza@docker.com',
 )