diff --git a/.gitreview b/.gitreview
index 9df36b5..09b9c72 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
 host=review.openstack.org
 port=29418
-project=openstack/vmtp.git
+project=x/vmtp.git
diff --git a/vmtp/compute.py b/vmtp/compute.py
index 70e71fb..5f6fb72 100644
--- a/vmtp/compute.py
+++ b/vmtp/compute.py
@@ -230,7 +230,12 @@ class Compute(object):
         return False
 
     def delete_server(self, server):
-        self.novaclient.servers.delete(server)
+        for _ in range(1, 5):
+            try:
+                self.novaclient.servers.delete(server)
+            except novaclient.exceptions.NotFound:
+                break
+            time.sleep(2)
 
     def find_flavor(self, flavor_type):
         try: