diff --git a/CHANGELOG b/CHANGELOG
index d4aeec5..d0dbb61 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,18 @@
+2019-10-26 - 5.16.1
+* Defaults to Mattermost 5.16.0
+* Update Mattermost Template
+  * PluginSettings
+    * EnableMarketplace
+    * MarketplaceUrl
+  * GuestAccountSettings
+    * Enable
+    * AllowEmailAccounts
+    * EnforceMultifactorAuthentication
+    * RestrictCreationToDomains
+  * SqlSettings.DataSource, ElasticsearchSettings.ConnectionUrl, EmailSettings.SMTPServer
+    * Default to localhost instead of dockerhost
+  * NativeAppSettings.AppDownloadLink
+    * Default to https://mattermost.com/download/#mattermostApps
 2019-10-08 - 5.15.0
 * Defaults to Mattermost 5.15.0
 2019-08-24 - 5.14.2
diff --git a/mattermost/osfingermap.yaml b/mattermost/osfingermap.yaml
index de1248c..b59f123 100644
--- a/mattermost/osfingermap.yaml
+++ b/mattermost/osfingermap.yaml
@@ -2,7 +2,7 @@
 # vim: ft=yaml
 
 default:
-  version: '5.15.0'
+  version: '5.16.1'
   install_dir: '/opt'
   config_file: '/opt/mattermost/config/config.json'
   config_file_source: 'salt://mattermost/templates/mattermost.jinja'
diff --git a/mattermost/templates/mattermost.jinja b/mattermost/templates/mattermost.jinja
index 69cb151..f7dbf3c 100644
--- a/mattermost/templates/mattermost.jinja
+++ b/mattermost/templates/mattermost.jinja
@@ -118,11 +118,7 @@
        "ExperimentalPrimaryTeam": "{{ team.get('ExperimentalPrimaryTeam', '') }}",
        "ExperimentalDefaultChannels": "{{ team.get('ExperimentalDefaultChannels', '') }}"
    },
-{% set display = mattermost.get('DisplaySettings', {}) %}
-   "DisplaySettings": {
-       "CustomURLSchemes": [],
-       "ExperimentalTimezone": {{ display.get('ExperimentalTimezone', 'false') }}
-   },
+
    "ClientRequirements": {
        "AndroidLatestVersion": "",
        "AndroidMinVersion": "",
@@ -134,7 +130,7 @@
 {% set sql = mattermost.get('SqlSettings', {}) %}
    "SqlSettings": {
        "DriverName": "{{ sql.get('DriverName', 'mysql') }}",
-       "DataSource": "{{ sql.get('DataSource', 'mmuser:mostest@tcp(dockerhost:3306)/mattermost_test?charset=utf8mb4,utf8&readTimeout=30s&writeTimeout=30s') }}",
+       "DataSource": "{{ sql.get('DataSource', 'mmuser:mostest@tcp(localhost:3306)/mattermost_test?charset=utf8mb4,utf8&readTimeout=30s&writeTimeout=30s') }}",
        "DataSourceReplicas": [{{ sql.get('DataSourceReplicas', '') }}],
        "DataSourceSearchReplicas": [{{ sql.get('DataSourceSearchReplicas', '') }}],
        "MaxIdleConns": {{ sql.get('MaxIdleConns', '20') }},
@@ -367,7 +363,7 @@
    },
 {% set native_app = mattermost.get('NativeAppSettings', {}) %}
    "NativeAppSettings": {
-       "AppDownloadLink": "{{ native_app.get('AppDownloadLink', 'https://about.mattermost.com/downloads/') }}",
+       "AppDownloadLink": "{{ native_app.get('AppDownloadLink', 'https://about.mattermost.com/downloads/#mattermostApps') }}",
        "AndroidAppDownloadLink": "{{ native_app.get('AndroidAppDownloadLink', 'https://about.mattermost.com/mattermost-android-app/') }}",
        "IosAppDownloadLink": "{{ native_app.get('IosAppDownloadLink', 'https://about.mattermost.com/mattermost-ios-app/') }}"
    },
@@ -409,7 +405,7 @@
    },
 {% set elasticsearch = mattermost.get('ElasticsearchSettings', {}) %}
    "ElasticsearchSettings": {
-       "ConnectionUrl": "{{ elasticsearch.get('ConnectionUrl', 'http://dockerhost:9200') }}",
+       "ConnectionUrl": "{{ elasticsearch.get('ConnectionUrl', 'http://localhost:9200') }}",
        "Username": "{{ elasticsearch.get('Username', 'elastic') }}",
        "Password": "{{ elasticsearch.get('Password', 'changeme') }}",
        "EnableIndexing": {{ elasticsearch.get('EnableIndexing', 'false') }},
@@ -465,8 +461,28 @@
        "Directory": "{{ plugin.get('Directory', './plugins') }}",
        "ClientDirectory": "{{ plugin.get('ClientDirectory', './client/plugins') }}",
        "Plugins": {},
-       "PluginStates": {}
+       "PluginStates": {
+         "com.mattermost.nps": {
+           "Enable": true
+         }
+       },
+       "EnableMarketplace": "{{ plugin.get('EnableMarketplace', 'true') }}",
+       "MarketplaceUrl": "https://api.integrations.mattermost.com"
+   },
+
+{% set display = mattermost.get('DisplaySettings', {}) %}
+   "DisplaySettings": {
+       "CustomURLSchemes": [],
+       "ExperimentalTimezone": {{ display.get('ExperimentalTimezone', 'false') }}
    },
+
+{% set guest = mattermost.get('GuestAccountSettings', {}) %}
+  "GuestAccountSettings": {
+    "Enable": {{ guest.get('Enable', 'false') }},
+    "AllowEmailAccounts": {{ guest.get('AllowEmailAccounts', 'false') }},
+    "EnforceMultifactorAuthentication": {{ guest.get('EnforceMultifactorAuthentication', 'false') }},
+    "RestrictCreationToDomains": "{{ guest.get('RestrictToDomains', {}) }}"
+
 {% set image = mattermost.get('ImageProxySettings', {}) %}
    "ImageProxySettings": {
        "Enable": {{ image.get('Enable', 'true') }},