diff --git a/common/CODEOWNERS b/common/CODEOWNERS
index dd4e75d94..46060640f 100644
--- a/common/CODEOWNERS
+++ b/common/CODEOWNERS
@@ -1,4 +1,5 @@
-# SPDX-FileCopyrightText: 2014-2023 Institute for Automation of Complex Power Systems, RWTH Aachen University
+# Author: Niklas Eiling <niklas.eiling@eonerc.rwth-aachen.de>
+# SPDX-FileCopyrightText: 2023 Niklas Eiling <niklas.eiling@eonerc.rwth-aachen.de>
 # SPDX-License-Identifier: Apache-2.0
 
 # These owners will be the default owners for everything in
diff --git a/common/lib/kernel/pci.cpp b/common/lib/kernel/pci.cpp
index f76e51938..b0fd260fe 100644
--- a/common/lib/kernel/pci.cpp
+++ b/common/lib/kernel/pci.cpp
@@ -1,7 +1,9 @@
 /* Linux PCI helpers.
  *
  * Author: Steffen Vogel <post@steffenvogel.de>
+ * Author: Niklas Eiling <niklas.eiling@eonerc.rwth-aachen.de>
  * SPDX-FileCopyrightText: 2014-2023 Institute for Automation of Complex Power Systems, RWTH Aachen University
+ * SPDX-FileCopyrightText: 2022-2023 Niklas Eiling <niklas.eiling@eonerc.rwth-aachen.de>
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/common/lib/kernel/vfio_container.cpp b/common/lib/kernel/vfio_container.cpp
index 25ad9a143..79a101aaf 100644
--- a/common/lib/kernel/vfio_container.cpp
+++ b/common/lib/kernel/vfio_container.cpp
@@ -2,8 +2,10 @@
  *
  * Author: Steffen Vogel <post@steffenvogel.de>
  * Author: Daniel Krebs <github@daniel-krebs.net>
+ * Author: Niklas Eiling <niklas.eiling@eonerc.rwth-aachen.de>
  * SPDX-FileCopyrightText: 2014-2021 Steffen Vogel <post@steffenvogel.de>
  * SPDX-FileCopyrightText: 2018 Daniel Krebs <github@daniel-krebs.net>
+ * SPDX-FileCopyrightText: 2022-2023 Niklas Eiling <niklas.eiling@eonerc.rwth-aachen.de>
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/common/lib/kernel/vfio_group.cpp b/common/lib/kernel/vfio_group.cpp
index 68fadad0d..aae4781e9 100644
--- a/common/lib/kernel/vfio_group.cpp
+++ b/common/lib/kernel/vfio_group.cpp
@@ -2,8 +2,10 @@
  *
  * Author: Steffen Vogel <post@steffenvogel.de>
  * Author: Daniel Krebs <github@daniel-krebs.net>
+ * Author: Niklas Eiling <niklas.eiling@eonerc.rwth-aachen.de>
  * SPDX-FileCopyrightText: 2014-2021 Steffen Vogel <post@steffenvogel.de>
  * SPDX-FileCopyrightText: 2018 Daniel Krebs <github@daniel-krebs.net>
+ * SPDX-FileCopyrightText: 2022-2023 Niklas Eiling <niklas.eiling@eonerc.rwth-aachen.de>
  * SPDX-License-Identifier: Apache-2.0
  */