diff --git a/AUTHORS b/AUTHORS
index ffc96eb3c..1610ad827 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -11,3 +11,4 @@ Dino Wernli <dinowernli@gmail.com>
 Oscar Boykin <oscar.boykin@gmail.com>
 John T. Sullivan <john.t.sullivan@gmail.com>
 Andy Scott <andy.g.scott@gmail.com>
+Ittai Zeidman <ittaiz@gmail.com>
diff --git a/CODEOWNERS b/CODEOWNERS
index 35fc3e6a6..4c9a3f1db 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1 +1 @@
-* @ittaiz @liucijus
+* @liucijus @simuons
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index b08c0b31d..7e575a32a 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -21,3 +21,4 @@ Oscar Boykin <oscar.boykin@gmail.com>
 Justine Alexandra Roberts Tunney <jart@google.com>
 Natan Silnitsky <natans@wix.com>
 Nadav Wexler <nadavwe@wix.com>
+Ittai Zeidman <ittaiz@gmail.com>
diff --git a/Governance.md b/Governance.md
index bcdeae047..06d875cdf 100644
--- a/Governance.md
+++ b/Governance.md
@@ -54,9 +54,10 @@ Maintainers are selected by 2/3 or more approval of the current set of maintaine
 
 
 #### Current maintainers: (edit as needed)  
-Ittai Zeidman, @ittaiz   
 Vaidas Pilkauskas, @liucijus  
+Simonas Pinevičius, @simuons
 #### Past maintainers:  
 Oscar Boykin, @johnynek  
+Ittai Zeidman, @ittaiz