diff --git a/README.md b/README.md
index 7b64f3c94e..e7f593b321 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ Stratos can be deployed in the following environments:
 Please see our [Troubleshooting](docs/troubleshooting) page.
 
 ## Project Planning
-We use [ZenHub](https://zenhub.com) for project planning. Feel free to head over to the [Boards](https://github.com/SUSE/stratos#boards)
+We use [ZenHub](https://zenhub.com) for project planning. Feel free to head over to the [Boards](https://github.com/cloudfoundry-incubator/stratos#boards)
 tab and have a look through our pipelines and milestones. Please note in order to view the Github ZenHub Boards tab you will need the [ZenHub
 browser extension](https://www.zenhub.com/extension). Alternatively, to view the planning board without the extension visit our [ZenHub Project Page](https://app.zenhub.com/workspace/o/cloudfoundry-incubator/stratos/boards)
 
@@ -53,7 +53,7 @@ Take a look at the [Development Roadmap](docs/roadmap.md) to see where we are he
 
 Browse through features and issues in the project's [issues](https://github.com/cloudfoundry-incubator/stratos/issues) page or [Zenhub Board](https://github.com/cloudfoundry-incubator/stratos#boards).
 
-What kind of code is in Stratos? We've integrated [Code Climate](https://codeclimate.com) for some code quality and maintainability metrics. Take a stroll around the [project page](https://codeclimate.com/github/SUSE/stratos)
+What kind of code is in Stratos? We've integrated [Code Climate](https://codeclimate.com) for some code quality and maintainability metrics. Take a stroll around the [project page](https://codeclimate.com/github/cloudfoundry-incubator/stratos)
 
 ## Contributing
 
diff --git a/docs/contributing.md b/docs/contributing.md
index 6e379dd8ac..c7b2ce3637 100644
--- a/docs/contributing.md
+++ b/docs/contributing.md
@@ -3,7 +3,7 @@
 ## Reporting issues
 
 Before reporting an issue, please check whether it has already been reported
-[here](https://github.com/SUSE/stratos/issues). If this is the case, please:
+[here](https://github.com/cloudfoundry-incubator/stratos/issues). If this is the case, please:
 
 - Read all the comments to confirm that it's the same issue you're having.
 - Refrain from adding "same thing here" or "+1" comments. Just hit the
diff --git a/docs/developers-guide.md b/docs/developers-guide.md
index bbe5177416..9c13a51dda 100644
--- a/docs/developers-guide.md
+++ b/docs/developers-guide.md
@@ -127,7 +127,7 @@ More information on the E2E tests and pre-requisites for running them is availab
 
 ### Code Climate
 
-We use [Code Climate](https://codeclimate.com/github/SUSE/stratos) to check for general code quality issues. This executes against Pull
+We use [Code Climate](https://codeclimate.com/github/cloudfoundry-incubator/stratos) to check for general code quality issues. This executes against Pull
 Requests on creation/push.
 
 #### Running Code Climate locally
diff --git a/docs/planning/metrics.md b/docs/planning/metrics.md
index 95f8d98bce..b4e540ee94 100644
--- a/docs/planning/metrics.md
+++ b/docs/planning/metrics.md
@@ -12,7 +12,7 @@ can be gated. We would most likely use basic authentication and ensure HTTPS acc
 
 This basic setup would allow an administrator to deploy Prometheus and configure it to collect metrics from a Cloud Foundry deployment and for APi of Prometheus to be accessed securely.
 
-An intial PoC to get Prometheus deployed with a firehose exported using Helm is here - https://github.com/SUSE/stratos-metrics.
+An intial PoC to get Prometheus deployed with a firehose exported using Helm is here - https://github.com/cloudfoundry-incubator/stratos-metrics.
 
 In Stratos, we would add a new endpoint type "Cloud Foundry Metrics" that a user can register with the endpoint of the Prometheus API and then connect to with their credentials as configured above. This would allow the Stratos backend to be able to talk to Prometheus securely and retrieve metrics.