diff --git a/manifests/site.pp b/manifests/site.pp
index 050ba74..d9f7af5 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -52,11 +52,18 @@ node default {
     fail('Please enable full disk encryption and try again')
   }
 
-  repository { "${boxen::home}/repo":
+  # Setup real clone of our-boxen and link into BOXEN_HOME
+  repository { "${boxen::config::srcdir}/our-boxen":
     ensure => present,
     source => 'boxen/our-boxen'
   }
 
+  file { "${boxen::home}/repo":
+    ensure  => link,
+    target  => "${boxen::config::srcdir}/our-boxen",
+    require => Repository["${boxen::config::srcdir}/our-boxen"]
+  }
+
   # node versions
   include nodejs::0-4
   include nodejs::0-6