diff --git a/README.md b/README.md
index 1d8e837..5bb600e 100644
--- a/README.md
+++ b/README.md
@@ -40,6 +40,7 @@
 - [Mailpile](#mailpile)
 - [Matrix](#matrix)
   * [Guides](#guides)
+- [Mattermost](#mattermost)
 - [Miniflux](#miniflux)
   * [Notes](#notes-3)
 - [Netbox](#netbox)
@@ -394,6 +395,18 @@ For more content https://wiki.kiwix.org/wiki/Content
 * Unraid User - PSYCHOPATHiO [Guide](https://forums.unraid.net/topic/89502-support-a75g-repo/?do=findComment&comment=839576)
 * More info about matrix configuration [here](https://github.com/matrix-org/synapse/blob/master/README.rst)
 
+----
+# Mattermost
+![Mattermost](https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/mattermost.png)
+
+**Application Name:** Mattermost
+
+**Application Site:** https://mattermost.com/
+
+**Docker Hub:** https://hub.docker.com/r/mattermost/mattermost-team-edition/
+
+**Github:** https://github.com/mattermost/mattermost-server
+
 ----
 # Miniflux
 ![Miniflux](https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/miniflux.png)
diff --git a/templates/icons/mattermost.png b/templates/icons/mattermost.png
new file mode 100644
index 0000000..1e77751
Binary files /dev/null and b/templates/icons/mattermost.png differ
diff --git a/templates/icons/phpbb.png b/templates/icons/phpbb.png
index ffd7817..40de57e 100644
Binary files a/templates/icons/phpbb.png and b/templates/icons/phpbb.png differ
diff --git a/templates/mattermost.xml b/templates/mattermost.xml
new file mode 100644
index 0000000..cb30ee4
--- /dev/null
+++ b/templates/mattermost.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<Container version="2">
+  <Name>mattermost</Name>
+  <Repository>mattermost/mattermost-team-edition:master</Repository>
+  <Registry>https://hub.docker.com/r/mattermost/mattermost-team-edition/</Registry>
+  <Network>bridge</Network>
+  <Shell>sh</Shell>
+  <Privileged>false</Privileged>
+  <Support>https://forums.unraid.net/topic/89502-support-a75g-repo/</Support>
+  <Project>https://mattermost.com/</Project>
+  <Overview>Mattermost a flexible, open source messaging platform that enables secure team collaboration.&#xD;
+The official Docker image for Mattermost Team Edition.</Overview>
+  <Category>Productivity: Network:Voip Network:Messenger</Category>
+  <WebUI>http://[IP]:[PORT:8065]/</WebUI>
+  <TemplateURL>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/mattermost.xml</TemplateURL>
+  <Icon>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/mattermost.png</Icon>
+  <ExtraParams/>
+  <PostArgs/>
+  <DonateText/>
+  <DonateLink/>
+  <Description>Mattermost a flexible, open source messaging platform that enables secure team collaboration.&#xD;
+The official Docker image for Mattermost Team Edition.</Description>
+  <Config Name="Listen Address" Target="8065" Default="8065" Mode="tcp" Description="The address and port to which to bind and listen." Type="Port" Display="always" Required="true" Mask="false">8065</Config>
+  <Config Name="Listen Address" Target="8067" Default="8067" Mode="tcp" Description="The address the Mattermost server will listen on to expose performance metrics." Type="Port" Display="always" Required="false" Mask="false">8067</Config>
+  <Config Name="Gossip Port TCP" Target="8074" Default="8074" Mode="tcp" Description="The port used for the gossip protocol." Type="Port" Display="always" Required="false" Mask="false">8074</Config>
+  <Config Name="Streaming Port" Target="8075" Default="8075" Mode="" Description="The port used for streaming data between servers." Type="Variable" Display="always" Required="false" Mask="false">8075</Config>
+  <Config Name="Gossip Port UDP" Target="8074" Default="8074" Mode="udp" Description="The port used for the gossip protocol." Type="Port" Display="always" Required="false" Mask="false">8074</Config>
+  <Config Name="Data" Target="/mattermost/data" Default="/mnt/user/appdata/mattermost/data/" Mode="rw" Description="Data Path" Type="Path" Display="always" Required="true" Mask="false">/mnt/user/appdata/mattermost/data/</Config>
+  <Config Name="Logs" Target="/mattermost/logs" Default="/mnt/user/appdata/mattermost/logs/" Mode="rw" Description="Logs Path" Type="Path" Display="always" Required="true" Mask="false">/mnt/user/appdata/mattermost/logs/</Config>
+  <Config Name="Config" Target="/mattermost/config" Default="/mnt/user/appdata/mattermost/config/" Mode="rw" Description="Config Path" Type="Path" Display="always" Required="true" Mask="false">/mnt/user/appdata/mattermost/config/</Config>
+  <Config Name="Plugins" Target="/mattermost/plugins" Default="/mnt/user/appdata/mattermost/plugins/" Mode="rw" Description="Plugins Path" Type="Path" Display="always" Required="true" Mask="false">/mnt/user/appdata/mattermost/plugins/</Config>
+  <Config Name="Client Plugins" Target="/mattermost/client/plugins" Default="/mnt/user/appdata/mattermost/client/plugins/" Mode="rw" Description="Client Plugins Path" Type="Path" Display="always" Required="true" Mask="false">/mnt/user/appdata/mattermost/client/plugins/</Config>
+  <Config Name="DATASOURCE" Target="MM_SQLSETTINGS_DATASOURCE" Default="MM_USERNAME:MM_PASSWORD@tcp(DB_HOST:DB_PORT_NUMBER)/MM_DBNAME?charset=utf8mb4,utf8&amp;amp;readTimeout=30s&amp;amp;writeTimeout=30s" Mode="" Description="Edit This Change MM_USERNAME, MM_PASSWORD, DB_HOST, DB_PORT_NUMBER To your database configuration " Type="Variable" Display="always" Required="true" Mask="false">MM_USERNAME:MM_PASSWORD@tcp(DB_HOST:DB_PORT_NUMBER)/MM_DBNAME?charset=utf8mb4,utf8&amp;readTimeout=30s&amp;writeTimeout=30s</Config>
+  <Config Name="APP_HOST" Target="APP_HOST" Default="IP OR HOSTNAME" Mode="" Description="Application host address" Type="Variable" Display="always" Required="true" Mask="false">IP OR HOSTNAME</Config>
+  <Config Name="MM_SQLSETTINGS_DRIVERNAME" Target="MM_SQLSETTINGS_DRIVERNAME" Default="mysql" Mode="" Description="Container Variable: MM_SQLSETTINGS_DRIVERNAME" Type="Variable" Display="advanced" Required="true" Mask="false">mysql</Config>
+</Container>
\ No newline at end of file