diff --git a/bonfire/bonfire.py b/bonfire/bonfire.py
index 0d9398a0..c8fdfcb9 100755
--- a/bonfire/bonfire.py
+++ b/bonfire/bonfire.py
@@ -44,7 +44,7 @@
     get_namespaces,
     extend_namespace,
     reserve_namespace,
-    release_namespace,
+    release_reservation,
 )
 from bonfire.secrets import import_secrets_from_dir
 
@@ -637,7 +637,7 @@ def _cmd_namespace_release(namespace, force, local):
     if not force:
         _warn_before_delete()
 
-    release_namespace(namespace, local)
+    release_reservation(namespace=namespace, local=local)
 
 
 @namespace.command("extend")
@@ -923,7 +923,7 @@ def _err_handler(err):
                 # if we auto-reserved this ns, auto-release it on failure unless
                 # --no-release-on-fail was requested
                 log.info("releasing namespace '%s'", ns)
-                release_namespace(ns)
+                release_reservation(namespace=ns)
         finally:
             msg = "deploy failed"
             if str(err):
diff --git a/bonfire/namespaces.py b/bonfire/namespaces.py
index 4f18b3e0..7c6dac20 100644
--- a/bonfire/namespaces.py
+++ b/bonfire/namespaces.py
@@ -15,6 +15,7 @@
 )
 from bonfire.processor import process_reservation
 from bonfire.utils import FatalError, hms_to_seconds
+from wait_for import TimedOutError
 
 
 log = logging.getLogger(__name__)
@@ -257,21 +258,25 @@ def reserve_namespace(name, requester, duration, timeout, local=True):
 
     apply_config(None, list_resource=res_config)
 
-    ns_name = wait_on_reservation(res_name, timeout)
+    try:
+        ns_name = wait_on_reservation(res_name, timeout)
+    except TimedOutError:
+        log.info("timeout waiting for namespace. Cancelling reservation.")
+        release_reservation(name=res_name)
+        raise
+
     log.info(
         "namespace '%s' is reserved by '%s' for '%s'",
         ns_name,
         requester,
         duration,
     )
-    if not ns_name:
-        raise FatalError("Reservation of namespace failed.")
 
     return Namespace(name=ns_name)
 
 
-def release_namespace(namespace, local=True):
-    res = get_reservation(namespace=namespace)
+def release_reservation(name=None, namespace=None, local=True):
+    res = get_reservation(name=name, namespace=namespace)
     if res:
         res_config = process_reservation(
             res["metadata"]["name"],
@@ -281,7 +286,10 @@ def release_namespace(namespace, local=True):
         )
 
         apply_config(None, list_resource=res_config)
-        log.info("releasing namespace '%s'", namespace)
+        msg = f"releasing reservation '{name}'"
+        if namespace:
+            msg += f" namespace '{namespace}'"
+        log.info(msg)
     else:
         raise FatalError("Reservation lookup failed")