diff --git a/.gitmodules b/.gitmodules
index e7526dbb..6d6deb3b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -115,3 +115,6 @@
 [submodule "vendor/github.com/kr/text"]
 	path = vendor/github.com/kr/text
 	url = https://github.com/kr/text.git
+[submodule "vendor/github.com/jmespath/go-jmespath"]
+	path = vendor/github.com/jmespath/go-jmespath
+	url = http://github.com/jmespath/go-jmespath
diff --git a/api/common/conf_s3.go b/api/common/conf_s3.go
index 2401119f..f9d1ad47 100644
--- a/api/common/conf_s3.go
+++ b/api/common/conf_s3.go
@@ -73,6 +73,7 @@ func (c *S3Config) ToAwsConfig(flags *FlagStorage) (*aws.Config, error) {
 	awsConfig := (&aws.Config{
 		Region: &c.Region,
 		Logger: GetLogger("s3"),
+		Retryer: client.DefaultRetryer{NumMaxRetries: 20,},
 	}).WithHTTPClient(&http.Client{
 		Transport: &defaultHTTPTransport,
 		Timeout:   flags.HTTPTimeout,
diff --git a/vendor/github.com/aws/aws-sdk-go b/vendor/github.com/aws/aws-sdk-go
index 7e7bb328..2935fddd 160000
--- a/vendor/github.com/aws/aws-sdk-go
+++ b/vendor/github.com/aws/aws-sdk-go
@@ -1 +1 @@
-Subproject commit 7e7bb328b06e5d15c0f0b7c935f848a57e289ad8
+Subproject commit 2935fddd680fe921abfc1eb7d83241b3a28c8fe3
diff --git a/vendor/github.com/jmespath/go-jmespath b/vendor/github.com/jmespath/go-jmespath
new file mode 160000
index 00000000..2437e841
--- /dev/null
+++ b/vendor/github.com/jmespath/go-jmespath
@@ -0,0 +1 @@
+Subproject commit 2437e8417af5203cd4f1f97f99fc289bdeea1360