diff --git a/common/data.tf b/common/data.tf
index ffd5ed3..8620450 100644
--- a/common/data.tf
+++ b/common/data.tf
@@ -42,9 +42,9 @@ data "aws_servicecatalog_provisioning_artifacts" "this" {
 }
 
 data "external" "portfolio" {
-  program = ["bash", "-c", "aws servicecatalog list-portfolios --region ${local.region} --query 'PortfolioDetails[?contains(Name, `Service Portfolio for`)] | [0] | {id: id}' --output json"]
+  program = ["bash", "-c", "aws servicecatalog list-portfolios --region ${local.region} --query PortfolioDetails[?contains(DisplayName, 'Service Portfolio for')] | [0] | {id: Id}"]
 }
 
 data "external" "product" {
-  program = ["bash", "-c", "aws servicecatalog search-products --region ${local.region} --filters 'SearchQuery=EC2 Instance' --query 'ProductViewSummaries[?contains(Name, `RHEL`)] | [0] | {id: ProductId}' --output json"]
+  program = ["bash", "-c", "aws servicecatalog search-products --region ${local.region} --query ProductViewSummaries[?contains(Name, 'RHEL')] | [0] | {id: ProductId}"]
 }