diff --git a/.gitlab/merge_request_templates/Code Approval.md b/.gitlab/merge_request_templates/Code Approval.md
index ed076c02e7be42adb5da776b21546e985d2d60c5..f9f5dbce130341efe2729758e36c9f4ae5a6b578 100644
--- a/.gitlab/merge_request_templates/Code Approval.md	
+++ b/.gitlab/merge_request_templates/Code Approval.md	
@@ -1,6 +1,6 @@
 Issues: Closes #.... 
 
-The code approval procedure is described in the wiki: [Code approval procedure wiki](https://gitlab.ikp.kit.edu/AirShowerPhysics/corsika/-/wikis/Code-Approval-Procedure)
+The code approval procedure is described in the wiki: [Code approval procedure wiki](https://gitlab.iap.kit.edu/AirShowerPhysics/corsika/-/wikis/Code-Approval-Procedure)
 
 - [ ] The MR is without `WIP/Draft` status
 - [ ] Make sure the most recent CI jobs (config, quality, build_test_example) all run fine with no failures
diff --git a/README.md b/README.md
index 5f48b14497d6bc3aef2e564927a40efaf6988871..33e983bc6c345ab42610c1372664b95ae40ccada 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ decision of the user must be performed at compile time. At run time
 model parameters can still be changed.
 
 CORSIKA 8 is by default released under the GPLv3 license. See [license
-file](https://gitlab.ikp.kit.edu/AirShowerPhysics/corsika/blob/master/LICENSE)
+file](https://gitlab.iap.kit.edu/AirShowerPhysics/corsika/blob/master/LICENSE)
 which is part of every release and the source code.
 
 If you use, or want to refer to, CORSIKA 8 please cite ["Towards a Next
@@ -27,7 +27,7 @@ whole community.
 
 When you plan to contribute to CORSIKA 8 check the guidelines outlined here:
 [coding
-guidelines](https://gitlab.ikp.kit.edu/AirShowerPhysics/corsika/blob/master/CONTRIBUTING.md). Code
+guidelines](https://gitlab.iap.kit.edu/AirShowerPhysics/corsika/blob/master/CONTRIBUTING.md). Code
 that fails the review by the CORSIKA author group must be improved
 before it can be merged in the official code base. After your code has
 been accepted and merged, you become a contributor of the CORSIKA 8
@@ -35,14 +35,14 @@ project (code author).
 
 IMPORTANT: Before you contribute, you need to read and agree to the
 [collaboration
-agreement](https://gitlab.ikp.kit.edu/AirShowerPhysics/corsika/blob/master/COLLABORATION_AGREEMENT.md). The agreement can be discussed, and eventually improved.
+agreement](https://gitlab.iap.kit.edu/AirShowerPhysics/corsika/blob/master/COLLABORATION_AGREEMENT.md). The agreement can be discussed, and eventually improved.
 
 We also want to point you to the [MCnet
-guidelines](https://gitlab.ikp.kit.edu/AirShowerPhysics/corsika/blob/master/MCNET_GUIDELINES), which are very useful also for us.
+guidelines](https://gitlab.iap.kit.edu/AirShowerPhysics/corsika/blob/master/MCNET_GUIDELINES), which are very useful also for us.
 
 
 ## Get in contact
-  * Connect to https://gitlab.ikp.kit.edu register yourself and join the "Air Shower Physics" group. Write to me (ralf.ulrich@kit.edu) only in case there are problems with that. 
+  * Connect to https://gitlab.iap.kit.edu register yourself and join the "Air Shower Physics" group. Write to me (ralf.ulrich@kit.edu) only in case there are problems with that. 
   * Connect to corsika-devel@lists.kit.edu (self-register at
     https://www.lists.kit.edu/sympa/subscribe/corsika-devel) to get in
     touch with the project.
@@ -88,7 +88,7 @@ pip install --user conan
 Once Conan is installed, follow these steps to download and install CORSIKA 8:
 
 ``` shell
-git clone --recursive git@gitlab.ikp.kit.edu:AirShowerPhysics/corsika.git
+git clone --recursive git@gitlab.iap.kit.edu:AirShowerPhysics/corsika.git
 mkdir corsika-build
 cd corsika-build
 cmake ../corsika -DCMAKE_INSTALL_PREFIX=../corsika-install
@@ -109,7 +109,7 @@ You only need docker, e.g. on Ubunut: `sudo apt-get install docker` and of cours
 
 Follow these steps to download and install CORSIKA 8, master development version
 ```shell
-git clone --recursive https://gitlab.ikp.kit.edu/AirShowerPhysics/corsika.git
+git clone --recursive https://gitlab.iap.kit.edu/AirShowerPhysics/corsika.git
 sudo docker run -v $PWD:/corsika -it corsika/devel:clang-8 /bin/bash
 mkdir build
 cd build
diff --git a/README.rst b/README.rst
index 2f4d28d212901f1f8b71ef97ffd563091d5bcdff..3c11bca3e35dda396c431482e52c05dbc506a2d5 100644
--- a/README.rst
+++ b/README.rst
@@ -15,7 +15,7 @@ decision of the user must be performed at compile time. At run time
 model parameters can still be changed.
 
 CORSIKA 8 is by default released under the GPLv3 license. See `license
-file <https://gitlab.ikp.kit.edu/AirShowerPhysics/corsika/blob/master/LICENSE>`_
+file <https://gitlab.iap.kit.edu/AirShowerPhysics/corsika/blob/master/LICENSE>`_
 which is part of every release and the source code.
 
 If you use, or want to refer to, CORSIKA 8 please cite `"Towards a Next
@@ -28,7 +28,7 @@ whole community.
 
 When you plan to contribute to CORSIKA 8 check the guidelines outlined here:
 `coding
-guidelines <https://gitlab.ikp.kit.edu/AirShowerPhysics/corsika/blob/master/CONTRIBUTING.md>`_. Code
+guidelines <https://gitlab.iap.kit.edu/AirShowerPhysics/corsika/blob/master/CONTRIBUTING.md>`_. Code
 that fails the review by the CORSIKA author group must be improved
 before it can be merged in the official code base. After your code has
 been accepted and merged, you become a contributor of the CORSIKA 8
@@ -36,17 +36,17 @@ project (code author).
 
 IMPORTANT: Before you contribute, you need to read and agree to the
 `collaboration agreement
-<https://gitlab.ikp.kit.edu/AirShowerPhysics/corsika/blob/master/COLLABORATION_AGREEMENT.md>`_. The
+<https://gitlab.iap.kit.edu/AirShowerPhysics/corsika/blob/master/COLLABORATION_AGREEMENT.md>`_. The
 agreement can be discussed, and eventually improved.
 
 We also want to point you to the `MCnet guidelines
-<https://gitlab.ikp.kit.edu/AirShowerPhysics/corsika/blob/master/MCNET_GUIDELINES>`_,
+<https://gitlab.iap.kit.edu/AirShowerPhysics/corsika/blob/master/MCNET_GUIDELINES>`_,
 which are very useful also for us.
 
 
 Get in contact
 --------------
-  * Connect to https://gitlab.ikp.kit.edu register yourself and join the "Air Shower Physics" group. Write to me (ralf.ulrich@kit.edu) only in case there are problems with that. 
+  * Connect to https://gitlab.iap.kit.edu register yourself and join the "Air Shower Physics" group. Write to me (ralf.ulrich@kit.edu) only in case there are problems with that. 
   * Connect to corsika-devel@lists.kit.edu (self-register at
     https://www.lists.kit.edu/sympa/subscribe/corsika-devel) to get in
     touch with the project.
@@ -94,7 +94,7 @@ Compiling
 Once Conan is installed, follow these steps to download and install CORSIKA 8:
 ::
    
-  git clone --recursive git@gitlab.ikp.kit.edu:AirShowerPhysics/corsika.git
+  git clone --recursive git@gitlab.iap.kit.edu:AirShowerPhysics/corsika.git
   mkdir corsika-build
   cd corsika-build
   cmake ../corsika -DCMAKE_INSTALL_PREFIX=../corsika-install
@@ -118,7 +118,7 @@ Compiling
 Follow these steps to download and install CORSIKA 8, master development version
 ::
    
-  git clone --recursive https://gitlab.ikp.kit.edu/AirShowerPhysics/corsika.git
+  git clone --recursive https://gitlab.iap.kit.edu/AirShowerPhysics/corsika.git
   sudo docker run -v $PWD:/corsika -it corsika/devel:clang-8 /bin/bash
   mkdir build
   cd build
diff --git a/corsika/detail/modules/energy_loss/BetheBlochPDG.inl b/corsika/detail/modules/energy_loss/BetheBlochPDG.inl
index d163f761a8af34c2f5ef7d6156db8af005209c09..570f830d69c3d257185f830f765190153ba4b518 100644
--- a/corsika/detail/modules/energy_loss/BetheBlochPDG.inl
+++ b/corsika/detail/modules/energy_loss/BetheBlochPDG.inl
@@ -144,7 +144,7 @@ namespace corsika {
                                                             bool const) {
 
     // if this step was limiting the CORSIKA stepping, the particle is lost
-    /* see Issue https://gitlab.ikp.kit.edu/AirShowerPhysics/corsika/-/issues/389
+    /* see Issue https://gitlab.iap.kit.edu/AirShowerPhysics/corsika/-/issues/389
     if (limitStep) {
       fillProfile(t, p.getEnergy());
       p.setEnergy(p.getMass());
diff --git a/corsika/detail/modules/pythia8/Interaction.inl b/corsika/detail/modules/pythia8/Interaction.inl
index 2144380e7480f3325375a45052c0822880c9e036..374088d04eb521ea8a7eb6bc4996474e901b825c 100644
--- a/corsika/detail/modules/pythia8/Interaction.inl
+++ b/corsika/detail/modules/pythia8/Interaction.inl
@@ -39,7 +39,7 @@ namespace corsika::pythia8 {
     Pythia8::Pythia::readString("Check:event = on");             // default: on
     Pythia8::Pythia::readString("Check:levelParticleData = 12"); // 1 is default
     /** \TODO: proper process initialization for MinBias needed, see
-        also Issue https://gitlab.ikp.kit.edu/AirShowerPhysics/corsika/-/issues/369 **/
+        also Issue https://gitlab.iap.kit.edu/AirShowerPhysics/corsika/-/issues/369 **/
     Pythia8::Pythia::readString("HardQCD:all = on");
     Pythia8::Pythia::readString("ProcessLevel:resonanceDecays = off");
 
diff --git a/corsika/modules/ObservationPlane.hpp b/corsika/modules/ObservationPlane.hpp
index 997e86782eb84ebf6dbbf7d5a632eb38580ed60b..d1bf4ddd911a5e3d2b0b7a29d52c43b9931c6f3f 100644
--- a/corsika/modules/ObservationPlane.hpp
+++ b/corsika/modules/ObservationPlane.hpp
@@ -27,7 +27,7 @@ namespace corsika {
    * The default output format is parquet.
    *
    * **Note/Limitation:** as discussed in
-   * https://gitlab.ikp.kit.edu/AirShowerPhysics/corsika/-/issues/397
+   * https://gitlab.iap.kit.edu/AirShowerPhysics/corsika/-/issues/397
    * you cannot put two ObservationPlanes exactly on top of each
    * other. Even if one of them is "permeable". You have to put a
    * small gap in between the two plane in such a scenario, or develop
diff --git a/documentation/corsika.dox b/documentation/corsika.dox
index bfbb74d79eaaad1a07ba095c6a34c1a205f54678..efc7baa8b7abf4da917e4634b70c1e945969c130 100644
--- a/documentation/corsika.dox
+++ b/documentation/corsika.dox
@@ -5,12 +5,12 @@
 Software documentatin and reference guide for the CORSIKA 8
 software framework for air shower simulations. CORSIKA 8 is developed
 at <a
-href="https://gitlab.ikp.kit.edu/AirShowerPhysics">https://gitlab.ikp.kit.edu</a>. If
+href="https://gitlab.iap.kit.edu/AirShowerPhysics">https://gitlab.iap.kit.edu</a>. If
 you got the code from somewhere else, consider to switch to the
 official development repository. If you want to report bugs, or want
 to suggest features or future development, please submit an "issue" on
 this gitlab server. We only accept Issues and discussion via our
-central development server https://gitlab.ikp.kit.edu.
+central development server https://gitlab.iap.kit.edu.
 
 Write to corsika-devel@lists.kit.edu, or even register yourself at
 https://www.lists.kit.edu/sympa/info/corsika-devel to get in contact
diff --git a/python/README.md b/python/README.md
index 7e35dfe389dde4d372b1e38301c41c42a45c6fa8..1a36803f50e32908136a9fef7a93f661b204a5f8 100644
--- a/python/README.md
+++ b/python/README.md
@@ -3,6 +3,6 @@
 To install this into your global environment using `pip` (not recommended), run
 
 ``` shell
-pip install --user git+https://gitlab.ikp.kit.edu/AirShowerPhysics/corsika/-/tree/master/python 
+pip install --user git+https://gitlab.iap.kit.edu/AirShowerPhysics/corsika/-/tree/master/python 
 ```
 
diff --git a/python/setup.py b/python/setup.py
index 6be02898f186b63644c285252727b332dc5580ca..4bc73b3260b617ac3c55b2273d399b546ffdd3f6 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -18,7 +18,7 @@ setup(
     description="A Python package for working with CORSIKA 8.",
     long_description=long_description,
     long_description_content_type="text/markdown",
-    url="https://gitlab.ikp.kit.edu/AirShowerPhysics/corsika",
+    url="https://gitlab.iap.kit.edu/AirShowerPhysics/corsika",
     author="CORSIKA 8 Collaboration",
     author_email="corsika-devel@lists.kit.edu",
     classifiers=[
@@ -46,6 +46,6 @@ setup(
         "pandas": ["pandas"],
     },
     scripts=[],
-    project_urls={"code": "https://gitlab.ikp.kit.edu/AirShowerPhysics/corsika"},
+    project_urls={"code": "https://gitlab.iap.kit.edu/AirShowerPhysics/corsika"},
     include_package_data=False,
 )
diff --git a/src/corsika.hpp.in b/src/corsika.hpp.in
index 71c5a4be392b972f853f767df0df6f228e8b306f..1ba9d65b3eb41316c9552803350a4b71aaaa9950 100644
--- a/src/corsika.hpp.in
+++ b/src/corsika.hpp.in
@@ -26,11 +26,11 @@ namespace corsika {
    * Software documentatin and reference guide for the CORSIKA 8
    * software framework for air shower simulations. CORSIKA 8 is developed
    * at <a
-   * href="https://gitlab.ikp.kit.edu/AirShowerPhysics">https://gitlab.ikp.kit.edu</a>. If
+   * href="https://gitlab.iap.kit.edu/AirShowerPhysics">https://gitlab.iap.kit.edu</a>. If
    * you got the code from somewhere else, consider to switch to the official development
    * repository. If you want to report bugs, or want to suggest features or future
    * development, please submit an "issue" on this gitlab server. We only accept Issues
-   * and discussion via our central development server https://gitlab.ikp.kit.edu.
+   * and discussion via our central development server https://gitlab.iap.kit.edu.
    *
    * Write to corsika-devel@lists.kit.edu, or even register yourself at
    * https://www.lists.kit.edu/sympa/info/corsika-devel to get in contact
diff --git a/tests/modules/testSibyll.cpp b/tests/modules/testSibyll.cpp
index 042dc72a873d657b3e7da682fdead5d15df67e86..c0e07be86cb0410a2f4f6d13b2cd55b00934cc3a 100644
--- a/tests/modules/testSibyll.cpp
+++ b/tests/modules/testSibyll.cpp
@@ -224,7 +224,7 @@ TEST_CASE("SibyllInterface", "modules") {
       See also:
 
       Issue 272 / MR 204
-      https://gitlab.ikp.kit.edu/AirShowerPhysics/corsika/-/merge_requests/204
+      https://gitlab.iap.kit.edu/AirShowerPhysics/corsika/-/merge_requests/204
 
     */