diff --git a/.gitreview b/.gitreview
index b5c2ad65dc..29933f1d04 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
 host=review.openstack.org
 port=29418
-project=stackforge/tripleo-heat-templates.git
+project=openstack/tripleo-heat-templates.git
diff --git a/nova-compute-group.yaml b/nova-compute-group.yaml
index 89f4a75f44..03fd476e02 100644
--- a/nova-compute-group.yaml
+++ b/nova-compute-group.yaml
@@ -35,7 +35,7 @@ Parameters:
     Type: String
   NovaComputeTemplate:
     Type: String
-    Default: https://raw.github.com/stackforge/tripleo-heat-templates/master/nova-compute-instance.yaml
+    Default: https://raw.github.com/openstack/tripleo-heat-templates/master/nova-compute-instance.yaml
   NovaDSN:
     Type: String
   NeutronDSN: