diff --git a/scripts/install-solace.sh b/scripts/install-solace.sh
index e425a45..134fb31 100644
--- a/scripts/install-solace.sh
+++ b/scripts/install-solace.sh
@@ -528,6 +528,15 @@ if [ "${is_primary}" = "true" ]; then
     esac
     ((count++))
     echo "`date` INFO: Waited ${run_time} seconds, Config-sync is not yet Up"
+
+    if (( $count % 18 == 0 )) ; then
+      echo "`date` INFO: Re-trying initiate config-sync for router"
+      /tmp/semp_query.sh -n admin -p ${admin_password} -u http://localhost:8080/SEMP \
+              -q "<rpc><admin><config-sync><assert-master><router/></assert-master></config-sync></admin></rpc>"
+      /tmp/semp_query.sh -n admin -p ${admin_password} -u http://localhost:8080/SEMP \
+              -q "<rpc><admin><config-sync><assert-master><vpn-name>default</vpn-name></assert-master></config-sync></admin></rpc>"
+    fi
+
     sleep ${pause}
   done
 
@@ -557,4 +566,10 @@ if [ "${is_primary}" = "true" ]; then
 
 fi
 
+if [ ${count} -eq ${loop_guard} ]; then
+  echo "`date` ERROR: Solace bringup failed" | tee /dev/stderr
+  exit 1
+fi
+echo "`date` INFO: Solace bringup complete"
+
 echo "`date` INFO: PubSub+ HA-node bringup complete"
diff --git a/templates/solace-master.template b/templates/solace-master.template
index cdce6f0..b7e676a 100644
--- a/templates/solace-master.template
+++ b/templates/solace-master.template
@@ -285,6 +285,7 @@ Resources:
   BastionStack:
     Type: AWS::CloudFormation::Stack
     Condition: UsePrivateSubnets
+    DependsOn: VPCStack
     Properties:
       TemplateURL:
         !Sub
@@ -292,6 +293,7 @@ Resources:
           - S3Region: !If [UsingDefaultBucket, !Ref 'AWS::Region', !Ref QSS3BucketRegion]
             S3Bucket: !If [UsingDefaultBucket, !Sub '${QSS3BucketName}-${AWS::Region}', !Ref QSS3BucketName]
       Parameters:
+        AlternativeIAMRole: !Ref BastionHostRole
         BastionInstanceType: t2.micro
         EnableBanner: 'true'
         BastionBanner: !Sub