diff --git a/.gitlab/mr_formatting.yml b/.gitlab/mr_formatting.yml
index 873a692608..95e5c4581d 100644
--- a/.gitlab/mr_formatting.yml
+++ b/.gitlab/mr_formatting.yml
@@ -3,7 +3,7 @@
 ##########################################################################
 # The variable CI_COMMIT_BEFORE_SHA is not available in normal merge requests
 # so we must build the commit hash ourselves, see:
-# https://gitlab.com/gitlab-org/gitlab/issues/12850
+# https://gitlab.com/gitlab-org/gitlab/-/issues/12850
 test_formatting:
   stage: test
   needs: []
diff --git a/common/rc_item.cpp b/common/rc_item.cpp
index e3a70122fa..acce081d4f 100644
--- a/common/rc_item.cpp
+++ b/common/rc_item.cpp
@@ -258,8 +258,8 @@ void RC_TREE_MODEL::rebuildModel( std::shared_ptr<RC_ITEMS_PROVIDER> aProvider,
     // The fastest method to update wxDataViewCtrl is to rebuild from
     // scratch by calling Cleared(). Linux requires to reassociate model to
     // display data, but Windows will create multiple associations.
-    // On MacOS, this crashes KiCad. See https://gitlab.com/kicad/code/kicad/issues/3666
-    // and https://gitlab.com/kicad/code/kicad/issues/3653
+    // On MacOS, this crashes KiCad. See https://gitlab.com/kicad/code/kicad/-/issues/3666
+    // and https://gitlab.com/kicad/code/kicad/-/issues/3653
     m_view->AssociateModel( this );
 #endif
 
diff --git a/common/tool/common_control.cpp b/common/tool/common_control.cpp
index e0493aabbc..994bb54d43 100644
--- a/common/tool/common_control.cpp
+++ b/common/tool/common_control.cpp
@@ -50,7 +50,7 @@
 
 /// URL to launch a new issue with pre-populated description
 wxString COMMON_CONTROL::m_bugReportUrl =
-        wxS( "https://gitlab.com/kicad/code/kicad/issues/new?issuable_template=bare&issue[description]=%s" );
+        wxS( "https://gitlab.com/kicad/code/kicad/-/issues/new?issuable_template=bare&issue[description]=%s" );
 
 
 /// Issue template to use for reporting bugs (this should not be translated)
diff --git a/pcbnew/plugins/altium/altium_parser_pcb.cpp b/pcbnew/plugins/altium/altium_parser_pcb.cpp
index c70ffe1e02..b3c418f1fc 100644
--- a/pcbnew/plugins/altium/altium_parser_pcb.cpp
+++ b/pcbnew/plugins/altium/altium_parser_pcb.cpp
@@ -912,7 +912,7 @@ ATEXT6::ATEXT6( ALTIUM_PARSER& aReader, std::map<uint32_t, wxString>& aStringTab
     textposition = static_cast<ALTIUM_TEXT_POSITION>( aReader.Read<uint8_t>() );
     /**
      * In Altium 14 (subrecord1 == 230) only left bottom is valid? I think there is a bit missing.
-     * https://gitlab.com/kicad/code/kicad/merge_requests/60#note_274913397
+     * https://gitlab.com/kicad/code/kicad/-/merge_requests/60#note_274913397
      */
     if( subrecord1 <= 230 )
         textposition = ALTIUM_TEXT_POSITION::LEFT_BOTTOM;
diff --git a/thirdparty/libcontext/README.txt b/thirdparty/libcontext/README.txt
index c3ce3f2f8c..3fe54c8061 100644
--- a/thirdparty/libcontext/README.txt
+++ b/thirdparty/libcontext/README.txt
@@ -5,7 +5,7 @@ It is licensed under the Boost Software License, with the license text in this d
 The reasons for creating a custom libcontext/coroutines library instead of using the Boost versions are described in several places. It was first introduced and discussed on the mailing list here: https://www.mail-archive.com/kicad-developers@lists.launchpad.net/msg23327.html
 
 
-From https://gitlab.com/kicad/code/kicad/issues/237:
+From https://gitlab.com/kicad/code/kicad/-/issues/237:
 
 ---------------
 
diff --git a/tools/git/fixes_alias b/tools/git/fixes_alias
index 4cd2e6cfa5..53d742e66b 100644
--- a/tools/git/fixes_alias
+++ b/tools/git/fixes_alias
@@ -7,7 +7,7 @@
 
 	fixes = "!f() { \
 		COMMIT_MSG=$(git log -n1 --format=%B); \
-		git commit --amend -m \"${COMMIT_MSG}\n\nFixes https://gitlab.com/kicad/code/kicad/issues/$1\"; \
+		git commit --amend -m \"${COMMIT_MSG}\n\nFixes https://gitlab.com/kicad/code/kicad/-/issues/$1\"; \
 	}; f"