diff --git a/Rakefile b/Rakefile
index 357a6c0b..238c4388 100644
--- a/Rakefile
+++ b/Rakefile
@@ -24,3 +24,18 @@ task :clean do
     'Berksfile.lock'
   ]
 end
+
+desc "All-in-One Neutron build Infra"
+task :integration do
+  # Use the berksfile REPO_DEV support to make use of the existing patch clone.
+  # Make a sym link from workspace/gate-cookbook-openstack-common-chef-rake-integration
+  # to workspace/cookbook-openstack-common
+  patch_dir = Dir.pwd
+  patch_dir_berks = ENV['ZUUL_PROJECT'].split('/')[1]
+  sh %(ln -s #{patch_dir} ../#{patch_dir_berks})
+
+  sh %(git clone --depth 1 git://github.com/stackforge/openstack-chef-repo.git ../openstack-chef-repo)
+  Dir.chdir('../openstack-chef-repo') do
+    sh %(REPO_DEV=ON chef exec rake integration)
+  end
+end
diff --git a/bootstrap.sh b/bootstrap.sh
index c163c0a0..fc254b6e 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -8,6 +8,7 @@ sudo apt-get -y install build-essential liblzma-dev zlib1g-dev
 chefdk=chefdk_0.4.0-1_amd64.deb
 wget -nv -t 3 https://opscode-omnibus-packages.s3.amazonaws.com/ubuntu/12.04/x86_64/$chefdk
 sudo dpkg -i $chefdk
+rm $chefdk
 
 ## workaround to fix redhat fauxhai permission issue (can be removed with fauxhai > 2.3 in chefdk)
 sudo chef exec ruby -e "require 'fauxhai'; Fauxhai.mock(platform:'redhat', version:'7.1')"