diff --git a/modules/multi-runner/README.md b/modules/multi-runner/README.md
index bb594e83f0..1e399a1a1c 100644
--- a/modules/multi-runner/README.md
+++ b/modules/multi-runner/README.md
@@ -196,6 +196,7 @@ module "multi-runner" {
 | Name | Description |
 |------|-------------|
 | <a name="output_binaries_syncer_map"></a> [binaries\_syncer\_map](#output\_binaries\_syncer\_map) | n/a |
+| <a name="output_instance_termination_handler"></a> [instance\_termination\_handler](#output\_instance\_termination\_handler) | n/a |
 | <a name="output_instance_termination_watcher"></a> [instance\_termination\_watcher](#output\_instance\_termination\_watcher) | n/a |
 | <a name="output_queues"></a> [queues](#output\_queues) | SQS queues. |
 | <a name="output_runners_map"></a> [runners\_map](#output\_runners\_map) | n/a |
diff --git a/modules/multi-runner/outputs.tf b/modules/multi-runner/outputs.tf
index 47363ef35f..bc6624be27 100644
--- a/modules/multi-runner/outputs.tf
+++ b/modules/multi-runner/outputs.tf
@@ -53,9 +53,17 @@ output "queues" {
 }
 
 output "instance_termination_watcher" {
-  value = var.instance_termination_watcher.enable ? {
-    lambda           = module.instance_termination_watcher[0].lambda.function
-    lambda_log_group = module.instance_termination_watcher[0].lambda.log_group
-    lambda_role      = module.instance_termination_watcher[0].lambda.role
+  value = var.instance_termination_watcher.enable && var.instance_termination_watcher.features.enable_spot_termination_notification_watcher ? {
+    lambda           = module.instance_termination_watcher[0].spot_termination_notification.lambda
+    lambda_log_group = module.instance_termination_watcher[0].spot_termination_notification.lambda_log_group
+    lambda_role      = module.instance_termination_watcher[0].spot_termination_notification.lambda_role
+  } : null
+}
+
+output "instance_termination_handler" {
+  value = var.instance_termination_watcher.enable && var.instance_termination_watcher.features.enable_spot_termination_handler ? {
+    lambda           = module.instance_termination_watcher[0].spot_termination_handler.lambda
+    lambda_log_group = module.instance_termination_watcher[0].spot_termination_handler.lambda_log_group
+    lambda_role      = module.instance_termination_watcher[0].spot_termination_handler.lambda_role
   } : null
 }