diff --git a/pkg/asset/cluster/aws/aws.go b/pkg/asset/cluster/aws/aws.go
index 61c9f4dfaea..a5237212069 100644
--- a/pkg/asset/cluster/aws/aws.go
+++ b/pkg/asset/cluster/aws/aws.go
@@ -9,11 +9,13 @@ import (
 )
 
 // Metadata converts an install configuration to AWS metadata.
-func Metadata(infraID string, config *types.InstallConfig) *aws.Metadata {
+func Metadata(clusterID, infraID string, config *types.InstallConfig) *aws.Metadata {
 	return &aws.Metadata{
 		Region: config.Platform.AWS.Region,
 		Identifier: []map[string]string{{
 			fmt.Sprintf("kubernetes.io/cluster/%s", infraID): "owned",
+		}, {
+			"openshiftClusterID": clusterID,
 		}},
 	}
 }
diff --git a/pkg/asset/cluster/metadata.go b/pkg/asset/cluster/metadata.go
index bacf0661486..b720da11538 100644
--- a/pkg/asset/cluster/metadata.go
+++ b/pkg/asset/cluster/metadata.go
@@ -57,7 +57,7 @@ func (m *Metadata) Generate(parents asset.Parents) (err error) {
 
 	switch {
 	case installConfig.Config.Platform.AWS != nil:
-		metadata.ClusterPlatformMetadata.AWS = aws.Metadata(clusterID.InfraID, installConfig.Config)
+		metadata.ClusterPlatformMetadata.AWS = aws.Metadata(clusterID.UUID, clusterID.InfraID, installConfig.Config)
 	case installConfig.Config.Platform.Libvirt != nil:
 		metadata.ClusterPlatformMetadata.Libvirt = libvirt.Metadata(installConfig.Config)
 	case installConfig.Config.Platform.OpenStack != nil: