diff --git a/userguide/aws/how-to-set-up-a-cloud-formation-system.adoc b/userguide/aws/how-to-set-up-a-cloud-formation-system.adoc
index 23f1f19d8..8568d934b 100644
--- a/userguide/aws/how-to-set-up-a-cloud-formation-system.adoc
+++ b/userguide/aws/how-to-set-up-a-cloud-formation-system.adoc
@@ -79,7 +79,7 @@ From the left menu of the VPC Dashboard select *Subnets*. This shows a list of y
 
 The CloudFormation implementation uses the HTTPS protocol for strong security. This requires the use of an X.509 certificate.
 
-If you do not have a certificate, select *Security, Identity, and Compliance*, then *Certificate Manager* from the Services menu. Then follow the instructions in https://../how-to-add-a-certificate-using-ACM.html[How to Add a Certificate Using ACM].
+If you do not have a certificate, select *Security, Identity, and Compliance*, then *Certificate Manager* from the Services menu. Then follow the instructions in https://docs.killbill.io/latest/how-to-add-a-certificate-using-ACM.html[How to Add a Certificate Using ACM].
 
 If you have a certificate created by ACM, you are all set. If you have a certificate not created by ACM, set the bottom left dropdown to **Import** and follow the instructions. Import the certificate to ACM.
 
@@ -96,7 +96,7 @@ To create a key pair, from the EC2 console scroll down to *Networks & Security /
 [[step5]]
 == Step 5: Configure and Launch
 
-The setup process starts with the  https://aws.amazon.com/marketplace/pp/prodview-yadytedsiclzu?sr=0-3&ref_=beagle&applicationId=AWSMPContessa[Kill Bill CloudFormation Template at AWS Marketplace]. Go to this page, then click *Continue to Subscribe*.
+The setup process starts with the  https://aws.amazon.com/marketplace/pp/prodview-aicuarzg3e4t6?sr=0-5&ref_=beagle&applicationId=AWSMPContessa[Kill Bill CloudFormation Template at AWS Marketplace]. Go to this page, then click *Continue to Subscribe*.
 
 image::../assets/aws/cf-subscribe.png[align=center]
 
@@ -164,7 +164,7 @@ If the create succeeds, the status will eventually change to `CREATE_COMPLETE` (
 [[step6]]
 == Step 6: Setup a CNAME
 
-A critical resource included in your CloudFormation implementation is the ELB Load Balancer. To complete the protection of this resource by your certificate, as explained in https://add-a-certificate-using-ACM.html[How to Add a Certificate Using ACM], you need to create a CNAME for your domain with the name "kaui" and a value that points to this load balancer.
+A critical resource included in your CloudFormation implementation is the ELB Load Balancer. To complete the protection of this resource by your certificate, as explained in https://docs.killbill.io/latest/how-to-add-a-certificate-using-ACM.html[How to Add a Certificate Using ACM], you need to create a CNAME for your domain with the name "kaui" and a value that points to this load balancer.
 
 First, find the load balancer in the EC2 console: