diff --git a/playbooks/roles/mattermost/defaults/main.yml b/playbooks/roles/mattermost/defaults/main.yml
index f4cbe144..f72f0596 100644
--- a/playbooks/roles/mattermost/defaults/main.yml
+++ b/playbooks/roles/mattermost/defaults/main.yml
@@ -4,7 +4,9 @@ MATTERMOST_HOSTNAME: "{{ inventory_hostname }}"
 MATTERMOST_OPS_EMAIL: ops@exmaple.com
 
 MATTERMOST_VERSION: 5.8.0
-MATTERMOST_UNLINK_VERSION: 0.3.0
+# UNLINK is the autolink plugin which converts JIRA tickets to clickable URL
+# https://github.com/mattermost/mattermost-plugin-autolink/releases/
+MATTERMOST_UNLINK_VERSION: 1.0.1
 
 # Restrict registration to email addresses in this domain
 MATTERMOST_RESTRICT_TO_EMAIL_DOMAIN: example.com
@@ -55,7 +57,7 @@ MATTERMOST_INSTALL_TAG_FILE: "{{ MATTERMOST_STATUS_DIR }}/installation-complete"
 MATTERMOST_DOWNLOAD_URL: "https://releases.mattermost.com/{{ MATTERMOST_VERSION }}/mattermost-team-{{ MATTERMOST_VERSION }}-linux-amd64.tar.gz"
 MATTERMOST_DOWNLOAD_DEST: "/tmp/{{ MATTERMOST_DOWNLOAD_URL|basename }}"
 
-MATTERMOST_UNLINK_DOWNLOAD_URL: "https://github.com/mattermost/mattermost-plugin-autolink/releases/download/v{{ MATTERMOST_UNLINK_VERSION }}/mattermost-plugin-autolink-linux-amd64.tar.gz"
+MATTERMOST_UNLINK_DOWNLOAD_URL: "https://github.com/mattermost/mattermost-plugin-autolink/releases/download/v{{ MATTERMOST_UNLINK_VERSION }}/mattermost-autolink-{{ MATTERMOST_UNLINK_VERSION }}.tar.gz"
 MATTERMOST_UNLINK_DOWNLOAD_DEST: "/tmp/{{ MATTERMOST_UNLINK_DOWNLOAD_URL|basename }}"
 
 MATTERMOST_CONFIG_FILE: "{{ MATTERMOST_STATUS_DIR }}/config.json"
diff --git a/playbooks/roles/mattermost/tasks/mattermost.yml b/playbooks/roles/mattermost/tasks/mattermost.yml
index c958dfad..087df45a 100644
--- a/playbooks/roles/mattermost/tasks/mattermost.yml
+++ b/playbooks/roles/mattermost/tasks/mattermost.yml
@@ -32,10 +32,14 @@
     group: mattermost
     force: no
 
+# This autolink configuration is NOT used UNLESS you are installing MM from scratch.
+# You must MANUALLY copy it from /var/lib/mattermost/autolink.json to the correct place
+# in /var/lib/mattermost/config.json and restart MM.
+# This is explained in autolink.json.j2 but repeated here to be helpful.
 - name: generate autolink configuration
   template:
     src: autolink.json.j2
-    dest: "{{ MATTERMOST_CONFIG_FILE|dirname }}/autolink.json"
+    dest: "{{ MATTERMOST_STATUS_DIR }}/autolink.json"
     owner: mattermost
     group: mattermost
 
diff --git a/playbooks/roles/mattermost/templates/autolink.json.j2 b/playbooks/roles/mattermost/templates/autolink.json.j2
index c6f1df82..aaa6c595 100644
--- a/playbooks/roles/mattermost/templates/autolink.json.j2
+++ b/playbooks/roles/mattermost/templates/autolink.json.j2
@@ -8,10 +8,6 @@
                     {
                         "Pattern": "(?P<project>{{ project }})-(?P<id>\\d{1,6})(?P<comma>[,;]*)",
                         "Template": "[${project}-${id}](https://{{ domain.domain }}/browse/${project}-${id})${comma}"
-                    },
-                    {
-                        "Pattern": "https://{{ domain.domain }}/browse/(?P<project>{{ project }})-(?P<id>\\d{1,6})(?P<query>\\?\\S*\\w)?",
-                        "Template": "[${project}-${id}](https://{{ domain.domain }}/browse/${project}-${id}${query})"
                     }{{ "," if not (loop.last and domain_loop.last) else "" }}
 {% endfor %}
 {% endfor %}