diff --git a/CODEOWNERS b/CODEOWNERS
new file mode 100644
index 00000000..fc1b0bd7
--- /dev/null
+++ b/CODEOWNERS
@@ -0,0 +1,2 @@
+# global owners
+*        @CyberDem0n @hughcapet
diff --git a/MAINTAINERS b/MAINTAINERS
index fbe0251f..595dbe34 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1,3 +1,2 @@
-Alexander Kukushkin <alexander.kukushkin@zalando.de>
-Feike Steenbergen <feike.steenbergen@zalando.de>
-Oleksii Kliukin <oleksii.kliukin@zalando.de>
+Alexander Kukushkin <akukushkin@microsoft.com>
+Polina Bungina <polina.bungina@zalando.de>
diff --git a/setup.py b/setup.py
index d5129854..dd4bc75a 100644
--- a/setup.py
+++ b/setup.py
@@ -18,8 +18,8 @@ MAIN_PACKAGE = NAME
 DESCRIPTION = 'PostgreSQL High-Available orchestrator and CLI'
 LICENSE = 'The MIT License'
 URL = 'https://github.com/zalando/patroni'
-AUTHOR = 'Alexander Kukushkin, Dmitrii Dolgov, Oleksii Kliukin'
-AUTHOR_EMAIL = 'alexander.kukushkin@zalando.de, dmitrii.dolgov@zalando.de, alexk@hintbits.com'
+AUTHOR = 'Alexander Kukushkin, Polina Bungina'
+AUTHOR_EMAIL = 'akukushkin@microsoft.com, polina.bungina@zalando.de'
 KEYWORDS = 'etcd governor patroni postgresql postgres ha haproxy confd' +\
     ' zookeeper exhibitor consul streaming replication kubernetes k8s'