diff --git a/.gitmodules b/.gitmodules
index 531750b..38a2dc8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,3 @@
 [submodule "submodules/quickstart-aws-vpc"]
 	path = submodules/quickstart-aws-vpc
-	url = ../../aws-quickstart/quickstart-aws-vpc.git
-	branch = master
+	url = https://github.com/aws-quickstart/quickstart-aws-vpc.git
diff --git a/.taskcat.yml b/.taskcat.yml
new file mode 100644
index 0000000..5006fb2
--- /dev/null
+++ b/.taskcat.yml
@@ -0,0 +1,32 @@
+project:
+  owner: quickstart-eng@amazon.com
+  name: quickstart-titian-mosaic
+  regions:
+    - eu-west-1
+    - us-east-1
+    - us-west-2
+  shorten_stack_name: true
+  s3_regional_buckets: true
+  package_lambda: false
+  template: ./templates/titian-mosaic-master.template
+tests:
+  test1:
+    regions:
+      - eu-west-1
+    parameters:
+      pAvailabilityZones: $[taskcat_genaz_2]
+      pEC2KeyPair: sshvans
+      pPrivateSubnet1CIDR: 10.240.32.0/20
+      pPrivateSubnet2CIDR: 10.240.48.0/20
+      pPublicSubnet1CIDR: 10.240.0.0/20
+      pPublicSubnet2CIDR: 10.240.16.0/20
+      pVPCCIDR: 10.240.0.0/16
+      QSS3BucketName: $[taskcat_autobucket]
+      QSS3BucketRegion: $[taskcat_current_region]
+      QSS3KeyPrefix: quickstart-titian-mosaic/
+      pDBPassword: $[taskcat_genpass_8A]
+      pDBTimezone: US/Central
+      pDBAllocatedStorage: 10
+      pDBEngine: oracle-se2
+      # pDBEngineLicenseModel: bring-your-own-license
+      pWebAccessCIDR: 10.240.0.0/16
\ No newline at end of file
diff --git a/ci/taskcat.yml b/ci/taskcat.yml
deleted file mode 100644
index aadbfb2..0000000
--- a/ci/taskcat.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-global:
-  marketplace-ami: false
-  owner: quickstart-eng@amazon.com
-  qsname: quickstart-titian-mosaic
-  regions:
-    - eu-west-1
-    - us-east-1
-    - us-west-2
-  reporting: true
-tests:
-  quickstart-biotech-blueprintt1:
-    parameter_input: titian-mosaic-params.t1.json
-    template_file: titian-mosaic-master.template
-    regions:
-      - eu-west-1
diff --git a/submodules/quickstart-aws-vpc b/submodules/quickstart-aws-vpc
index 3de54f0..44bfdd2 160000
--- a/submodules/quickstart-aws-vpc
+++ b/submodules/quickstart-aws-vpc
@@ -1 +1 @@
-Subproject commit 3de54f0d464eb6f792166212929121cc7be2ac82
+Subproject commit 44bfdd241ef3edbb521d273b86f6f2ad3484cf39
diff --git a/templates/titian-mosaic-master.template b/templates/titian-mosaic-master.template
index 040cee4..05ceba5 100644
--- a/templates/titian-mosaic-master.template
+++ b/templates/titian-mosaic-master.template
@@ -384,12 +384,11 @@ Resources:
     Properties:
       TemplateURL:
         !Sub
-          - 'https://${S3Bucket}.s3.${S3Region}.${AWS::URLSuffix}/${QSS3KeyPrefix}submodules/quickstart-aws-vpc/templates/aws-vpc.template'
+          - 'https://${S3Bucket}.s3.${S3Region}.${AWS::URLSuffix}/${QSS3KeyPrefix}submodules/quickstart-aws-vpc/templates/aws-vpc.template.yaml'
           - S3Region: !If [UsingDefaultBucket, !Ref 'AWS::Region', !Ref QSS3BucketRegion]
             S3Bucket: !If [UsingDefaultBucket, !Sub '${QSS3BucketName}-${AWS::Region}', !Ref QSS3BucketName]
       Parameters:
         AvailabilityZones: !Join [ "," , !Ref pAvailabilityZones ]
-        KeyPairName: !Ref pEC2KeyPair
         NumberOfAZs: 2
         PrivateSubnet1ACIDR: !Ref pPrivateSubnet1CIDR
         PrivateSubnet2ACIDR: !Ref pPrivateSubnet2CIDR