diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index a4a6f1d2..210f6a48 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1 @@
-* @idanl21 @ido-opster @dbason @swoehrl-mw @prudhvigodithi
\ No newline at end of file
+* @idanl21 @ido-opster @dbason @swoehrl-mw @prudhvigodithi @jochenkressin @pchmielnik @salyh
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index 7b9f4dd3..c00a9a59 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -1,12 +1,15 @@
 # Maintainers
 
-| Maintainer | GitHub ID | Affiliation |
-| --------------- | --------- | ----------- |
-| Idan Levy | [idanl21](https://github.com/idanl21) | Opster |
-| Ido | [ido-opster](https://github.com/ido-opster) | Opster |
-| Dan Bason | [dbason](https://github.com/dbason) | SUSE |
+| Maintainer | GitHub ID | Affiliation  |
+| --------------- | --------- |--------------|
+| Idan Levy | [idanl21](https://github.com/idanl21) | Opster       |
+| Ido | [ido-opster](https://github.com/ido-opster) | Opster       |
+| Dan Bason | [dbason](https://github.com/dbason) | SUSE         |
 | Sebastian Woehrl | [swoehrl-mw](https://github.com/swoehrl-mw) | MaibornWolff |
-| Prudhvi Godithi | [prudhvigodithi](https://github.com/prudhvigodithi) | Amazon |
+| Prudhvi Godithi | [prudhvigodithi](https://github.com/prudhvigodithi) | Amazon       |
+| Jochen Kressin | [jochenkressin](https://github.com/jochenkressin) | Eliatra      |
+| Piotr Chmielnik | [pchmielnik](https://github.com/pchmielnik) | Eliatra       |
+| Hendrik Saly | [salyh](https://github.com/salyh) | Eliatra       |
 
 The following sections explain what maintainers do in this repo, and how they should be doing it. If you're interested in contributing, see [CONTRIBUTING](CONTRIBUTING.md).