diff --git a/.fixtures.yml b/.fixtures.yml
index 249215fd..76f284c2 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -1,35 +1,52 @@
 fixtures:
   repositories:
-    'cinder': 'git://github.com/stackforge/puppet-cinder'
-    'keystone': 'git://github.com/stackforge/puppet-keystone.git'
-    'nova': 'git://github.com/stackforge/puppet-nova.git'
-    'glance': 'git://github.com/stackforge/puppet-glance.git'
-    'horizon': 'git://github.com/stackforge/puppet-horizon'
-    'swift' : 'git://github.com/stackforge/puppet-swift'
-    'neutron': 'git://github.com/stackforge/puppet-neutron'
-    'ceilometer' : 'git://github.com/stackforge/puppet-ceilometer'
-    'heat' : 'git://github.com/stackforge/puppet-heat'
-    'apt': 'git://github.com/puppetlabs/puppetlabs-apt.git'
-    'apache': 'git://github.com/puppetlabs/puppetlabs-apache.git'
-    'concat': 'git://github.com/puppetlabs/puppetlabs-concat.git'
-    'haproxy': 'git://github.com/puppetlabs/puppetlabs-haproxy.git'
-    'keepalived': 'git://github.com/Unyonsys/puppet-module-keepalived.git'
-    'firewall': 'git://github.com/puppetlabs/puppetlabs-firewall.git'
-    'mongodb': 'git://github.com/puppetlabs/puppetlabs-mongodb.git'
+    'cinder':
+      repo: 'git://github.com/enovance/puppet-cinder'
+      ref: 'origin/stable/havana'
+    'keystone':
+      repo: 'git://github.com/enovance/puppet-keystone.git'
+      ref: 'origin/stable/havana'
+    'nova':
+      repo: 'git://github.com/enovance/puppet-nova.git'
+      ref: 'origin/stable/havana'
+    'glance':
+      repo: 'git://github.com/enovance/puppet-glance.git'
+      ref: 'origin/stable/havana'
+    'horizon':
+      repo: 'git://github.com/enovance/puppet-horizon'
+      ref: 'origin/stable/havana'
+    'swift':
+      repo: 'git://github.com/enovance/puppet-swift'
+      ref: 'origin/stable/havana'
+    'neutron':
+      repo: 'git://github.com/enovance/puppet-neutron'
+      ref: 'origin/stable/havana'
+    'ceilometer':
+      repo: 'git://github.com/enovance/puppet-ceilometer'
+      ref: 'origin/stable/havana'
+    'heat':
+      repo: 'git://github.com/enovance/puppet-heat'
+      ref: 'origin/stable/havana'
+    'apt': 'git://github.com/enovance/puppetlabs-apt.git'
+    'apache': 'git://github.com/enovance/puppetlabs-apache.git'
+    'concat': 'git://github.com/enovance/puppet-concat.git'
+    'haproxy': 'git://github.com/enovance/puppetlabs-haproxy.git'
+    'keepalived': 'git://github.com/enovance/puppet-module-keepalived.git'
+    'mongodb': 'git://github.com/enovance/puppetlabs-mongodb.git'
     'mysql':
-      repo: 'git://github.com/puppetlabs/puppetlabs-mysql.git'
+      repo: 'git://github.com/enovance/puppetlabs-mysql.git'
       ref: 'origin/0.x'
     'rabbitmq':
-      repo: 'git://github.com/puppetlabs/puppetlabs-rabbitmq'
+      repo: 'git://github.com/enovance/puppetlabs-rabbitmq'
       ref: 'origin/2.x'
-    'memcached': 'git://github.com/saz/puppet-memcached'
+    'memcached': 'git://github.com/enovance/puppet-memcached'
     'ntp': 'git://github.com/enovance/puppetlabs-ntp.git'
-    'sysctl': 'git://github.com/duritong/puppet-sysctl.git'
-    'inifile':  'git://github.com/puppetlabs/puppetlabs-inifile'
-    'vswitch': 'git://github.com/stackforge/puppet-vswitch'
-    'tempest': 'git://github.com/stackforge/puppet-tempest'
-    'vcsrepo': 'git://github.com/puppetlabs/puppetlabs-vcsrepo'
-    'stdlib': 'git://github.com/puppetlabs/puppetlabs-stdlib.git'
-    'xinetd': 'git://github.com/puppetlabs/puppetlabs-xinetd.git'
+    'sysctl': 'git://github.com/enovance/puppet-sysctl.git'
+    'inifile':  'git://github.com/enovance/puppetlabs-inifile'
+    'vswitch': 'git://github.com/enovance/puppet-vswitch'
+    'tempest': 'git://github.com/enovance/puppet-tempest'
+    'vcsrepo': 'git://github.com/enovance/puppetlabs-vcsrepo'
+    'stdlib': 'git://github.com/enovance/puppetlabs-stdlib.git'
+    'xinetd': 'git://github.com/enovance/puppetlabs-xinetd.git'
   symlinks:
     'cloud': '#{source_dir}'