diff --git a/.gitmodules b/.gitmodules
index 9ff9217..dfbb645 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,12 +1,12 @@
 [submodule "submodules/quickstart-aws-vpc"]
 	path = submodules/quickstart-aws-vpc
 	url = https://github.com/aws-quickstart/quickstart-aws-vpc.git
-	branch = master
+	branch = main
 [submodule "submodules/quickstart-linux-bastion"]
 	path = submodules/quickstart-linux-bastion
 	url = https://github.com/aws-quickstart/quickstart-linux-bastion.git
-	branch = master
+	branch = main
 [submodule "submodules/quickstart-microsoft-rdgateway"]
 	path = submodules/quickstart-microsoft-rdgateway
 	url = https://github.com/aws-quickstart/quickstart-microsoft-rdgateway.git
-	branch = master
+	branch = main
diff --git a/submodules/quickstart-aws-vpc b/submodules/quickstart-aws-vpc
index c0c6b19..ffc7af4 160000
--- a/submodules/quickstart-aws-vpc
+++ b/submodules/quickstart-aws-vpc
@@ -1 +1 @@
-Subproject commit c0c6b19e183e37b014ce6d2b6862608173551726
+Subproject commit ffc7af4e59a09dbf52199a3ecf70f3805abeff48
diff --git a/submodules/quickstart-linux-bastion b/submodules/quickstart-linux-bastion
index f7ea3f4..297feeb 160000
--- a/submodules/quickstart-linux-bastion
+++ b/submodules/quickstart-linux-bastion
@@ -1 +1 @@
-Subproject commit f7ea3f4eb39de5c80852c77a5e562a33f852c77f
+Subproject commit 297feeb5aefd6d4826367ea7568a55de9e3c70c0
diff --git a/submodules/quickstart-microsoft-rdgateway b/submodules/quickstart-microsoft-rdgateway
index 49a0408..23af011 160000
--- a/submodules/quickstart-microsoft-rdgateway
+++ b/submodules/quickstart-microsoft-rdgateway
@@ -1 +1 @@
-Subproject commit 49a0408d53ac915f27572da78fb5c259e0b1a17e
+Subproject commit 23af011799027a5ec193fad0233595461d232139