diff --git a/cleanup.py b/cleanup.py
index e631bc237159dcd6cbaa698fcd63b019e29a8ed1..ee084025fed9d3f664ee38842570299f8db2ed80 100644
--- a/cleanup.py
+++ b/cleanup.py
@@ -7,7 +7,7 @@ import os
 def main() -> None:
     conn = openstack.connect()
     for server in conn.compute.servers(name=env.VM_NAME):
-        conn.compute.delete_server(server, force=True)
+        conn.delete_server(server.id, wait=True, delete_ips=True)
     if os.path.exists(env.PRIVATE_KEY_PATH):
         os.remove(env.PRIVATE_KEY_PATH)
     conn.delete_keypair(env.KEY_PAIR_NAME)