diff --git a/files/gitlab-config-template/gitlab.rb.template b/files/gitlab-config-template/gitlab.rb.template
index 0806a3e2f0c1254f13aace593acf7dd51a6a285e_ZmlsZXMvZ2l0bGFiLWNvbmZpZy10ZW1wbGF0ZS9naXRsYWIucmIudGVtcGxhdGU=..7656f02fe997f593f5b3d3226de19f4184c90b2d_ZmlsZXMvZ2l0bGFiLWNvbmZpZy10ZW1wbGF0ZS9naXRsYWIucmIudGVtcGxhdGU= 100644
--- a/files/gitlab-config-template/gitlab.rb.template
+++ b/files/gitlab-config-template/gitlab.rb.template
@@ -1200,6 +1200,8 @@
 # mattermost['gitlab_token_endpoint'] = "http://gitlab.example.com/oauth/token"
 # mattermost['gitlab_user_api_endpoint'] = "http://gitlab.example.com/api/v4/user"
 # mattermost['file_directory'] = "/var/opt/gitlab/mattermost/data"
+# mattermost['plugin_directory'] = "/var/opt/gitlab/mattermost/plugins"
+# mattermost['plugin_client_directory'] = "/var/opt/gitlab/mattermost/client-plugins"
 
 ################################################################################
 ## Mattermost NGINX
diff --git a/files/gitlab-cookbooks/mattermost/attributes/default.rb b/files/gitlab-cookbooks/mattermost/attributes/default.rb
index 0806a3e2f0c1254f13aace593acf7dd51a6a285e_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9tYXR0ZXJtb3N0L2F0dHJpYnV0ZXMvZGVmYXVsdC5yYg==..7656f02fe997f593f5b3d3226de19f4184c90b2d_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9tYXR0ZXJtb3N0L2F0dHJpYnV0ZXMvZGVmYXVsdC5yYg== 100644
--- a/files/gitlab-cookbooks/mattermost/attributes/default.rb
+++ b/files/gitlab-cookbooks/mattermost/attributes/default.rb
@@ -42,3 +42,5 @@
 default['mattermost']['gitlab_auth_endpoint'] = nil
 default['mattermost']['gitlab_token_endpoint'] = nil
 default['mattermost']['gitlab_user_api_endpoint'] = nil
+default['mattermost']['plugin_directory'] = "/var/opt/gitlab/mattermost/plugins"
+default['mattermost']['plugin_client_directory'] = "/var/opt/gitlab/mattermost/client-plugins"
diff --git a/files/gitlab-cookbooks/mattermost/libraries/mattermost_helper.rb b/files/gitlab-cookbooks/mattermost/libraries/mattermost_helper.rb
index 0806a3e2f0c1254f13aace593acf7dd51a6a285e_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9tYXR0ZXJtb3N0L2xpYnJhcmllcy9tYXR0ZXJtb3N0X2hlbHBlci5yYg==..7656f02fe997f593f5b3d3226de19f4184c90b2d_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9tYXR0ZXJtb3N0L2xpYnJhcmllcy9tYXR0ZXJtb3N0X2hlbHBlci5yYg== 100644
--- a/files/gitlab-cookbooks/mattermost/libraries/mattermost_helper.rb
+++ b/files/gitlab-cookbooks/mattermost/libraries/mattermost_helper.rb
@@ -26,7 +26,7 @@
     end
   end
 
-  def self.get_env_variables(node)
+  def self.get_env_variables(node) # rubocop:disable Metrics/AbcSize (disabled because it is false positive)
     {
       'MM_SERVICESETTINGS_SITEURL' => node['mattermost']['service_site_url'].to_s,
       'MM_SERVICESETTINGS_LISTENADDRESS' => "#{node['mattermost']['service_address']}:#{node['mattermost']['service_port']}",
@@ -45,6 +45,8 @@
       'MM_GITLABSETTINGS_AUTHENDPOINT' => node['mattermost']['gitlab_auth_endpoint'].to_s,
       'MM_GITLABSETTINGS_TOKENENDPOINT' => node['mattermost']['gitlab_token_endpoint'].to_s,
       'MM_GITLABSETTINGS_USERAPIENDPOINT' => node['mattermost']['gitlab_user_api_endpoint'].to_s,
+      'MM_PLUGINSETTINGS_DIRECTORY' => node['mattermost']['plugin_directory'].to_s,
+      'MM_PLUGINSETTINGS_CLIENTDIRECTORY' => node['mattermost']['plugin_client_directory'].to_s
     }
   end
 end unless defined?(MattermostHelper) # Prevent reloading in chefspec: https://github.com/sethvargo/chefspec/issues/562#issuecomment-74120922
diff --git a/files/gitlab-cookbooks/package/libraries/deprecations.rb b/files/gitlab-cookbooks/package/libraries/deprecations.rb
index 0806a3e2f0c1254f13aace593acf7dd51a6a285e_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9wYWNrYWdlL2xpYnJhcmllcy9kZXByZWNhdGlvbnMucmI=..7656f02fe997f593f5b3d3226de19f4184c90b2d_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9wYWNrYWdlL2xpYnJhcmllcy9kZXByZWNhdGlvbnMucmI= 100644
--- a/files/gitlab-cookbooks/package/libraries/deprecations.rb
+++ b/files/gitlab-cookbooks/package/libraries/deprecations.rb
@@ -104,7 +104,9 @@
            gitlab_token_endpoint
            gitlab_user_api_endpoint
            email_invite_salt
-           file_public_link_salt)
+           file_public_link_salt
+           plugin_directory
+           plugin_client_directory)
       end
 
       def next_major_version