diff --git a/lib/integrations/awsoidc/listec2_test.go b/lib/integrations/awsoidc/listec2_test.go
index 25088264228a8..f21bcad3941cb 100644
--- a/lib/integrations/awsoidc/listec2_test.go
+++ b/lib/integrations/awsoidc/listec2_test.go
@@ -178,8 +178,9 @@ func TestListEC2(t *testing.T) {
 					SubKind: "openssh-ec2-ice",
 					Metadata: types.Metadata{
 						Labels: map[string]string{
-							"account-id": "123456789012",
-							"region":     "us-east-1",
+							"account-id":               "123456789012",
+							"region":                   "us-east-1",
+							"teleport.dev/instance-id": "i-123456789abcedf",
 						},
 						Namespace: "default",
 					},
diff --git a/lib/services/server.go b/lib/services/server.go
index bdae1046d7d74..87bf4cdaa4c29 100644
--- a/lib/services/server.go
+++ b/lib/services/server.go
@@ -443,7 +443,10 @@ func NewAWSNodeFromEC2Instance(instance ec2Types.Instance, awsCloudMetadata *typ
 	}
 	libaws.AddMetadataLabels(labels, awsCloudMetadata.AccountID, awsCloudMetadata.Region)
 
-	awsCloudMetadata.InstanceID = aws.ToString(instance.InstanceId)
+	instanceID := aws.ToString(instance.InstanceId)
+	labels[types.AWSInstanceIDLabel] = instanceID
+
+	awsCloudMetadata.InstanceID = instanceID
 	awsCloudMetadata.VPCID = aws.ToString(instance.VpcId)
 	awsCloudMetadata.SubnetID = aws.ToString(instance.SubnetId)
 
diff --git a/lib/services/server_test.go b/lib/services/server_test.go
index 866933d6762d4..cbe41af11e8ed 100644
--- a/lib/services/server_test.go
+++ b/lib/services/server_test.go
@@ -74,9 +74,10 @@ func TestNewAWSNodeFromEC2Instance(t *testing.T) {
 				SubKind: "openssh-ec2-ice",
 				Metadata: types.Metadata{
 					Labels: map[string]string{
-						"account-id": "1234567889012",
-						"region":     "us-east-1",
-						"MyTag":      "MyTagValue",
+						"account-id":               "1234567889012",
+						"region":                   "us-east-1",
+						"MyTag":                    "MyTagValue",
+						"teleport.dev/instance-id": "i-123456789abcedf",
 					},
 					Namespace: "default",
 				},
@@ -120,9 +121,10 @@ func TestNewAWSNodeFromEC2Instance(t *testing.T) {
 				SubKind: "openssh-ec2-ice",
 				Metadata: types.Metadata{
 					Labels: map[string]string{
-						"account-id": "1234567889012",
-						"region":     "us-east-1",
-						"MyTag":      "MyTagValue",
+						"account-id":               "1234567889012",
+						"region":                   "us-east-1",
+						"MyTag":                    "MyTagValue",
+						"teleport.dev/instance-id": "i-123456789abcedf",
 					},
 					Namespace: "default",
 				},