diff --git a/README.md b/README.md
index f9b492f..2691e32 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ Alarms have three possible states: `UNDETERMINED`, `OK` and `ALARM`.  Alarms are
 avg(cpu{service=nova}, 120) > 90 or avg(load{service=nova}, 120) > 15
 ```
 
-For more details on Alarm Definitions versus Alarms refer to the Monasca API documentation at https://github.com/stackforge/monasca-api/blob/master/docs/monasca-api-spec.md.
+For more details on Alarm Definitions versus Alarms refer to the Monasca API documentation at https://github.com/openstack/monasca-api/blob/master/docs/monasca-api-spec.md.
 
 If the expression evaluates to true, the Alarm state transitions to `ALARM`, if it evaluates to false, the state transitions to `OK` and if there aren't any metrics for the two times the measuring period, the Alarm state transitions to `UNDETERMINED`. Each part of the expression is represented by a Sub Alarm, so for the above example, there are two Sub Alarms.
 
@@ -36,7 +36,7 @@ Events also flow into the Threshold Engine via Kafka so the Threshold Engine kno
 =======
 # Build
 
-Requires monasca-common from https://github.com/stackforge/monasca-common. Download and follow the instructions in the README
+Requires monasca-common from https://github.com/openstack/monasca-common. Download and follow the instructions in the README
 
 ```
 cd thresh
diff --git a/common/build_common.sh b/common/build_common.sh
index 70801fe..865ac05 100755
--- a/common/build_common.sh
+++ b/common/build_common.sh
@@ -22,7 +22,7 @@ fi
 
 # This should only be done on the stack forge system
 if [ "${BUILD_COMMON}" = "true" ]; then
-   git clone https://github.com/stackforge/monasca-common
+   git clone https://github.com/openstack/monasca-common
    cd monasca-common
    ${MVN} clean
    ${MVN} install
diff --git a/common/pom.xml b/common/pom.xml
index 74da6c6..74f773f 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -5,7 +5,7 @@
   <groupId>monasca-api</groupId>
   <artifactId>monasca-api-common</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  <url>http://github.com/stackforge/monasca-api</url>
+  <url>http://github.com/openstack/monasca-api</url>
   <packaging>pom</packaging>
 
   <properties>
diff --git a/mkdocs.yml b/mkdocs.yml
index ae3dd5a..99b9645 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -1,2 +1,2 @@
 site_name: monasca-thresh
-repo_url: https://github.com/stackforge/monasca-thresh
+repo_url: https://github.com/openstack/monasca-thresh
diff --git a/pom.xml b/pom.xml
index ff43a5b..258d875 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
   <groupId>monasca</groupId>
   <artifactId>monasca-thresh-base</artifactId>
   <version>1.1.0-SNAPSHOT</version>
-  <url>http://github.com/stackforge/monasca-thresh</url>
+  <url>http://github.com/openstack/monasca-thresh</url>
   <packaging>pom</packaging>
 
   <properties>
@@ -17,8 +17,8 @@
   </properties>
 
   <scm>
-    <connection>scm:git:git@github.com:stackforge/monasca-thresh</connection>
-    <developerConnection>scm:git:git@github.com:stackforge/monasca-thresh</developerConnection>
+    <connection>scm:git:git@github.com:openstack/monasca-thresh</connection>
+    <developerConnection>scm:git:git@github.com:openstack/monasca-thresh</developerConnection>
   </scm>
 
   <build>
diff --git a/thresh/pom.xml b/thresh/pom.xml
index da467b7..2e80487 100644
--- a/thresh/pom.xml
+++ b/thresh/pom.xml
@@ -6,7 +6,7 @@
     <groupId>monasca</groupId>
     <artifactId>monasca-thresh</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <url>http://github.com/stackforge/monasca-thresh</url>
+    <url>http://github.com/openstack/monasca-thresh</url>
     <packaging>jar</packaging>
 
 <!--
@@ -39,8 +39,8 @@
     </properties>
 
     <scm>
-        <connection>scm:git:git@github.com:stackforge/monasca-thresh</connection>
-        <developerConnection>scm:git:git@github.com:stackforge/monasca-thresh</developerConnection>
+        <connection>scm:git:git@github.com:openstack/monasca-thresh</connection>
+        <developerConnection>scm:git:git@github.com:openstack/monasca-thresh</developerConnection>
     </scm>
 
     <repositories>