diff --git a/attributes/default.rb b/attributes/default.rb
index 36fbd15..151acb9 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -7,6 +7,7 @@
 default[:ebs][:raids] = {}
 default[:ebs][:mdadm_chunk_size] = '256'
 default[:ebs][:md_read_ahead] = '65536' # 64k
+default[:ebs][:delete_on_termination] = nil
 default[:ebs][:initrd_md5] = ''
 
 
diff --git a/recipes/raids.rb b/recipes/raids.rb
index 9493fe9..165be31 100644
--- a/recipes/raids.rb
+++ b/recipes/raids.rb
@@ -30,6 +30,7 @@
       aws_ebs_volume mount do
         aws_access_key credentials[node.ebs.creds.aki]
         aws_secret_access_key credentials[node.ebs.creds.sak]
+	delete_on_termination node[:ebs][:delete_on_termination]
         size options[:disk_size]
         device mount
         availability_zone node[:ec2][:placement_availability_zone]
@@ -151,5 +152,6 @@
     mode 0755
     owner 'root'
     group 'root'
+    manage_symlink_source true
   end
 end
diff --git a/recipes/volumes.rb b/recipes/volumes.rb
index f990655..72a628e 100644
--- a/recipes/volumes.rb
+++ b/recipes/volumes.rb
@@ -19,11 +19,12 @@
     vol = aws_ebs_volume device do
       aws_access_key credentials[node.ebs.creds.aki]
       aws_secret_access_key credentials[node.ebs.creds.sak]
+      delete_on_termination node[:ebs][:delete_on_termination]
+      piops options[:piops]
       size options[:size]
       device device
       availability_zone node[:ec2][:placement_availability_zone]
       volume_type options[:piops] ? 'io1' : 'standard'
-      piops options[:piops]
       action :nothing
     end
     vol.run_action(:create)