diff --git a/common/include/villas/kernel/vfio_container.hpp b/common/include/villas/kernel/vfio_container.hpp
index 1b27b86ca..9d9ad2bc7 100644
--- a/common/include/villas/kernel/vfio_container.hpp
+++ b/common/include/villas/kernel/vfio_container.hpp
@@ -3,9 +3,9 @@
  * Author: Niklas Eiling <niklas.eiling@eonerc.rwth-aachen.de>
  * Author: Steffen Vogel <post@steffenvogel.de>
  * Author: Daniel Krebs <github@daniel-krebs.net>
- * SPDX-FileCopyrightText: 2022-2023 Niklas Eiling
- * SPDX-FileCopyrightText: 2014-2023 Steffen Vogel
- * SPDX-FileCopyrightText: 2018 Daniel Krebs
+ * SPDX-FileCopyrightText: 2022-2023 Niklas Eiling <niklas.eiling@eonerc.rwth-aachen.de>
+ * SPDX-FileCopyrightText: 2014-2023 Steffen Vogel <post@steffenvogel.de>
+ * SPDX-FileCopyrightText: 2018 Daniel Krebs <github@daniel-krebs.net>
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/common/include/villas/kernel/vfio_device.hpp b/common/include/villas/kernel/vfio_device.hpp
index 35569808a..03a2fcada 100644
--- a/common/include/villas/kernel/vfio_device.hpp
+++ b/common/include/villas/kernel/vfio_device.hpp
@@ -3,9 +3,9 @@
  * Author: Niklas Eiling <niklas.eiling@eonerc.rwth-aachen.de>
  * Author: Steffen Vogel <post@steffenvogel.de>
  * Author: Daniel Krebs <github@daniel-krebs.net>
- * SPDX-FileCopyrightText: 2022-2023 Niklas Eiling
- * SPDX-FileCopyrightText: 2014-2023 Steffen Vogel
- * SPDX-FileCopyrightText: 2018 Daniel Krebs
+ * SPDX-FileCopyrightText: 2022-2023 Niklas Eiling <niklas.eiling@eonerc.rwth-aachen.de>
+ * SPDX-FileCopyrightText: 2014-2023 Steffen Vogel <post@steffenvogel.de>
+ * SPDX-FileCopyrightText: 2018 Daniel Krebs <github@daniel-krebs.net>
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/common/include/villas/kernel/vfio_group.hpp b/common/include/villas/kernel/vfio_group.hpp
index d5a342d80..66c9340e3 100644
--- a/common/include/villas/kernel/vfio_group.hpp
+++ b/common/include/villas/kernel/vfio_group.hpp
@@ -3,9 +3,9 @@
  * Author: Niklas Eiling <niklas.eiling@eonerc.rwth-aachen.de>
  * Author: Steffen Vogel <post@steffenvogel.de>
  * Author: Daniel Krebs <github@daniel-krebs.net>
- * SPDX-FileCopyrightText: 2022-2023 Niklas Eiling
- * SPDX-FileCopyrightText: 2014-2023 Steffen Vogel
- * SPDX-FileCopyrightText: 2018 Daniel Krebs
+ * SPDX-FileCopyrightText: 2022-2023 Niklas Eiling <niklas.eiling@eonerc.rwth-aachen.de>
+ * SPDX-FileCopyrightText: 2014-2023 Steffen Vogel <post@steffenvogel.de>
+ * SPDX-FileCopyrightText: 2018 Daniel Krebs <github@daniel-krebs.net>
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/common/lib/kernel/vfio_container.cpp b/common/lib/kernel/vfio_container.cpp
index f97cd3643..f0259b9ac 100644
--- a/common/lib/kernel/vfio_container.cpp
+++ b/common/lib/kernel/vfio_container.cpp
@@ -2,8 +2,8 @@
  *
  * Author: Steffen Vogel <post@steffenvogel.de>
  * Author: Daniel Krebs <github@daniel-krebs.net>
- * SPDX-FileCopyrightText: 2014-2021 Steffen Vogel
- * SPDX-FileCopyrightText: 2018 Daniel Krebs
+ * SPDX-FileCopyrightText: 2014-2021 Steffen Vogel <post@steffenvogel.de>
+ * SPDX-FileCopyrightText: 2018 Daniel Krebs <github@daniel-krebs.net>
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/common/lib/kernel/vfio_device.cpp b/common/lib/kernel/vfio_device.cpp
index a0b83ecd3..b8f7ecd54 100644
--- a/common/lib/kernel/vfio_device.cpp
+++ b/common/lib/kernel/vfio_device.cpp
@@ -3,9 +3,9 @@
  * Author: Niklas Eiling <niklas.eiling@eonerc.rwth-aachen.de>
  * Author: Steffen Vogel <post@steffenvogel.de>
  * Author: Daniel Krebs <github@daniel-krebs.net>
- * SPDX-FileCopyrightText: 2022-2023 Niklas Eiling
- * SPDX-FileCopyrightText: 2014-2023 Steffen Vogel
- * SPDX-FileCopyrightText: 2018 Daniel Krebs
+ * SPDX-FileCopyrightText: 2022-2023 Niklas Eiling <niklas.eiling@eonerc.rwth-aachen.de>
+ * SPDX-FileCopyrightText: 2014-2023 Steffen Vogel <post@steffenvogel.de>
+ * SPDX-FileCopyrightText: 2018 Daniel Krebs <github@daniel-krebs.net>
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/common/lib/kernel/vfio_group.cpp b/common/lib/kernel/vfio_group.cpp
index 60d1cc3b0..fdbdb7dd9 100644
--- a/common/lib/kernel/vfio_group.cpp
+++ b/common/lib/kernel/vfio_group.cpp
@@ -2,8 +2,8 @@
  *
  * Author: Steffen Vogel <post@steffenvogel.de>
  * Author: Daniel Krebs <github@daniel-krebs.net>
- * SPDX-FileCopyrightText: 2014-2021 Steffen Vogel
- * SPDX-FileCopyrightText: 2018 Daniel Krebs
+ * SPDX-FileCopyrightText: 2014-2021 Steffen Vogel <post@steffenvogel.de>
+ * SPDX-FileCopyrightText: 2018 Daniel Krebs <github@daniel-krebs.net>
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/common/tests/unit/graph.cpp b/common/tests/unit/graph.cpp
index fbf503076..69ffa9e69 100644
--- a/common/tests/unit/graph.cpp
+++ b/common/tests/unit/graph.cpp
@@ -1,7 +1,7 @@
 /* Graph unit test.
  *
  * Author: Steffen Vogel <post@steffenvogel.de>
- * SPDX-FileCopyrightText: 2014-2021 Steffen Vogel
+ * SPDX-FileCopyrightText: 2014-2021 Steffen Vogel <post@steffenvogel.de>
  * SPDX-License-Identifier: Apache-2.0
  */