diff --git a/templates/aws-stack.yml b/templates/aws-stack.yml
index 9716a0dd6..d1e6f815c 100644
--- a/templates/aws-stack.yml
+++ b/templates/aws-stack.yml
@@ -2550,6 +2550,13 @@ Resources:
         - OldestLaunchConfiguration
         - ClosestToNextInstanceHour
       NewInstancesProtectedFromScaleIn: !Ref InstanceScaleInProtection
+      Tags:
+        - Key: BuildkiteQueue
+          PropagateAtLaunch: false
+          Value: !Ref BuildkiteQueue
+        - Key: AgentsPerInstance
+          PropagateAtLaunch: false
+          Value: !Ref AgentsPerInstance
     CreationPolicy:
       ResourceSignal:
         Timeout: !If [ UseDefaultInstanceCreationTimeout, !If [ UseWindowsAgents, PT10M, PT5M ], !Ref InstanceCreationTimeout ]