diff --git a/cookbooks/nova/recipes/novascript.rb b/cookbooks/nova/recipes/novascript.rb
index ec35c5a..b383c78 100644
--- a/cookbooks/nova/recipes/novascript.rb
+++ b/cookbooks/nova/recipes/novascript.rb
@@ -38,8 +38,8 @@
   group node[:nova][:creds][:group]
 end
 
-execute "cp -r /tmp/bzr tmp/deploy" do
-  not_if { File.exists?("/tmp/deploy") }
+execute "cp -r /tmp/bzr /tmp/deploy/nova" do
+  only_if { File.exists?("/tmp/bzr/.bzr") }
   user node[:nova][:creds][:user]
   group node[:nova][:creds][:group]
 end
@@ -51,11 +51,13 @@
 end
 
 execute "rm -rf /tmp/deploy/nova" do
+  not_if { File.exists?("/tmp/bzr/.bzr") }
   user node[:nova][:creds][:user]
   group node[:nova][:creds][:group]
 end
 
 execute "../deploy.sh/nova.sh branch #{node[:nova][:source_branch]}" do
+  not_if { File.exists?("/tmp/bzr/.bzr") }
   cwd "/tmp/deploy"
   user node[:nova][:creds][:user]
   group node[:nova][:creds][:group]