diff --git a/.zenodo.json b/.zenodo.json
index 905c0170ab9..863c586df4d 100644
--- a/.zenodo.json
+++ b/.zenodo.json
@@ -5,7 +5,7 @@
     "upload_type": "software",
     "creators": [
         {
-            "affiliation": "Applied and Computational Mathematics, RWTH Aachen University, Germany",
+            "affiliation": "High-Performance Scientific Computing, University of Augsburg, Germany",
             "name": "Schlottke-Lakemper, Michael",
             "orcid": "0000-0002-3195-2536"
         },
diff --git a/AUTHORS.md b/AUTHORS.md
index f1debf8ba76..8e3afcf8671 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -7,8 +7,8 @@ provided substantial additions or modifications. Together, these two groups form
 "The Trixi.jl Authors" as mentioned in the [LICENSE.md](LICENSE.md) file.
 
 ## Principal Developers
-* [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
 * [Gregor Gassner](https://www.mi.uni-koeln.de/NumSim/gregor-gassner),
   University of Cologne, Germany
 * [Hendrik Ranocha](https://ranocha.de),
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 37e79e3175b..e0bdd968873 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -60,7 +60,7 @@ representative at an online or offline event.
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported to
-[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 ee6e45f92a2..e0706d4fc7b 100644
--- a/README.md
+++ b/README.md
@@ -259,8 +259,8 @@ In addition, you can also refer to Trixi.jl directly as
 
 ## Authors
 Trixi.jl was initiated by [Michael
-Schlottke-Lakemper](https://lakemper.eu)
-(RWTH Aachen University/High-Performance Computing Center Stuttgart (HLRS), Germany) and
+Schlottke-Lakemper](https://www.uni-augsburg.de/fakultaet/mntf/math/prof/hpsc)
+(University of Augsburg, Germany) and
 [Gregor Gassner](https://www.mi.uni-koeln.de/NumSim/gregor-gassner)
 (University of Cologne, Germany). Together with [Hendrik Ranocha](https://ranocha.de)
 (Johannes Gutenberg University Mainz, Germany), [Andrew Winters](https://liu.se/en/employee/andwi94)
diff --git a/docs/src/index.md b/docs/src/index.md
index fbb4b36b224..869caaed85f 100644
--- a/docs/src/index.md
+++ b/docs/src/index.md
@@ -323,8 +323,8 @@ In addition, you can also refer to Trixi.jl directly as
 
 ## [Authors](@id authors-index-md)
 Trixi.jl was initiated by [Michael
-Schlottke-Lakemper](https://lakemper.eu)
-(RWTH Aachen University/High-Performance Computing Center Stuttgart (HLRS), Germany) and
+Schlottke-Lakemper](https://www.uni-augsburg.de/fakultaet/mntf/math/prof/hpsc)
+(University of Augsburg, Germany) and
 [Gregor Gassner](https://www.mi.uni-koeln.de/NumSim/gregor-gassner)
 (University of Cologne, Germany). Together with [Hendrik Ranocha](https://ranocha.de)
 (Johannes Gutenberg University Mainz, Germany) and [Andrew Winters](https://liu.se/en/employee/andwi94)