diff --git a/Amazon/Marketplace/v7153/templates/jfrog-artifactory-ec2-existing-vpc.template.yaml b/Amazon/Marketplace/v7153/templates/jfrog-artifactory-ec2-existing-vpc.template.yaml
index bf67044..f5dd1a0 100644
--- a/Amazon/Marketplace/v7153/templates/jfrog-artifactory-ec2-existing-vpc.template.yaml
+++ b/Amazon/Marketplace/v7153/templates/jfrog-artifactory-ec2-existing-vpc.template.yaml
@@ -61,11 +61,6 @@ Metadata:
           - DatabaseInstance
           - DatabaseAllocatedStorage
           - MultiAzDatabase
-      - Label:
-          default: AWS Quick Start configuration
-        Parameters:
-          - QsS3BucketName
-          - QsS3KeyPrefix
       - Label:
           default: JFrog Xray Configuration
         Parameters:
@@ -152,16 +147,8 @@ Metadata:
         default: Database allocated storage
       MultiAzDatabase:
         default: High-availability database
-      QsS3BucketName:
-        default: Quick Start S3 bucket name
-      QsS3KeyPrefix:
-        default: Quick Start S3 key prefix
-      QsS3BucketRegion:
-        default: Quick Start S3 bucket region
       InstallXray:
         default: Install JFrog Xray
-      XrayVersion:
-        default: Version of Xray to install
       XrayNumberOfInstances:
         default: Number of JFrog Xray instances
       XrayInstanceType:
@@ -173,6 +160,8 @@ Metadata:
 Parameters:
   AvailabilityZones:
     Description: List of Availability Zones to use for the subnets in the VPC. Two
+      XrayVersion:
+        default: Version of Xray to install
       Availability Zones are used for this deployment.
     Type: List<AWS::EC2::AvailabilityZone::Name>
   KeyPairName:
@@ -461,28 +450,6 @@ Parameters:
       - "false"
     Default: "true"
     Type: String
-  QsS3BucketName:
-    Description: S3 bucket name for the Quick Start assets. This string can include
-      numbers, lowercase letters, and hyphens (-). It cannot start
-      or end with a hyphen (-).
-    AllowedPattern: ^[0-9a-z]+([0-9a-z-]*[0-9a-z])*$
-    ConstraintDescription: Quick Start bucket name can include numbers, lowercase
-      letters, and hyphens (-). It cannot start or end with a hyphen (-).
-    Default: aws-quickstart
-    Type: String
-  QsS3KeyPrefix:
-    Description: S3 key prefix for the Quick Start assets. Quick Start key prefix
-      can include numbers, lowercase letters, uppercase letters, hyphens (-), and
-      forward slash (/).
-    AllowedPattern: ^[0-9a-zA-Z-/]*$
-    ConstraintDescription: Quick Start key prefix can include numbers, lowercase letters,
-      uppercase letters, hyphens (-), and forward slash (/).
-    Default: quickstart-jfrog-artifactory/
-    Type: String
-  QsS3BucketRegion:
-    Default: 'us-east-1'
-    Description: AWS Region where the Quick Start S3 bucket (QSS3BucketName) is hosted. If you use your own bucket, you must specify your own value.
-    Type: String
   InstallXray:
     Description: Choose true to install JFrog Xray instance(s).
     ConstraintDescription: True or False
@@ -824,10 +791,6 @@ Resources:
         MaxScalingNodes: '1'  # Always have 1 MasterNode
         DeploymentTag: !If [IsArtifactory, "ArtifactoryPrimary", "JcrPrimary"]
         HostRole: !Ref ArtifactoryHostRole
-        QsS3BucketName: !Ref QsS3BucketName
-        QsS3KeyPrefix: !Ref QsS3KeyPrefix
-        QsS3Uri: !Sub https://${QsS3BucketName}.s3.${AWS::URLSuffix}/${QsS3KeyPrefix}
-        AmiId: !Join ['', !Split [".", !Ref ArtifactoryVersion]]
         ArtifactoryProduct: !Ref ArtifactoryProduct
         ArtifactoryLicensesSecretName: !Ref SmLicenseName
         ArtifactoryServerName: !Ref ArtifactoryServerName
@@ -898,9 +861,6 @@ Resources:
         TargetGroupARN: !Ref ArtifactoryTargetGroup
         SSLTargetGroupARN: !Ref ArtifactorySslTargetGroup
         InternalTargetGroupARN: !Ref ArtifactoryInternalTargetGroup
