diff --git a/samples/cloudformation-stack-ttl/templates/cloudformation-stack-ttl.yaml b/samples/cloudformation-stack-ttl/templates/cloudformation-stack-ttl.yaml
index e107b9e..aa1c0b7 100644
--- a/samples/cloudformation-stack-ttl/templates/cloudformation-stack-ttl.yaml
+++ b/samples/cloudformation-stack-ttl/templates/cloudformation-stack-ttl.yaml
@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: Schedule automatic deletion of CloudFormation stacks
+Description: Schedule automatic deletion of CloudFormation stacks. (qs-1s7darhsn)
 Metadata:
   AWS::CloudFormation::Interface:
     ParameterGroups:
diff --git a/samples/iot-button-deploy-cloudformation/iot-button-deploy-cloudformation.yaml b/samples/iot-button-deploy-cloudformation/iot-button-deploy-cloudformation.yaml
index 48cdcc7..6766dac 100644
--- a/samples/iot-button-deploy-cloudformation/iot-button-deploy-cloudformation.yaml
+++ b/samples/iot-button-deploy-cloudformation/iot-button-deploy-cloudformation.yaml
@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: Deploys an AWS Lambda function that will deploy an input AWS CloudFormation template with a provided parameter file. This Lambda function can be used as an action for the AWS IoT Button to deploy AWS CloudFormation templates.
+Description: Deploys an AWS Lambda function that will deploy an input AWS CloudFormation template with a provided parameter file. This Lambda function can be used as an action for the AWS IoT Button to deploy AWS CloudFormation templates. (qs-1s7dari0g)
 Metadata:
   AWS::CloudFormation::Interface:
     ParameterGroups:
@@ -114,4 +114,4 @@ Resources:
       Handler: "index.handler"
       Runtime: "python3.6"
       Timeout: 60
-      Role: !GetAtt IoTButtonLambdaExecutionRole.Arn            
\ No newline at end of file
+      Role: !GetAtt IoTButtonLambdaExecutionRole.Arn            
diff --git a/submodules/quickstart-linux-bastion b/submodules/quickstart-linux-bastion
index dd1762f..b9950be 160000
--- a/submodules/quickstart-linux-bastion
+++ b/submodules/quickstart-linux-bastion
@@ -1 +1 @@
-Subproject commit dd1762f3d263f3b6b2156340fa36fcff30765888
+Subproject commit b9950be657d8a8c76e71fca157b4952a587342f4
diff --git a/submodules/quickstart-microsoft-rdgateway b/submodules/quickstart-microsoft-rdgateway
index 1f0f71b..7becaf1 160000
--- a/submodules/quickstart-microsoft-rdgateway
+++ b/submodules/quickstart-microsoft-rdgateway
@@ -1 +1 @@
-Subproject commit 1f0f71bce50345a8db21f67e5ff8dc580454f351
+Subproject commit 7becaf192403d4092b4a8c4ad8f9b03c3d07ab20