diff --git a/samples/eks-cluster-prework/templates/eks-cluster-prework.template.yaml b/samples/eks-cluster-prework/templates/eks-cluster-prework.template.yaml
index 62f6f18..e869ea2 100644
--- a/samples/eks-cluster-prework/templates/eks-cluster-prework.template.yaml
+++ b/samples/eks-cluster-prework/templates/eks-cluster-prework.template.yaml
@@ -1,9 +1,12 @@
 AWSTemplateFormatVersion: '2010-09-09'
 Description: "Amazon EKS PreWork pattern Blog"
 Parameters:
-  AccessCIDR:
-    Default: 0.0.0.0/0
+  PreworkJobName:
     Type: String
+    Default: 'example-job'
+  PreworkNameSpace:
+    Type: String
+    Default: 'example-job-ns'
   PreworkScriptBucket:
     Type: String
     Default: 'aws-quickstart'
@@ -16,13 +19,12 @@ Resources:
     Properties:
       TemplateURL: 'https://aws-quickstart.s3.amazonaws.com/quickstart-amazon-eks/templates/amazon-eks-entrypoint-new-vpc.template.yaml'
       Parameters:
-        # Quickstart properties
+        # AWS Quick Start properties
         QSS3BucketName: aws-quickstart
         QSS3KeyPrefix: quickstart-amazon-eks/
         QSS3BucketRegion: us-east-1
-        # Cluster properties
-        ProvisionBastionHost: Enabled
-        AccessCIDR: !Ref AccessCIDR
+        # Amazon EKS Cluster properties
+        ProvisionBastionHost: Disabled
         NodeInstanceType: t3.large
         NumberOfNodes: 1
         MaxNumberOfNodes: 1
@@ -34,5 +36,5 @@ Resources:
         ClusterName: !Sub "EKSStack.Outputs.EKSClusterName"
         PreworkScriptBucket: "aws-quickstart"
         PreworkScriptObject: "quickstart-examples/samples/eks-cluster-prework/scripts/pw-script.sh"
-        JobName: "ExampleJob"
-        KubernetesNameSpace: "prework-example"
+        JobName: !Ref "PreWorkJobName"
+        KubernetesNameSpace: !Ref "PreworkNamespace"