diff --git a/content/codepipeline/codepipeline.md b/content/codepipeline/codepipeline.md
index 9bed0005d..9d8f57101 100644
--- a/content/codepipeline/codepipeline.md
+++ b/content/codepipeline/codepipeline.md
@@ -21,7 +21,7 @@ Click the **Launch** button to create the CloudFormation stack in the AWS Manage
 
 | Launch template |  |  |
 | ------ |:------:|:--------:|
-| CodePipeline & EKS |  {{% cf-launch "ci-cd-codepipeline.cfn.yml?stackName=eksws-codepipeline" %}} | {{% cf-download "ci-cd-codepipeline.cfn.yml" %}}  |
+| CodePipeline & EKS |  {{% cf-launch "ci-cd-codepipeline.cfn.yml" "eksws-codepipeline" %}} | {{% cf-download "ci-cd-codepipeline.cfn.yml" %}}  |
 
 After the console is open, enter your GitHub username, personal access token (created in previous step), check the acknowledge box and then click the "Create" button.
 
diff --git a/layouts/shortcodes/cf-launch.html b/layouts/shortcodes/cf-launch.html
index 4816e3b6a..37a328864 100644
--- a/layouts/shortcodes/cf-launch.html
+++ b/layouts/shortcodes/cf-launch.html
@@ -1,6 +1,6 @@
-<a 
-href="https://console.aws.amazon.com/cloudformation/home?#/stacks/new?templateURL=https://s3.amazonaws.com/{{ $.Site.Params.template_bucket  }}/templates/{{ $.Site.Params.branch  }}/{{ .Get 0 }}" 
-target="_blank" class="btn btn-default"> 
-<i class="fas fa-cloud-upload-alt"></i> 
+<a
+  href="https://console.aws.amazon.com/cloudformation/home?#/stacks/quickcreate?stackName={{ .Get 1 }}&templateURL=https://s3.amazonaws.com/{{ $.Site.Params.template_bucket  }}/templates/{{ $.Site.Params.branch  }}/{{ .Get 0 }}"
+target="_blank" class="btn btn-default">
+<i class="fas fa-cloud-upload-alt"></i>
 Launch
 </a>