diff --git a/AUTHORS.md b/AUTHORS.md
index 8e6d64c..32af75d 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -8,7 +8,7 @@ provided substantial additions or modifications. Together, these two groups form
 
 ## Principal Developers
 
-- [Michael Schlottke-Lakemper](https://lakemper.eu)
+- [Michael Schlottke-Lakemper](https://www.uni-augsburg.de/fakultaet/mntf/math/prof/hpsc)
 - [Hendrik Ranocha](https://ranocha.de)
 - [Joshua Lampert](https://github.com/JoshuaLampert)
 
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 6666133..99aa29a 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -61,7 +61,7 @@ representative at an online or offline event.
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported to
 [Joshua Lampert](mailto:joshua.lampert@uni-hamburg.de),
-[Michael Schlottke-Lakemper](mailto:m.schlottke-lakemper@acom.rwth-aachen.de),
+[Michael Schlottke-Lakemper](mailto:michael.schlottke-lakemper@uni-a.de),
 [Hendrik Ranocha](mailto:mail@ranocha.de),
 or any other of the principal developers responsible for enforcement listed in
 [AUTHORS.md](AUTHORS.md).
diff --git a/README.md b/README.md
index 8048da1..08b7c8c 100644
--- a/README.md
+++ b/README.md
@@ -335,8 +335,8 @@ For more information on how to use the Julia wrapper
 
 P4est.jl is mainly maintained by
 [Joshua Lampert](https://github.com/JoshuaLampert) (University of Hamburg, Germany),
-[Michael Schlottke-Lakemper](https://lakemper.eu)
-(RWTH Aachen University/High-Performance Computing Center Stuttgart (HLRS), Germany),
+[Michael Schlottke-Lakemper](https://www.uni-augsburg.de/fakultaet/mntf/math/prof/hpsc)
+(University of Augsburg, Germany),
 and [Hendrik Ranocha](https://ranocha.de) (Johannes Gutenberg University Mainz, Germany).
 The full list of contributors can be found in [AUTHORS.md](AUTHORS.md).
 The [`p4est`](https://github.com/cburstedde/p4est) library itself is written by