diff --git a/gso/workflows/switch/terminate_switch.py b/gso/workflows/switch/terminate_switch.py
index 01f149b1dae9717a955afbb78636942ce5d26e71..11acaabd044fe079b6873d0dbf81227c68aed7dd 100644
--- a/gso/workflows/switch/terminate_switch.py
+++ b/gso/workflows/switch/terminate_switch.py
@@ -30,8 +30,9 @@ def _input_form_generator(subscription_id: UUIDstr) -> FormGenerator:
 
         tt_number: TTNumber
 
-    yield TerminateForm
-    return {"subscription": switch}
+    user_input = yield TerminateForm
+
+    return {"subscription": switch} | user_input.model_dump()
 
 
 @step("Remove switch from Netbox")