diff --git a/Manual.attributes b/Manual.attributes
index 9f2b4a3f2ffb709cd0486cc70c0fef4442538851..53ebbd55aba1a914bdee3e588ddecba8760e97e6 100644
--- a/Manual.attributes
+++ b/Manual.attributes
@@ -10,7 +10,6 @@
 
 :link_manual:                           {host_git}/OPAL/documentation/manual
 :link_manual_src:                       {link_manual}/blob/{branch_manual}
-:baseurl:                               {link_manual}/blob/{branch_manual}
 
 :link_OPAL_doc:                         {host_amas}/opal/Documentation/{branch_OPAL}
 
diff --git a/control.asciidoc b/control.asciidoc
index 822218f3a7fc5120b418d11cec4eedc0b2e95cda..cbb137c67de72f45e1f1cd582d515594bb0a7e97 100644
--- a/control.asciidoc
+++ b/control.asciidoc
@@ -560,10 +560,10 @@ The `SYSTEM` command can also be used to execute an external script.
 
 Below is an example that generates a random seed with python.
 The python script
-{link_OPAL_doc}/examples/gen_seed.py[gen_seed.py]
+{link_manual_src}/examples/gen_seed.py[gen_seed.py]
 is called with the `SYSTEM` command.
 This scripts writes the seed to a file
-{link_OPAL_doc}/examples/gen_seed.opal[gen_seed.opal]
+{link_manual_src}/examples/gen_seed.opal[gen_seed.opal]
 that can be read with the `CALL` command.
 
 ----
diff --git a/env-gitlab.attributes b/env-gitlab.attributes
index 3c0c7b7b9292b11708d929455fc3374ea8580849..5e114266760ccb46e5ccab3133aae727cdbc6f59 100644
--- a/env-gitlab.attributes
+++ b/env-gitlab.attributes
@@ -4,4 +4,4 @@
 :toclevels: 3
 
 :adoc: asciidoc
-:link_home: {baseurl}/Manual.{adoc}[Back to Main Page]
\ No newline at end of file
+:link_manual_src: {baseurl}/Manual.{adoc}[Back to Main Page]
\ No newline at end of file
diff --git a/opalcycl.asciidoc b/opalcycl.asciidoc
index 07c7077236a46ec1d00bbc03c4949d064babc5a1..b784f43d41b0c4b2d1ab0496e0dce08e7985c0e4 100644
--- a/opalcycl.asciidoc
+++ b/opalcycl.asciidoc
@@ -602,7 +602,7 @@ mrad.
 A bash script _tuning.sh_ is shown on the next page, to execute
 _OPAL-cycl_ for tune calculations.
 
-{link_OPAL_doc}/examples/tuning.sh[tuning.sh]
+{link_manual_src}/examples/tuning.sh[tuning.sh]
 
 To start execution, just run
 _tuning.sh_ which uses the input file _testcycl.in_ and the auxiliary
diff --git a/partmatter.asciidoc b/partmatter.asciidoc
index b3fae55673fdf54ff441ae6ce45737bf7ce8f61f..8a19d574f4cb0de573e52e910dc87c20cea5d4b6 100644
--- a/partmatter.asciidoc
+++ b/partmatter.asciidoc
@@ -394,7 +394,7 @@ track it as in a drift and put it back to the main bunch when finishing
 [[sec.partmatter.example-of-an-input-file]]
 === Example of an Input File
 
-{link_OPAL_doc}/examples/particlematterinteraction.in[particlematterinteraction.in]
+{link_manual_src}/examples/particlematterinteraction.in[particlematterinteraction.in]
 
 FX5 is a slit in x direction, the `APERTURE` is *POSITIVE*, the first
 value in `APERTURE` is the left part, the second value is the right
diff --git a/tutorial.asciidoc b/tutorial.asciidoc
index 8dd57f3c173733037b5c1aefdc96b660a41d42a8..8adcf5e9ba7fa60a332382d1c74029afe05ce636 100644
--- a/tutorial.asciidoc
+++ b/tutorial.asciidoc
@@ -149,16 +149,16 @@ two single-gap flat-top cavities.
 Following is an input file of *Single Particle Tracking mode* for PSI
 Injector II cyclotron.
 
-{link_OPAL_doc}/examples/Injector2.in[Injector2.in]
+{link_manual_src}/examples/Injector2.in[Injector2.in]
 
 The supplementary files should be placed in the same directory.
 
-* {link_OPAL_doc}/examples/Fieldmaps/Cav1.dat[Cav1.dat]
-* {link_OPAL_doc}/examples/Fieldmaps/Cav3.dat[Cav3.dat]
-* {link_OPAL_doc}/examples/Fieldmaps/ZYKL9Z.NAR[ZYKL9Z.NAR]
-* {link_OPAL_doc}/examples/Distribution/scdist.opal[scdist.opal]
-* {link_OPAL_doc}/examples/Distribution/spdist.opal[spdist.opal]
-* {link_OPAL_doc}/examples/Distribution/tdist.opal[tdist.opal]
+* {link_manual_src}/examples/Fieldmaps/Cav1.dat[Cav1.dat]
+* {link_manual_src}/examples/Fieldmaps/Cav3.dat[Cav3.dat]
+* {link_manual_src}/examples/Fieldmaps/ZYKL9Z.NAR[ZYKL9Z.NAR]
+* {link_manual_src}/examples/Distribution/scdist.opal[scdist.opal]
+* {link_manual_src}/examples/Distribution/spdist.opal[spdist.opal]
+* {link_manual_src}/examples/Distribution/tdist.opal[tdist.opal]
 
 To run opal on a single node, just use this command:
 
@@ -205,7 +205,7 @@ the biggest amplitude is the betatron tune value at the given energy.
 Following is the input file for single bunch tracking with space charge
 effects in Injector II.
 
-{link_OPAL_doc}/examples/Injector2-sc.in[Injector2-sc.in]
+{link_manual_src}/examples/Injector2-sc.in[Injector2-sc.in]
 
 For the supplementary files see above, <<sec.tutorial.inj2>>