diff --git a/LICENSE b/LICENSE
index 5a9259405..578849cbf 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,7 @@
 MIT License
 
-Copyright (c) 2019 Stadicus
+Copyright (c) 2017-2020 Stadicus
+Copyright (c) 2021 RaspiBolt contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index 183809cab..2588b8264 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
 ### The RaspiBolt Guide is now available on GitHub Pages:
-https://stadicus.github.io/RaspiBolt/
+https://raspibolt.github.io/raspibolt/
 
 This repository contains all sources and is used for Issue tracking.
diff --git a/_config.yml b/_config.yml
index f3d489201..465c41b5b 100644
--- a/_config.yml
+++ b/_config.yml
@@ -3,9 +3,9 @@ remote_theme: pmarsceill/just-the-docs
 search_enabled: true
 aux_links:
     "Issues / Knowledge Base":
-      - "https://github.com/Stadicus/RaspiBolt/issues"
+      - "https://github.com/raspibolt/raspibolt/issues"
     "Contribute! Source on GitHub":
-      - "https://github.com/Stadicus/RaspiBolt/"
+      - "https://github.com/raspibolt/raspibolt/"
 
 # enable theme for local usage
 #theme: "just-the-docs"
diff --git a/index.md b/index.md
index f36061363..ba0f2fcdb 100644
--- a/index.md
+++ b/index.md
@@ -16,7 +16,7 @@ I now basically run my own bank using free open-source software and some cheap h
 
 ---
 
-The **RaspiBolt version 2** builds on the Raspberry Pi 4. If you're looking for the old version: [check out the old source files on GitHub](https://github.com/Stadicus/RaspiBolt/blob/1.0/index.md).
+The **RaspiBolt version 2** builds on the Raspberry Pi 4. If you're looking for the old version: [check out the old source files on GitHub](https://github.com/raspibolt/raspibolt/blob/1.0/index.md).
 
 ---
 
@@ -103,7 +103,7 @@ But please be aware that you should start with small amounts that you are willin
 
 ## Community Support
 Find help and other Raspibolt users on the following platforms:
-* [Github Issues / Knowledge Base](https://github.com/Stadicus/RaspiBolt/issues)
+* [Github Issues / Knowledge Base](https://github.com/raspibolt/raspibolt/issues)
 * Reddit sub: [r/raspibolt](https://www.reddit.com/r/raspibolt/)
 * Telegram group: [t.me/raspibolt](https://t.me/raspibolt)
 
diff --git a/raspibolt/README.md b/raspibolt/README.md
index 01e739f4c..c8549d346 100644
--- a/raspibolt/README.md
+++ b/raspibolt/README.md
@@ -3,6 +3,6 @@ nav_exclude: true
 ---
 ### The RaspiBolt Guide is now available on GitHub Pages:
 
-https://stadicus.github.io/RaspiBolt/
+https://raspibolt.github.io/raspibolt/
 
 This repository contains all sources and is used for Issue tracking.
diff --git a/raspibolt_61_system-overview.md b/raspibolt_61_system-overview.md
index 22e97b082..6a4080693 100644
--- a/raspibolt_61_system-overview.md
+++ b/raspibolt_61_system-overview.md
@@ -18,7 +18,7 @@ This script will run as root, so please check it before blindly trusting me.
 ```sh
 $ sudo apt install jq net-tools
 $ cd /tmp/
-$ wget https://raw.githubusercontent.com/Stadicus/RaspiBolt/master/resources/20-raspibolt-welcome
+$ wget https://raw.githubusercontent.com/raspibolt/raspibolt/master/resources/20-raspibolt-welcome
 
 # check script & exit
 $ nano 20-raspibolt-welcome
diff --git a/raspibolt_67_additional-scripts.md b/raspibolt_67_additional-scripts.md
index 1b2c20fcd..021f90c15 100644
--- a/raspibolt_67_additional-scripts.md
+++ b/raspibolt_67_additional-scripts.md
@@ -9,7 +9,7 @@ has_toc: false
 
 *Difficulty: easy*
 
-The following scripts were created by [RobClark56](https://github.com/robclark56) and help getting a better system overview. 
+The following scripts were created by [RobClark56](https://github.com/robclark56) and help getting a better system overview.
 
 As user "admin", download the scripts, make them executable and copy them to the global bin folder.
 
@@ -19,7 +19,7 @@ As user "admin", download the scripts, make them executable and copy them to the
 
 ```
 $ cd /home/admin/download/
-$ wget https://raw.githubusercontent.com/Stadicus/RaspiBolt/master/resources/lnbalance
+$ wget https://raw.githubusercontent.com/raspibolt/raspibolt/master/resources/lnbalance
 $ chmod +x lnbalance
 $ sudo cp lnbalance /usr/local/bin
 $ cd
@@ -33,7 +33,7 @@ $ lnbalance
 
 ```
 $ cd /home/admin/download/
-$ wget https://raw.githubusercontent.com/Stadicus/RaspiBolt/master/resources/lnchannels
+$ wget https://raw.githubusercontent.com/raspibolt/raspibolt/master/resources/lnchannels
 $ chmod +x lnchannels
 $ sudo cp lnchannels /usr/local/bin
 $ cd
diff --git a/raspibolt_70_troubleshooting.md b/raspibolt_70_troubleshooting.md
index 025e944a0..edc38229e 100644
--- a/raspibolt_70_troubleshooting.md
+++ b/raspibolt_70_troubleshooting.md
@@ -30,7 +30,7 @@ I collected frequent questions not directly related with issues in a separate [G
 ### Issues / Knowledge Base on Github
 
 When running into problems, you (and many before you) can open an issue on GitHub.
-https://github.com/Stadicus/guides/issues
+https://github.com/raspibolt/raspibolt/issues
 
 1. Please check this Troubleshooting Guide first.
 2. Check the GitHub Issues if it is a known problem. Maybe somebody already solved it?