diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index d7e94bd8..8dba79df 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -9,8 +9,8 @@ assignees: ''
 
 <!-- Please answer these questions before submitting your issue. Thanks! -->
 
-<!-- Documentation URL: https://docs.fission.io/ -->
-<!-- Troubleshooting guide: https://docs.fission.io/trouble-shooting/ -->
+<!-- Documentation URL: https://fission.io/docs -->
+<!-- Troubleshooting guide: https://fission.io/docs/trouble-shooting/ -->
 
 **Fission/Kubernetes version**
 
diff --git a/.goreleaser.yml b/.goreleaser.yml
index 709592fe..2eda7810 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -6,8 +6,8 @@ release:
   prerelease: true
   draft: true
   header: |
-    Release Highlights: https://docs.fission.io/docs/releases/{{ .Tag }}/
-    Install Guide: https://docs.fission.io/installation/
+    Release Highlights: https://fission.io/docs/releases/{{ .Tag }}/
+    Install Guide: https://fission.io/docs/installation/
     Full Changelog: https://github.com/fission/fission/blob/master/CHANGELOG.md
   extra_files:
     - glob: ./manifest/charts/*
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6d47f51e..1b4f1ea0 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -7,4 +7,4 @@ First, please read the [code of conduct](CODE_OF_CONDUCT.md). By participating,
 
 Please refer contributing docs for detailed guide.
 
-[https://docs.fission.io/docs/contributing/](https://docs.fission.io/docs/contributing/)
+[https://fission.io/docs/contributing/](https://fission.io/docs/contributing/)
diff --git a/Documentation/README.md b/Documentation/README.md
index 1785317a..2d4fb10e 100644
--- a/Documentation/README.md
+++ b/Documentation/README.md
@@ -1,4 +1,4 @@
 Fission Document
 =================
 
-* Please visit [here](https://docs.fission.io/) for fission documentation. 
+* Please visit [here](https://fission.io/docs) for fission documentation.
diff --git a/README.md b/README.md
index 62c993ca..5ea71982 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 <p align="center">
-  <img src="https://docs.fission.io/images/logo-gh.svg" width="300" />
+  <img src="https://fission.io/images/logo-gh.svg" width="300" />
   <br>
   <h1 align="center">Fission: Serverless Functions for Kubernetes</h1>
 </p>
@@ -81,10 +81,10 @@ aggregation &mdash; also helps with ops on your Fission deployment.
 
 ## Learn More
 
-* Understand [Fission Concepts](https://docs.fission.io/docs/concepts/).
-* See the [installation guide](https://docs.fission.io/docs/installation/) for installing and running Fission.
-* You can learn more about Fission and get started from [Fission Docs](https://docs.fission.io/docs).
-* See the [troubleshooting guide](https://docs.fission.io/docs/trouble-shooting/) for debugging your functions and Fission installation.
+* Understand [Fission Concepts](https://fission.io/docs/concepts/).
+* See the [installation guide](https://fission.io/docs/installation/) for installing and running Fission.
+* You can learn more about Fission and get started from [Fission Docs](https://fission.io/docs).
+* See the [troubleshooting guide](https://fission.io/docs/trouble-shooting/) for debugging your functions and Fission installation.
 
 ## Contributing
 
diff --git a/cmd/fission-cli/app/app.go b/cmd/fission-cli/app/app.go
index 04c56252..fc5704b2 100644
--- a/cmd/fission-cli/app/app.go
+++ b/cmd/fission-cli/app/app.go
@@ -33,7 +33,7 @@ const (
 	usage = `Fission: Fast and Simple Serverless Functions for Kubernetes
 
  * Github: https://github.com/fission/fission 
- * Documentation: https://docs.fission.io/docs
+ * Documentation: https://fission.io/docs
 `
 )
 
diff --git a/hack/Releasing.md b/hack/Releasing.md
index 4806c97e..7ff09dab 100644
--- a/hack/Releasing.md
+++ b/hack/Releasing.md
@@ -6,7 +6,7 @@
 
    a. [The fission dockerhub account](https://hub.docker.com/r/fission/), if you have access, you will see Fission listed in [your organizations](https://hub.docker.com/organizations/)
    b. [Fission-charts repo](https://github.com/fission/fission-charts)
-   c. [Fission Documentation Repo](https://github.com/fission/docs.fission.io)
+   c. [Fission Documentation Repo](https://github.com/fission/fission.io)
    d. [Fission main repo](https://github.com/fission/fission)
 
 2. Get a Github [personal access token](https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line/)
@@ -76,13 +76,13 @@ b. Changelog.md
 
 Before you save the release - UNCHECK the "This is a pre-release" checkbox. This mark the release as ready for consumption (If release is stable).
 
-## Updating [Fission Docs](https://github.com/fission/docs.fission.io)
+## Updating [Fission Docs](https://github.com/fission/fission.io)
 
 1. Documentation Update
 
 a. Merge documentation PRs that are peer reviewed and get latest master locally.
 
-b. In the repo fission/docs.fission.io change version in version.sh file to latest version (x.y.z) and run build.sh script
+b. In the repo fission/fission.io change version in version.sh file to latest version (x.y.z) and run build.sh script
 
 c. **ONLY** in the dist/x.y.z directory i.e. current version directory - replace all references from previous release to current release. Please use your IDE as there will be thousands of references.
 
diff --git a/hack/notes.md b/hack/notes.md
index 3abecac7..6c211c47 100644
--- a/hack/notes.md
+++ b/hack/notes.md
@@ -1,2 +1,2 @@
-Install Guide: https://docs.fission.io/installation/
+Install Guide: https://fission.io/docs/installation/
 Full Changelog: https://github.com/fission/fission/blob/master/CHANGELOG.md
\ No newline at end of file