diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index c06ca40..fecb548 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -2,7 +2,7 @@ name: build
 
 # Controls when the action will run. 
 on:
-  pull_request_target:
+  #pull_request_target:
 
   push:
 
@@ -47,7 +47,7 @@ jobs:
 
     - name: Copy test artifacts to test S3 bucket
       run: |
-        MESSAGEBROKERNODEINSTANCETYPE=t2.small
+        MESSAGEBROKERNODEINSTANCETYPE=t2.medium
         sed -i "s@SolaceDockerImageParameterValue@${{ secrets.BROKER_DOCKER_IMAGE_REF }}@g" ci/solace-aws-ha-3az-prod-test.json
         sed -i "s@EventBrokerNodeInstanceTypeParameterValue@${MESSAGEBROKERNODEINSTANCETYPE}@g" ci/solace-aws-ha-3az-prod-test.json
         aws s3 mb s3://${{ env.TEST_S3_BUCKET }} || echo "s3 bucket already existed"
diff --git a/README.md b/README.md
index adfd250..1c27c40 100644
--- a/README.md
+++ b/README.md
@@ -2,9 +2,9 @@
 
 # Install and Configure Solace PubSub+ Software Event Broker in an HA Tuple using AWS Cloud Formation
 
-This document provides a quick getting started guide to install a Solace PubSub+ software event broker deployment in Amazon Web Services cloud computing platform.
+This project is a best practice template intended for development and demo purposes. The tested and recommended Solace PubSub+ Software Event Broker version is 9.8.
 
-The supported event broker version is 9.7 or later. For earlier broker releases use [this GitHub version of the QuickStart](https://github.com/SolaceProducts/pubsubplus-aws-ha-quickstart/tree/v2.0.1).
+This document provides a quick getting started guide to install a Solace PubSub+ software event broker deployment in Amazon Web Services cloud computing platform.
 
 ![alt text](/images/Solace-AWS-HA-Prod-3AZ.png "Production Environment for Solace PubSub+")
 
diff --git a/submodules/quickstart-linux-bastion b/submodules/quickstart-linux-bastion
index cbad242..5598789 160000
--- a/submodules/quickstart-linux-bastion
+++ b/submodules/quickstart-linux-bastion
@@ -1 +1 @@
-Subproject commit cbad242d2d1bbfec41a6baa6c2ae346b54d2acfd
+Subproject commit 559878955b9f97873a0b2c99aa4c3619f1cb35c1
diff --git a/templates/solace-master.template b/templates/solace-master.template
index 3b82514..cdce6f0 100644
--- a/templates/solace-master.template
+++ b/templates/solace-master.template
@@ -256,6 +256,7 @@ Resources:
         NumberOfAZs: !Ref 'NumberOfAZs'
   BastionHostRole:
     Type: 'AWS::IAM::Role'
+    Condition: UsePrivateSubnets
     Properties:
       Path: /
       AssumeRolePolicyDocument: