diff --git a/README.md b/README.md
index ca7f6a38..f88e7a95 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ The number of output processors/threads in the Persister can be specified to sca
 
 # Build
 
-Requires monasca-common from https://github.com/stackforge/monasca-common. Download and build following instructions in its README.md. Then build monasca-persister by:
+Requires monasca-common from https://github.com/openstack/monasca-common. Download and build following instructions in its README.md. Then build monasca-persister by:
 
 ```
 mvn clean package
@@ -21,7 +21,7 @@ mvn clean package
 
 A sample configuration file is available in java/src/deb/etc/persister-config.yml-sample.
 
-A second configuration file is provided in java/src/main/resources/persister-config.yml for use with the [vagrant "mini-mon" development environment](https://github.com/stackforge/monasca-vagrant/).
+A second configuration file is provided in java/src/main/resources/persister-config.yml for use with the [vagrant "mini-mon" development environment](https://github.com/openstack/monasca-vagrant/).
 
 # TODO
 
diff --git a/common/build_common.sh b/common/build_common.sh
index 70801fe0..865ac050 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 c1001dd2..f0b4a448 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -5,7 +5,7 @@
   <groupId>monasca-persister</groupId>
   <artifactId>monasca-persister-common</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  <url>http://github.com/stackforge/monasca-persister</url>
+  <url>http://github.com/openstack/monasca-persister</url>
   <packaging>pom</packaging>
 
   <properties>
diff --git a/java/pom.xml b/java/pom.xml
index 5de07267..e21a1dd1 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -7,7 +7,7 @@
     <groupId>monasca</groupId>
     <artifactId>monasca-persister</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <url>http://github.com/stackforge/monasca-persister</url>
+    <url>http://github.com/openstack/monasca-persister</url>
     <packaging>jar</packaging>
 
     <prerequisites>
@@ -33,8 +33,8 @@
 
     <!--Needed for buildnumber-maven-plugin-->
     <scm>
-        <connection>scm:git:git@github.com:stackforge/monasca-persister</connection>
-        <developerConnection>scm:git:git@github.com:stackforge/monasca-persister
+        <connection>scm:git:git@github.com:openstack/monasca-persister</connection>
+        <developerConnection>scm:git:git@github.com:openstack/monasca-persister
         </developerConnection>
     </scm>
 
diff --git a/pom.xml b/pom.xml
index 06ed2ba7..71afde8c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
   <groupId>monasca</groupId>
   <artifactId>monasca-persister-base</artifactId>
   <version>1.1.0-SNAPSHOT</version>
-  <url>http://github.com/stackforge/monasca-persister</url>
+  <url>http://github.com/openstack/monasca-persister</url>
   <packaging>pom</packaging>
 
   <properties>
@@ -17,8 +17,8 @@
   </properties>
 
   <scm>
-    <connection>scm:git:git@github.com:stackforge/monasca-persister</connection>
-    <developerConnection>scm:git:git@github.com:stackforge/monasca-persister</developerConnection>
+    <connection>scm:git:git@github.com:openstack/monasca-persister</connection>
+    <developerConnection>scm:git:git@github.com:openstack/monasca-persister</developerConnection>
   </scm>
 
   <build>
diff --git a/setup.cfg b/setup.cfg
index fe029625..ec90a3b6 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -8,7 +8,7 @@ classifier=
   Topic :: System :: Monitoring
 keywords = openstack monitoring storage
 description-file = README.md
-home-page = https://github.com/stackforge/monasca-persister
+home-page = https://github.com/openstack/monasca-persister
 license = Apache
 
 [entry_points]