diff --git a/aws/eks-cluster/data.tf b/aws/eks-cluster/data.tf
index 783b0787d..31bda7d38 100644
--- a/aws/eks-cluster/data.tf
+++ b/aws/eks-cluster/data.tf
@@ -1,6 +1,6 @@
 data "tfe_outputs" "infra" {
   organization = var.tf_cloud_organization
-  workspace = "infra"
+  workspace = "${coalesce(var.aws_waf_ce, "infra")}"
 }
 
 data "aws_instances" "my_worker_nodes" {