diff --git a/addons/addon-base-raas/packages/base-raas-cfn-templates/src/templates/service-catalog/emr-cluster.cfn.yml b/addons/addon-base-raas/packages/base-raas-cfn-templates/src/templates/service-catalog/emr-cluster.cfn.yml
index 41cf152098..cdee4f9b5a 100644
--- a/addons/addon-base-raas/packages/base-raas-cfn-templates/src/templates/service-catalog/emr-cluster.cfn.yml
+++ b/addons/addon-base-raas/packages/base-raas-cfn-templates/src/templates/service-catalog/emr-cluster.cfn.yml
@@ -33,6 +33,15 @@ Parameters:
   KeyName:
     Description: SSH key pair to use for EMR node login
     Type: AWS::EC2::KeyPair::KeyName
+  SolutionNamespace:
+    Type: String
+    Description: The namespace value provided when onboarding the Member account
+    Default: ''
+  IsAppStreamEnabled:
+    Type: String
+    AllowedValues: [true, false]
+    Description: Is AppStream enabled for this workspace
+    Default: 'false'
   VPC:
     Description: VPC for EMR nodes.
     Type: AWS::EC2::VPC::Id
diff --git a/main/end-to-end-tests/cypress.github.json b/main/end-to-end-tests/cypress.github.json
index 5a8f4e3ba4..9b4a8a804e 100644
--- a/main/end-to-end-tests/cypress.github.json
+++ b/main/end-to-end-tests/cypress.github.json
@@ -25,7 +25,7 @@
         }
       },
       "emr": {
-        "workspaceTypeName": "EMR-v6",
+        "workspaceTypeName": "EMR-v7",
         "configuration": "emr-e2e",
         "projectId": "e2eTestProject"
       }