-        QsS3BucketName: !Ref QsS3BucketName
-        QsS3KeyPrefix: !Ref QsS3KeyPrefix
-        QsS3Uri: !Sub https://${QsS3BucketName}.s3.${AWS::URLSuffix}/${QsS3KeyPrefix}
   XrayHostRole:
     Condition: EnableXray
     Type: AWS::IAM::Role
@@ -972,9 +932,6 @@ Resources:
         MinScalingNodes: !Ref XrayNumberOfInstances
         MaxScalingNodes: !Ref XrayNumberOfInstances
         DeploymentTag: 'xray'
-        QsS3BucketName: !Ref QsS3BucketName
-        QsS3KeyPrefix: !Ref QsS3KeyPrefix
-        QsS3Uri: !Sub https://${QsS3BucketName}.s3.${AWS::URLSuffix}/${QsS3KeyPrefix}
         DatabaseDriver: !GetAtt ArtifactoryCoreInfraStack.Outputs.DatabaseDriver
         DatabaseType: !GetAtt ArtifactoryCoreInfraStack.Outputs.DatabaseType
         DatabaseUser: !Ref DatabaseUser
diff --git a/Amazon/Marketplace/v7153/templates/jfrog-artifactory-ec2-instance.template.yaml b/Amazon/Marketplace/v7153/templates/jfrog-artifactory-ec2-instance.template.yaml
index 569d471..78983e9 100644
--- a/Amazon/Marketplace/v7153/templates/jfrog-artifactory-ec2-instance.template.yaml
+++ b/Amazon/Marketplace/v7153/templates/jfrog-artifactory-ec2-instance.template.yaml
@@ -15,12 +15,6 @@ Parameters:
     Type: String
   ArtifactoryProduct:
     Type: String
-  QsS3BucketName:
-    Type: String
-  QsS3KeyPrefix:
-    Type: String
-  QsS3Uri:
-    Type: String
   ArtifactoryLicensesSecretName:
     Type: String
   ArtifactoryServerName:
@@ -164,13 +158,6 @@ Resources:
   ArtifactoryLaunchConfiguration:
     Type: 'AWS::AutoScaling::LaunchConfiguration'
     Metadata:
-      AWS::CloudFormation::Authentication:
-        S3AccessCreds:
-          type: S3
-          roleName:
-            - !Ref HostRole  # !Ref ArtifactoryHostRole
-          buckets:
-            - !Ref QsS3BucketName
       AWS::CloudFormation::Init:
         configSets:
           artifactory_install:
diff --git a/Amazon/Marketplace/v7153/templates/jfrog-xray-ec2-instance.template.yaml b/Amazon/Marketplace/v7153/templates/jfrog-xray-ec2-instance.template.yaml
index 31f6a74..4190aa0 100644
--- a/Amazon/Marketplace/v7153/templates/jfrog-xray-ec2-instance.template.yaml
+++ b/Amazon/Marketplace/v7153/templates/jfrog-xray-ec2-instance.template.yaml
@@ -13,12 +13,6 @@ Parameters:
     Type: Number
   DeploymentTag:
     Type: String
-  QsS3BucketName:
-    Type: String
-  QsS3KeyPrefix:
-    Type: String
-  QsS3Uri:
-    Type: String
   DatabaseDriver:
     Type: String
   DatabaseType:
@@ -129,13 +123,6 @@ Resources:
   XrayLaunchConfiguration:
     Type: AWS::AutoScaling::LaunchConfiguration
     Metadata:
-      AWS::CloudFormation::Authentication:
-        S3AccessCreds:
-          type: S3
-          roleName:
-            - !Ref XrayHostRole
-          buckets:
-            - !Ref QsS3BucketName
       AWS::CloudFormation::Init:
         configSets:
           xray_install:
@@ -235,13 +222,6 @@ Resources:
 
             }
 
-            S3URI=${QsS3Uri}
-
-            yum update --security -y &> /var/log/userdata.yum_security_update.log
-
-            yum install -y git python3 libselinux-python3
-            yum install -y postgresql-server postgresql-devel
-
             echo $PATH
 
             PATH=/opt/aws/bin:$PATH
@@ -255,6 +235,13 @@ Resources:
             pip install --upgrade pip
             pip install wheel
 
+            S3URI=${QsS3Uri}
+
+            yum update --security -y &> /var/log/userdata.yum_security_update.log
+
+            yum install -y git python3 libselinux-python3
+            yum install -y postgresql-server postgresql-devel
+
             # Install Cloudformation helper scripts
             pip install https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-py3-latest.tar.gz 2>&1 | tee /var/log/userdata.aws_cfn_bootstrap_install.log