diff --git a/config/software/mattermost.rb b/config/software/mattermost.rb
index 2fee6c0e0d5fa90ed64b5c588967f2a9800c3abf_Y29uZmlnL3NvZnR3YXJlL21hdHRlcm1vc3QucmI=..9c220042c635c0e9245b5474e5be6da3b8dea287_Y29uZmlnL3NvZnR3YXJlL21hdHRlcm1vc3QucmI= 100644
--- a/config/software/mattermost.rb
+++ b/config/software/mattermost.rb
@@ -17,6 +17,6 @@
 #
 
 name 'mattermost'
-default_version '5.36.1'
+default_version '5.37.1'
 
 source url: "https://releases.mattermost.com/#{version}/mattermost-team-#{version}-linux-amd64.tar.gz",
@@ -21,6 +21,6 @@
 
 source url: "https://releases.mattermost.com/#{version}/mattermost-team-#{version}-linux-amd64.tar.gz",
-       md5: 'f3553ba7f44948e4b07608b59f801d33'
+       md5: 'f8af0db00ae563a53b32466b49a20839'
 
 relative_path 'mattermost'
 
diff --git a/doc/gitlab-mattermost/index.md b/doc/gitlab-mattermost/index.md
index 2fee6c0e0d5fa90ed64b5c588967f2a9800c3abf_ZG9jL2dpdGxhYi1tYXR0ZXJtb3N0L2luZGV4Lm1k..9c220042c635c0e9245b5474e5be6da3b8dea287_ZG9jL2dpdGxhYi1tYXR0ZXJtb3N0L2luZGV4Lm1k 100644
--- a/doc/gitlab-mattermost/index.md
+++ b/doc/gitlab-mattermost/index.md
@@ -336,6 +336,7 @@
 | 13.12 | 5.34 |
 | 14.0 | 5.35 |
 | 14.1 | 5.36 |
+| 14.2 | 5.37 |
 
 NOTE:
 When upgrading the Mattermost version, it is essential to check the
diff --git a/files/gitlab-cookbooks/gitlab/templates/default/nginx-gitlab-mattermost-http.conf.erb b/files/gitlab-cookbooks/gitlab/templates/default/nginx-gitlab-mattermost-http.conf.erb
index 2fee6c0e0d5fa90ed64b5c588967f2a9800c3abf_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvdGVtcGxhdGVzL2RlZmF1bHQvbmdpbngtZ2l0bGFiLW1hdHRlcm1vc3QtaHR0cC5jb25mLmVyYg==..9c220042c635c0e9245b5474e5be6da3b8dea287_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvdGVtcGxhdGVzL2RlZmF1bHQvbmdpbngtZ2l0bGFiLW1hdHRlcm1vc3QtaHR0cC5jb25mLmVyYg== 100644
--- a/files/gitlab-cookbooks/gitlab/templates/default/nginx-gitlab-mattermost-http.conf.erb
+++ b/files/gitlab-cookbooks/gitlab/templates/default/nginx-gitlab-mattermost-http.conf.erb
@@ -80,6 +80,49 @@
   access_log  <%= @log_directory %>/gitlab_mattermost_access.log gitlab_mattermost_access;
   error_log   <%= @log_directory %>/gitlab_mattermost_error.log;
 
+  location ~ /api/v[0-9]+/(users/)?websocket$ {
+    client_max_body_size <%= @client_max_body_size %>;
+
+    <% @proxy_set_headers.each do |header| %>
+    <% next if header[1].nil? %>
+    proxy_set_header <%= header[0] %> <%= header[1] %>;
+    <% end %>
+
+    proxy_buffers 256 16k;
+    proxy_buffer_size 16k;
+
+    client_body_timeout 60;
+    send_timeout 300;
+    lingering_timeout 5;
+    proxy_connect_timeout 90;
+    proxy_send_timeout 300;
+    proxy_read_timeout <%= @proxy_read_timeout %>;
+    proxy_http_version 1.1;
+
+    proxy_pass http://gitlab_mattermost;
+  }
+
+  location ~ /plugins/focalboard/ws/* {
+    client_max_body_size <%= @client_max_body_size %>;
+
+    <% @proxy_set_headers.each do |header| %>
+    <% next if header[1].nil? %>
+    proxy_set_header <%= header[0] %> <%= header[1] %>;
+    <% end %>
+
+    proxy_buffers 256 16k;
+    proxy_buffer_size 16k;
+
+    client_body_timeout 60;
+    send_timeout 300;
+    lingering_timeout 5;
+    proxy_connect_timeout 90;
+    proxy_send_timeout 300;
+    proxy_read_timeout <%= @proxy_read_timeout %>;
+
+    proxy_pass http://gitlab_mattermost;
+  }
+
   location / {
     ## If you use HTTPS make sure you disable gzip compression
     ## to be safe against BREACH attack.