diff --git a/CODEOWNERS b/CODEOWNERS
index 519d027..8c14a4f 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,2 +1,2 @@
 # SPDX-License-Identifier: MIT
-* @bavarianbidi @maigl
\ No newline at end of file
+* @bavarianbidi @maigl @rafalgalaw
\ No newline at end of file
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index 40a3255..4b3cbeb 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -3,9 +3,10 @@
 
 ## Maintainers
 
-| Maintainer      | Email                               | GitHub ID                                       | Affiliation                                                                                                              | Joined     |
-|-----------------|-------------------------------------|-------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------|------------|
-| Mario Constanti | <mario.constanti@mercedes-benz.com> | [bavarianbidi](https://github.com/bavarianbidi) | Mercedes-Benz Tech Innovation GmbH, [imprint](https://github.com/mercedes-benz/foss/blob/master/PROVIDER_INFORMATION.md) | 2023-07-27 |
-| Michael Kuhnt   | <michael.kuhnt@mercedes-benz.com>   | [maigl](https://github.com/maigl)               | Mercedes-Benz Tech Innovation GmbH, [imprint](https://github.com/mercedes-benz/foss/blob/master/PROVIDER_INFORMATION.md) | 2023-07-27 |
+| Maintainer       | Email                                | GitHub ID                                       | Affiliation                                                                                                              | Joined     |
+|------------------|--------------------------------------|-------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------|------------|
+| Mario Constanti  | <mario.constanti@mercedes-benz.com>  | [bavarianbidi](https://github.com/bavarianbidi) | Mercedes-Benz Tech Innovation GmbH, [imprint](https://github.com/mercedes-benz/foss/blob/master/PROVIDER_INFORMATION.md) | 2023-07-27 |
+| Michael Kuhnt    | <michael.kuhnt@mercedes-benz.com>    | [maigl](https://github.com/maigl)               | Mercedes-Benz Tech Innovation GmbH, [imprint](https://github.com/mercedes-benz/foss/blob/master/PROVIDER_INFORMATION.md) | 2023-07-27 |
+| Rafael Thalhofer | <rafael.thalhofer@mercedes-benz.com> | [rafalgalaw](https://github.com/rafalgalaw)     | Mercedes-Benz Tech Innovation GmbH, [imprint](https://github.com/mercedes-benz/foss/blob/master/PROVIDER_INFORMATION.md) | 2023-09-22 |
 
 > Please note to also update the [`CODEOWNERS`](CODEOWNERS) file.