diff --git a/.gitmodules b/.gitmodules
index 1f712b2..bcfc47b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,8 +1,8 @@
 [submodule "submodules/quickstart-aws-vpc"]
 	path = submodules/quickstart-aws-vpc
-	url = git@github.com:aws-quickstart/quickstart-aws-vpc
+	url = git@github.com:aws-quickstart/quickstart-aws-vpc.git
 	branch = master
 [submodule "submodules/quickstart-linux-bastion"]
 	path = submodules/quickstart-linux-bastion
-	url = git@github.com:aws-quickstart/quickstart-linux-bastion
+	url = git@github.com:aws-quickstart/quickstart-linux-bastion.git
 	branch = master
diff --git a/submodules/quickstart-aws-vpc b/submodules/quickstart-aws-vpc
index 9f136d4..ac8786c 160000
--- a/submodules/quickstart-aws-vpc
+++ b/submodules/quickstart-aws-vpc
@@ -1 +1 @@
-Subproject commit 9f136d47a222936ea43502c6ccc2ba8c610fa73c
+Subproject commit ac8786cff8fd030798dc26d6c9566ef730536bd4
diff --git a/submodules/quickstart-linux-bastion b/submodules/quickstart-linux-bastion
index 94cc267..229716f 160000
--- a/submodules/quickstart-linux-bastion
+++ b/submodules/quickstart-linux-bastion
@@ -1 +1 @@
-Subproject commit 94cc2674d9f85491c995b8eb49bffa87a154c8e9
+Subproject commit 229716f6353a5c36dd13692f60fa7817d0a95b53
diff --git a/templates/nodecreate.template b/templates/nodecreate.template
index 644dc5b..0bbe776 100644
--- a/templates/nodecreate.template
+++ b/templates/nodecreate.template
@@ -100,52 +100,52 @@
     "Mappings": {
         "AWSAMIRegionMap": {
             "AMI": {
-                "AMZNLINUXHVM": "amzn-ami-hvm-2018.03.0.20180622-x86_64-gp2"
+                "AMZNLINUXHVM": "amzn-ami-hvm-2018.03.0.20181129-x86_64-gp2"
             },
             "ap-northeast-1": {
-                "AMZNLINUXHVM": "ami-9c9443e3"
+                "AMZNLINUXHVM": "ami-00a5245b4816c38e6"
             },
             "ap-northeast-2": {
-                "AMZNLINUXHVM": "ami-ebc47185"
+                "AMZNLINUXHVM": "ami-00dc207f8ba6dc919"
             },
             "ap-south-1": {
-                "AMZNLINUXHVM": "ami-5a8da735"
+                "AMZNLINUXHVM": "ami-0ad42f4f66f6c1cc9"
             },
             "ap-southeast-1": {
-                "AMZNLINUXHVM": "ami-ed838091"
+                "AMZNLINUXHVM": "ami-05b3bcf7f311194b3"
             },
             "ap-southeast-2": {
-                "AMZNLINUXHVM": "ami-33f92051"
+                "AMZNLINUXHVM": "ami-02fd0b06f06d93dfc"
             },
             "ca-central-1": {
-                "AMZNLINUXHVM": "ami-03e86a67"
+                "AMZNLINUXHVM": "ami-07423fb63ea0a0930"
             },
             "eu-central-1": {
-                "AMZNLINUXHVM": "ami-a058674b"
+                "AMZNLINUXHVM": "ami-0cfbf4f6db41068ac"
             },
             "eu-west-1": {
-                "AMZNLINUXHVM": "ami-e4515e0e"
+                "AMZNLINUXHVM": "ami-08935252a36e25f85"
             },
             "eu-west-2": {
-                "AMZNLINUXHVM": "ami-b2b55cd5"
+                "AMZNLINUXHVM": "ami-01419b804382064e4"
             },
             "eu-west-3": {
-                "AMZNLINUXHVM": "ami-d50bbaa8"
+                "AMZNLINUXHVM": "ami-0dd7e7ed60da8fb83"
             },
             "sa-east-1": {
-                "AMZNLINUXHVM": "ami-83d58fef"
+                "AMZNLINUXHVM": "ami-05145e0b28ad8e0b2"
             },
             "us-east-1": {
-                "AMZNLINUXHVM": "ami-cfe4b2b0"
+                "AMZNLINUXHVM": "ami-0080e4c5bc078760e"
             },
             "us-east-2": {
-                "AMZNLINUXHVM": "ami-40142d25"
+                "AMZNLINUXHVM": "ami-0cd3dfa4e37921605"
             },
             "us-west-1": {
-                "AMZNLINUXHVM": "ami-0e86606d"
+                "AMZNLINUXHVM": "ami-0ec6517f6edbf8044"
             },
             "us-west-2": {
-                "AMZNLINUXHVM": "ami-0ad99772"
+                "AMZNLINUXHVM": "ami-01e24be29428c15b2"
             }
         },
         "LinuxAMINameMap": {