diff --git a/builds/jenkins-build-pack-website/Jenkinsfile b/builds/jenkins-build-pack-website/Jenkinsfile
index 0962104652..a724ce7201 100644
--- a/builds/jenkins-build-pack-website/Jenkinsfile
+++ b/builds/jenkins-build-pack-website/Jenkinsfile
@@ -804,6 +804,7 @@ def generateDistributionConfig(originAccessIdentity) {
 	def cloudFrontOriginAccessIdentity = "origin-access-identity/cloudfront/"+originAccessIdentity
 	sh "sed -i -- 's/{service_name}/${service_config['domain']}-${service_config['service']}/g' distribution_config_with_tags.json"
 	sh "sed -i -- 's/{env}/${environment}/g' distribution_config_with_tags.json"
+	sh "sed -i -- 's/{region}/${service_config['region']}/g' distribution_config_with_tags.json"
 	sh "sed -i -- 's/{conf_s3bucketname}/${s3Bucket}/g' distribution_config_with_tags.json"
 	sh "sed -i -- 's/{conf_stack_prefix}/${configLoader.INSTANCE_PREFIX}/g' distribution_config_with_tags.json"
 	sh "sed -i -- 's:{conf_origin_id}:${cloudFrontOriginAccessIdentity}:g' distribution_config_with_tags.json"
diff --git a/builds/website-distribution-pack/distribution_config.json b/builds/website-distribution-pack/distribution_config.json
deleted file mode 100644
index 875aa7bdbb..0000000000
--- a/builds/website-distribution-pack/distribution_config.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "CallerReference": "{conf_stack_prefix}-{env}-static-website-distribution-{service_name}",
-  "Aliases": {
-    "Quantity": 0
-  },
-  "Origins": {
-    "Quantity": 1,
-    "Items": [{
-      "Id": "{conf_stack_prefix}-{env}-static-website-origin-{service_name}",
-      "DomainName": "{conf_s3bucketname}.s3.amazonaws.com",
-      "OriginPath": "/{service_name}",
-      "S3OriginConfig": {
-        "OriginAccessIdentity": "{conf_origin_id}"
-      }
-    }]
-  },
-  "DefaultRootObject": "index.html",
-  "DefaultCacheBehavior": {
-    "TargetOriginId": "{env}-static-website-origin-{service_name}",
-    "ForwardedValues": {
-      "QueryString": true,
-      "Cookies": {
-        "Forward": "none"
-      }
-    },
-    "TrustedSigners": {
-      "Enabled": false,
-      "Quantity": 0
-    },
-    "ViewerProtocolPolicy": "allow-all",
-    "MinTTL": 3600
-  },
-  "CacheBehaviors": {
-    "Quantity": 0
-  },
-  "CustomErrorResponses": {
-    "Quantity": 1,
-    "Items": [{
-      "ErrorCode": 404,
-      "ResponsePagePath": "/index.html",
-      "ResponseCode": "200",
-      "ErrorCachingMinTTL": 300
-    }]
-  },
-  "SmoothStreaming": false,
-  "Compress": true,
-  "Comment": "",
-  "Logging": {
-    "Enabled": false,
-    "IncludeCookies": true,
-    "Bucket": "",
-    "Prefix": ""
-  },
-  "PriceClass": "PriceClass_All",
-  "Enabled": true
-}
diff --git a/builds/website-distribution-pack/distribution_config_with_tags.json b/builds/website-distribution-pack/distribution_config_with_tags.json
index ddd0af8082..bd750ac703 100644
--- a/builds/website-distribution-pack/distribution_config_with_tags.json
+++ b/builds/website-distribution-pack/distribution_config_with_tags.json
@@ -8,7 +8,7 @@
       "Quantity": 1,
       "Items": [{
         "Id": "{conf_stack_prefix}-{env}-static-website-origin-{service_name}",
-        "DomainName": "{conf_s3bucketname}.s3.amazonaws.com",
+        "DomainName": "{conf_s3bucketname}.s3.{region}.amazonaws.com",
         "OriginPath": "/{origin_path}",
         "S3OriginConfig": {
           "OriginAccessIdentity": "{conf_origin_id}"
diff --git a/templates/api-template-java/pom.xml b/templates/api-template-java/pom.xml
index 08eb0029e0..eee0bd9897 100644
--- a/templates/api-template-java/pom.xml
+++ b/templates/api-template-java/pom.xml
@@ -21,7 +21,7 @@
 	<dependency>
 		<groupId>com.fasterxml.jackson.core</groupId>
 		<artifactId>jackson-databind</artifactId>
-		<version>2.10.0.pr3</version>
+		<version>2.9.10.4</version>
 	</dependency>
 	<dependency>
 	    <groupId>com.amazonaws</groupId>
diff --git a/templates/function-template-java/pom.xml b/templates/function-template-java/pom.xml
index 8dbe3e12a0..cf59084951 100644
--- a/templates/function-template-java/pom.xml
+++ b/templates/function-template-java/pom.xml
@@ -21,7 +21,7 @@
     <dependency>
 		<groupId>com.fasterxml.jackson.core</groupId>
 		<artifactId>jackson-databind</artifactId>
-		<version>2.10.0.pr3</version>
+		<version>2.9.10.4</version>
 	</dependency>
 	<dependency>
 	    <groupId>com.amazonaws</groupId>
diff --git a/templates/sls-app-template-java/pom.xml b/templates/sls-app-template-java/pom.xml
index 122d670c55..56f8a0a910 100644
--- a/templates/sls-app-template-java/pom.xml
+++ b/templates/sls-app-template-java/pom.xml
@@ -21,7 +21,7 @@
     <dependency>
 		<groupId>com.fasterxml.jackson.core</groupId>
 		<artifactId>jackson-databind</artifactId>
-		<version>2.8.11.2</version>
+		<version>2.9.10.4</version>
 	</dependency>
 	<dependency>
 	    <groupId>com.amazonaws</groupId>