diff --git a/tools/deployment/clean.sh b/tools/deployment/clean.sh
index e8e36ccca..2dca4d06d 100755
--- a/tools/deployment/clean.sh
+++ b/tools/deployment/clean.sh
@@ -21,7 +21,11 @@ sudo service apache2 stop
 vm_types='ephemeral|target|worker'
 
 vol_list=$(sudo virsh vol-list --pool airship | grep -E $vm_types | awk '{print $1}')
+iso_list=$(sudo virsh vol-list --pool default | awk '{print $1}'| grep -i 'ubuntu.*\.img$')
 vm_list=$(sudo virsh list --all | grep -E $vm_types | awk '{print $2}')
+net_list=$(sudo virsh net-list --all | awk '{print $1}'| grep -i air)
 
-for vm in $vm_list; do sudo virsh destroy $vm; sudo virsh undefine $vm --nvram; done
+for vm in $vm_list; do sudo virsh destroy $vm; sudo virsh undefine $vm --nvram --remove-all-storage; done
 for vol in $vol_list; do sudo virsh vol-delete $vol --pool airship; done
+for iso in $iso_list; do sudo virsh vol-delete $iso --pool default; done
+for net in $net_list; do sudo virsh net-destroy $net; sudo virsh net-undefine $net; done