diff --git a/.github/boring-cyborg.yml b/.github/boring-cyborg.yml
index 3c462f9a6d7..7c229fdf195 100644
--- a/.github/boring-cyborg.yml
+++ b/.github/boring-cyborg.yml
@@ -6,7 +6,7 @@ labelPRBasedOnFilePath:
         - assets/**/*
 
 firstPRWelcomeComment: >
-    **Thanks for opening this pull request!**<br/><br/>Please check out our [contributor checklist](https://docs.bisq.network/contributor-checklist.html) and check if *Travis* or *Codacy* found any issues with your PR. Also make sure your commits are signed, and that you applied [Bisq's code style](https://github.com/bisq-network/style/issues) and [formatting](.editorconfig).<br/><br/>A maintainer will add an `is:priority` label to your PR if it is up for compensation. Please see our [Bisq Q1 2020 Update post](https://bisq.network/blog/q1-2020-update/) for more details.
+    **Thanks for opening this pull request!**<br/><br/>Please check out our [contributor checklist](https://bisq.wiki/Contributor_checklist) and check if *Travis* or *Codacy* found any issues with your PR. Also make sure your commits are signed, and that you applied [Bisq's code style](https://github.com/bisq-network/style/issues) and [formatting](.editorconfig).<br/><br/>A maintainer will add an `is:priority` label to your PR if it is up for compensation. Please see our [Bisq Q1 2020 Update post](https://bisq.network/blog/q1-2020-update/) for more details.
 
 firstPRMergeComment: >
     Awesome work, congrats on your first merged pull request!
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c7e0a43c231..45c9aae2965 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -11,7 +11,7 @@ Install Keybase and enter "bisq" from the teams tab. This is an "open" team, whi
 
 Discussion about code changes happens in GitHub issues and pull requests.
 
-Discussion about larger changes to the way Bisq works happens in issues the [bisq-network/proposals](https://github.com/bisq-network/proposals/issues) repository. See https://docs.bisq.network/proposals.html for details.
+Discussion about larger changes to the way Bisq works happens in issues the [bisq-network/proposals](https://github.com/bisq-network/proposals/issues) repository. See https://bisq.wiki/Proposals for details.
 
 
 ## Contributor Workflow
@@ -50,7 +50,7 @@ Bisq is not a company, but operates as a _decentralized autonomous organization_
 Since our [Q1 2020 update](https://bisq.network/blog/q1-2020-update/) contributions are NOT eligible for compensation unless they are allocated as part of the development budget. Fixes for [critical bugs](https://bisq.wiki/Critical_Bugs) are eligible for compensation when delivered.
 In any case please contact the team lead for development (@ripcurlx) upfront if you want to get compensated for your contributions.
 
-For any work that was approved and merged into Bisq's `master` branch, you can [submit a compensation request](https://docs.bisq.network/dao/phase-zero.html#how-to-request-compensation) and earn BSQ (the Bisq DAO native token). Learn more about the Bisq DAO and BSQ [here](https://docs.bisq.network/dao/phase-zero.html).
+For any work that was approved and merged into Bisq's `master` branch, you can [submit a compensation request](https://bisq.wiki/Making_a_compensation_request) and earn BSQ (the Bisq DAO native token). Learn more about the Bisq DAO and BSQ [here](https://bisq.wiki/Introduction_to_the_DAO).
 
 
 ## Style and Coding Conventions
@@ -95,7 +95,7 @@ See the issues in the [bisq-network/style](https://github.com/bisq-network/style
 
 ## See also
 
- - [contributor checklist](https://docs.bisq.network/contributor-checklist.html)
+ - [contributor checklist](https://bisq.wiki/Contributor_checklist)
  - [developer docs](docs#readme) including build and dev environment setup instructions
  - [project management process](https://bisq.wiki/Project_management)
 
diff --git a/core/src/main/java/bisq/core/support/dispute/arbitration/ArbitrationManager.java b/core/src/main/java/bisq/core/support/dispute/arbitration/ArbitrationManager.java
index a2c53a29f52..1d270981aff 100644
--- a/core/src/main/java/bisq/core/support/dispute/arbitration/ArbitrationManager.java
+++ b/core/src/main/java/bisq/core/support/dispute/arbitration/ArbitrationManager.java
@@ -157,7 +157,7 @@ public void cleanupDisputes() {
     @Override
     protected String getDisputeInfo(Dispute dispute) {
         String role = Res.get("shared.arbitrator").toLowerCase();
-        String link = "https://docs.bisq.network/trading-rules.html#legacy-arbitration";
+        String link = "https://bisq.wiki/Arbitrator#Arbitrator_versus_Legacy_Arbitrator";
         return Res.get("support.initialInfo", role, role, link);
     }
 
diff --git a/core/src/main/java/bisq/core/support/dispute/mediation/MediationManager.java b/core/src/main/java/bisq/core/support/dispute/mediation/MediationManager.java
index 776e2191ed3..b0f6cf81ae5 100644
--- a/core/src/main/java/bisq/core/support/dispute/mediation/MediationManager.java
+++ b/core/src/main/java/bisq/core/support/dispute/mediation/MediationManager.java
@@ -144,7 +144,7 @@ public void cleanupDisputes() {
     @Override
     protected String getDisputeInfo(Dispute dispute) {
         String role = Res.get("shared.mediator").toLowerCase();
-        String link = "https://docs.bisq.network/trading-rules.html#mediation";
+        String link = "https://bisq.wiki/Dispute_resolution#Level_2:_Mediation";
         return Res.get("support.initialInfo", role, role, link);
     }
 
diff --git a/core/src/main/java/bisq/core/support/dispute/refund/RefundManager.java b/core/src/main/java/bisq/core/support/dispute/refund/RefundManager.java
index deb1537b624..2ebf432217e 100644
--- a/core/src/main/java/bisq/core/support/dispute/refund/RefundManager.java
+++ b/core/src/main/java/bisq/core/support/dispute/refund/RefundManager.java
@@ -133,7 +133,7 @@ public void cleanupDisputes() {
     @Override
     protected String getDisputeInfo(Dispute dispute) {
         String role = Res.get("shared.refundAgent").toLowerCase();
-        String link = "https://docs.bisq.network/trading-rules.html#arbitration";
+        String link = "https://bisq.wiki/Dispute_resolution#Level_3:_Arbitration";
         return Res.get("support.initialInfo", role, role, link);
     }
 
diff --git a/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java b/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java
index 7330a398de9..728c87156e2 100644
--- a/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java
+++ b/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java
@@ -244,7 +244,7 @@ private void onSaveNewAccount(PaymentAccount paymentAccount) {
             new Popup().information(Res.get("payment.f2f.info"))
                     .width(700)
                     .closeButtonText(Res.get("payment.f2f.info.openURL"))
-                    .onClose(() -> GUIUtil.openWebPage("https://docs.bisq.network/trading-rules.html#f2f-trading"))
+                    .onClose(() -> GUIUtil.openWebPage("https://bisq.wiki/Face-to-face_(payment_method)"))
                     .actionButtonText(Res.get("shared.iUnderstand"))
                     .onAction(() -> doSaveNewAccount(paymentAccount))
                     .show();
diff --git a/docs/README.md b/docs/README.md
index 7322ab00684..977b540e7ae 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -8,4 +8,4 @@
  - [dao-setup.md](dao-setup.md): (deprecated) Set up a complete Bisq DAO development environment
  - [testing.md](testing.md): Learn about the Bisq testing process and how you can contribute.
 
-Looking for user-facing documentation? See https://docs.bisq.network.
+Looking for user-facing documentation? See https://bisq.wiki.
diff --git a/docs/testing.md b/docs/testing.md
index 40158b891bb..bd29abf95de 100644
--- a/docs/testing.md
+++ b/docs/testing.md
@@ -17,7 +17,7 @@ Here you could also request access to TestPad (https://bisq.ontestpad.com).
 
 ## Compensation
 
-Testing activities are eligible for [compensation](https://docs.bisq.network/dao/phase-zero.html#how-to-request-compensation).
+Testing activities are eligible for [compensation](https://bisq.wiki/Making_a_compensation_request).
 When submitting a compensation request, please include links to artifacts on TestPad (results/reports) indicating the activities that were performed (e.g. tests that were executed), as well as any bugs that were discovered and entered as a result of testing.
 
 ## Testing Process