diff --git a/MAINTAINERS b/MAINTAINERS
new file mode 100644
index 0000000000000000000000000000000000000000..7abdfeb5062a5e3716cdf975087a81c1fa7d7ed7
--- /dev/null
+++ b/MAINTAINERS
@@ -0,0 +1,30 @@
+Maintainers of the CORSIKA8 project are collaborators actively taking
+care of code contributions, quality control, development, and related
+discussions. 
+
+General:
+- Ralf Ulrich <ralf.ulrich@kit.edu>, KIT
+- Maximilian Reininghaus <maximilian.reininghaus@kit.edu>, KIT
+- Hans Dembinski <hdembins@mpi-hd.mpg.de>, Dortmund
+
+High performance, GPU: 
+- Dominik Baack <dominik.baack@tu-dortmund.de>, Dortmund
+- Antonio Augusto Alves Junior <antonio.junior@kit.edu>, KIT
+- Luisa Arrabito <arrabito@in2p3.fr>, Montpellier
+
+Electromagnetic models, and infrastructure: 
+- Jean-Marco Alameddine <gitlab@gitlab.ikp.kit.edu>, Dortmund
+- Jan Soedingrekso <jan.soedingrekso@tu-dortmund.de>, Dortmund
+- Maximilian Sackel <maximilian.sackel@udo.edu>, Dortmund
+
+Hadron models and infrastructure:
+- Felix Riehn <friehn@lip.pt>, Santiago/Lisbon
+- Anatoli Fedynitch <anatoli.fedynitch@icecube.wisc.edu> ICRR Tokyo
+
+Radio:
+- Remy Prechelt <prechelt@hawaii.edu> 
+- Tim Huege <tim.huege@kit.edu>, KIT
+
+Testing, containers:
+- Lukas Nellen <lukas@nucleares.unam.mx>
+
diff --git a/SCIENTIFIC_AUTHORS b/SCIENTIFIC_AUTHORS
index 823eb4b4eb6e1c23569f3797f08490fd7810ea4c..a00fe03acc791f21daa27da56ca89925febc7a9c 100644
--- a/SCIENTIFIC_AUTHORS
+++ b/SCIENTIFIC_AUTHORS
@@ -1,3 +1,28 @@
-See https://gitlab.ikp.kit.edu/AirShowerPhysics/corsika/wikis/ICRC2019
+This is currently derived from
+https://gitlab.ikp.kit.edu/AirShowerPhysics/corsika/wikis/ICRC2019
+and will be revised whenever needed:
 
+- Luisa Arrabito (1)
+- Dominik Baack (2)
+- Johan Bregeon (1)
+- Hans Dembinski (3)
+- Ralph Engel (4)
+- Dieter Heck (4)
+- Tim Huege (4,5)
+- Lukas Nellen (6)
+- Tanguy Pierog (4)
+- Maximilian Reininghaus (4,7)
+- Felix Riehn (8)
+- Ralf Ulrich (4)
+- Darko Veberic (4)
 
+Affiliations:
+
+- University of Montpellier, France
+- TU Dortmund University, Germany
+- Max Planck Institute for Nuclear Physics, Heidelberg, Germany
+- Karlsruhe Institute of Technology (KIT), Germany
+- Vrije Universiteit Brussel, Belgium
+- National Autonomous University of Mexico (UNAM)
+- Instituto de Tecnologías en Detección y Astropartículas (CNEA, CONICET, UNSAM), Buenos Aires, Argentina
+- Laboratory of Instrumentation and Experimental Particles (LIP), Portugal