diff --git a/scripts/openstack-cleanup/main.py b/scripts/openstack-cleanup/main.py
index 511f06087..2ddccc067 100755
--- a/scripts/openstack-cleanup/main.py
+++ b/scripts/openstack-cleanup/main.py
@@ -59,6 +59,9 @@ def main():
                     except Exception as ex:
                         print("Failed to delete subnet from router as %s", ex)
 
+        for ip in conn.network.ips():
+            fn_if_old(conn.network.delete_ip, ip)
+                
         # After removing unnecessary subnet from router, retry to delete ports
         map_if_old(conn.network.delete_port,
                    conn.network.ports())