diff --git a/Berksfile b/Berksfile
index 31dfccf..4854546 100644
--- a/Berksfile
+++ b/Berksfile
@@ -3,14 +3,14 @@ source "https://supermarket.chef.io"
 metadata
 
 cookbook "openstack-bare-metal",
-  github: "stackforge/cookbook-openstack-bare-metal"
+  github: "openstack/cookbook-openstack-bare-metal"
 cookbook "openstack-common",
-  github: "stackforge/cookbook-openstack-common"
+  github: "openstack/cookbook-openstack-common"
 cookbook "openstack-compute",
-  github: "stackforge/cookbook-openstack-compute"
+  github: "openstack/cookbook-openstack-compute"
 cookbook "openstack-identity",
-  github: "stackforge/cookbook-openstack-identity"
+  github: "openstack/cookbook-openstack-identity"
 cookbook "openstack-image",
-  github: "stackforge/cookbook-openstack-image"
+  github: "openstack/cookbook-openstack-image"
 cookbook "openstack-network",
-  github: "stackforge/cookbook-openstack-network"
+  github: "openstack/cookbook-openstack-network"
diff --git a/TESTING.md b/TESTING.md
index 10f1fe3..f9b28bf 100644
--- a/TESTING.md
+++ b/TESTING.md
@@ -1,6 +1,6 @@
 # Testing the Cookbook #
 
-This cookbook uses [chefdk](https://downloads.chef.io/chef-dk/) and [berkshelf](http://berkshelf.com/) to isolate dependencies. Make sure you have chefdk and the header files for `gecode` installed before continuing. Make sure that you're using gecode version 3. More info [here](https://github.com/opscode/dep-selector-libgecode/tree/0bad63fea305ede624c58506423ced697dd2545e#using-a-system-gecode-instead). For more detailed information on what needs to be installed, you can have a quick look into the bootstrap.sh file in this repository, which does install all the needed things to get going on ubuntu trusty. The tests defined in the Rakefile include lint, style and unit. For integration testing please refere to the [openstack-chef-repo](https://github.com/stackforge/openstack-chef-repo).
+This cookbook uses [chefdk](https://downloads.chef.io/chef-dk/) and [berkshelf](http://berkshelf.com/) to isolate dependencies. Make sure you have chefdk and the header files for `gecode` installed before continuing. Make sure that you're using gecode version 3. More info [here](https://github.com/opscode/dep-selector-libgecode/tree/0bad63fea305ede624c58506423ced697dd2545e#using-a-system-gecode-instead). For more detailed information on what needs to be installed, you can have a quick look into the bootstrap.sh file in this repository, which does install all the needed things to get going on ubuntu trusty. The tests defined in the Rakefile include lint, style and unit. For integration testing please refere to the [openstack-chef-repo](https://github.com/openstack/openstack-chef-repo).
 
 We have three test suites which you can run either, individually (there are three rake tasks):
 
diff --git a/bootstrap.sh b/bootstrap.sh
index f38a960..fe49ef2 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,8 +1,8 @@
 #!/bin/bash -x
 ## This script is for installing all the needed packages on trusty to run the chef tests with 'chef exec rake'.
-## It relies on the common bootstrap.sh from stackforge/cookbook-openstack-common for installing common dependencies.
+## It relies on the common bootstrap.sh from openstack/cookbook-openstack-common for installing common dependencies.
 
-curl https://raw.githubusercontent.com/stackforge/cookbook-openstack-common/master/bootstrap.sh \
+curl https://raw.githubusercontent.com/openstack/cookbook-openstack-common/master/bootstrap.sh \
   --retry 3 \
   --silent \
   --show-error \