diff --git a/modules/runners/main.tf b/modules/runners/main.tf
index 5baaa09672..fe624f256c 100644
--- a/modules/runners/main.tf
+++ b/modules/runners/main.tf
@@ -206,6 +206,34 @@ resource "aws_launch_template" "runner" {
     )
   }
 
+  tag_specifications {
+    resource_type = "spot-instances-request"
+    tags = merge(
+      local.tags,
+      {
+        "Name" = format("%s", local.name_runner)
+      },
+      {
+        "ghr:runner_name_prefix" = var.runner_name_prefix
+      },
+      var.runner_ec2_tags
+    )
+  }
+
+  tag_specifications {
+    resource_type = "network-interface"
+    tags = merge(
+      local.tags,
+      {
+        "Name" = format("%s", local.name_runner)
+      },
+      {
+        "ghr:runner_name_prefix" = var.runner_name_prefix
+      },
+      var.runner_ec2_tags
+    )
+  }
+
   user_data = var.runner_os == "windows" ? base64encode(local.user_data) : base64gzip(local.user_data)
 
   tags = local.tags
diff --git a/modules/runners/pool/main.tf b/modules/runners/pool/main.tf
index a10bdd042a..49ab15b2c1 100644
--- a/modules/runners/pool/main.tf
+++ b/modules/runners/pool/main.tf
@@ -189,7 +189,7 @@ resource "aws_iam_role" "scheduler" {
   permissions_boundary = var.config.role_permissions_boundary
 
   assume_role_policy = data.aws_iam_policy_document.scheduler_assume.json
-  tags = var.config.tags
+  tags               = var.config.tags
 }
 
 resource "aws_iam_role_policy" "scheduler" {