diff --git a/MAINTAINERS b/MAINTAINERS
index a767391..1238d27 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -21,7 +21,7 @@
 
     Section entries are structured according to the following scheme:
 
-    X:  NAME <EMAIL_USERNAME@DOMAIN> <IRC_USERNAME!>
+    X:  NAME <EMAIL_USERNAME@DOMAIN> <DISCORD_USERNAME!>
     X:  ...
     .
     .
@@ -31,10 +31,10 @@
     organization; FILE_PATH is a file path within the repository, possibly with
     wildcards; X is a tag of one of the following types:
 
-    M:  Denotes maintainer; has fields NAME <EMAIL_USERNAME@DOMAIN> <IRC_USERNAME!>;
+    M:  Denotes maintainer; has fields NAME <EMAIL_USERNAME@DOMAIN> <DISCORD_USERNAME!>;
         if omitted from an entry, assume one of the maintainers from the
         MAINTAINERS entry.
-    R:  Denotes reviewer; has fields NAME <EMAIL_USERNAME@DOMAIN> <IRC_USERNAME!>;
+    R:  Denotes reviewer; has fields NAME <EMAIL_USERNAME@DOMAIN> <DISCORD_USERNAME!>;
         these people are to be added as reviewers for a change matching the repo
         path.
     F:  Denotes forked from an external repository; has fields URL.
@@ -49,7 +49,9 @@
 START OF MAINTAINERS LIST
 -------------------------
 
-M:  Adrian Ambrozewicz <adrian.ambrozewicz@linux.intel.com> <aambroze!>
-M:  Jozef Wludzik <jozef.wludzik@intel.com>
+M:  Adrian Ambrozewicz <adrian.ambrozewicz@linux.intel.com> <Adiq!>
 M:  Krzysztof Grobelny <krzysztof.grobelny@intel.com>
+M:  Szymon Dompke <szymon.dompke@intel.com>
+M:  Cezary Zwolak <cezary.zwolak@intel.com>
+R:  Jozef Wludzik <jozef.wludzik@intel.com>
 R:  Piotr Matuszczak <piotr.matuszczak@intel.com>
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..c8fcf75
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,6 @@
+owners:
+- adrian.ambrozewicz@linux.intel.com
+- jozef.wludzik@intel.com
+- szymon.dompke@intel.com
+- krzysztof.grobelny@intel.com
+- cezary.zwolak@intel.com