diff --git a/README.md b/README.md
index b3ad802..9a7880b 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,8 @@
 - [ArchiveBox](#archivebox)
   * [First installation](#first-installation)
 - [Backuppc](#backuppc)
+- [Commento](#commento)
+  * [Notes](#notes)
 - [CryptPad](#cryptpad)
   * [First installation](#first-installation-1)
 - [CyberChef](#cyberchef)
@@ -25,21 +27,22 @@
 - [Firefox-Syncserver](#firefox-syncserver)
 - [Flarum](#flarum)
   * [Default username and password](#default-username-and-password-2)
-  * [Notes](#notes)
+  * [Notes](#notes-1)
 - [Golinks](#golinks)
   * [Usage](#usage)
 - [Gossa](#gossa)
 - [Gotify](#gotify)
   * [Before running the docker](#before-running-the-docker-1)
   * [Default username and password](#default-username-and-password-3)
+- [Healthchecks](#healthchecks)
 - [Homer](#homer)
   * [Before running the docker](#before-running-the-docker-2)
 - [Jitsi](#jitsi)
   * [Change appdata location](#change-appdata-location)
-  * [Notes](#notes-1)
+  * [Notes](#notes-2)
 - [Keycloak](#keycloak)
 - [Kiwix-serve](#kiwix-serve)
-  * [Notes](#notes-2)
+  * [Notes](#notes-3)
   * [Content](#content)
 - [Leantime](#leantime)
   * [First installation](#first-installation-3)
@@ -49,34 +52,37 @@
 - [Matrix](#matrix)
   * [Guides](#guides)
 - [Mattermost](#mattermost)
+- [Mattermost-push-proxy](#mattermost-push-proxy)
+  * [Notes](#notes-4)
+  * [Before running the docker](#before-running-the-docker-3)
 - [Mediagoblin](#mediagoblin)
   * [Default username and password](#default-username-and-password-4)
 - [Miniflux](#miniflux)
 - [Moodle](#moodle)
-  * [Notes](#notes-3)
-- [Mumble](#mumble)
-  * [Notes](#notes-4)
-- [Netbox](#netbox)
   * [Notes](#notes-5)
+- [Mumble](#mumble)
+  * [Notes](#notes-6)
+- [Netbox](#netbox)
+  * [Notes](#notes-7)
 - [phpBB](#phpbb)
 - [PsiTransfer](#psitransfer)
-  * [Notes](#notes-6)
+  * [Notes](#notes-8)
 - [Pterodactyl-panel](#pterodactyl-panel)
   * [Creating User](#creating-user-1)
 - [Pure-FTPd](#pure-ftpd)
-  * [Notes](#notes-7)
+  * [Notes](#notes-9)
 - [Pwndrop](#pwndrop)
 - [Quakejs](#quakejs)
-- [Notes](#notes-8)
+- [Notes](#notes-10)
 - [Reactive-resume](#reactive-resume)
 - [Redis](#redis)
 - [Riot-web](#riot-web)
-  * [Before running the docker](#before-running-the-docker-3)
+  * [Before running the docker](#before-running-the-docker-4)
 - [Searx](#searx)
 - [Selfoss](#selfoss)
 - [Shiori](#shiori)
   * [Default username and password](#default-username-and-password-5)
-  * [Notes](#notes-9)
+  * [Notes](#notes-11)
 - [Solr](#solr)
 - [StackEdit](#stackedit)
 - [Wallabag](#wallabag)
@@ -113,6 +119,20 @@
 
 **Github:** https://www.github.com/tiredofit/docker-backuppc
 
+----
+# Commento
+![Commento](https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/commento.png)
+
+**Application Name:** Commento
+
+**Application Site:** https://commento.io
+
+**Docker Hub:** https://gitlab.com/commento/commento
+
+**Github:** https://gitlab.com/commento/commento
+## Notes
+* PostgreSQL DB Required (Not Included)
+
 ----
 # CryptPad
 ![CryptPad](https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/cryptpad.png)
@@ -375,6 +395,18 @@ Password: ```flarum```
 * Username: ```admin```
 * Password: ```admin```
     
+----
+# Healthchecks
+![Healthchecks](https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/healthchecks.png)
+
+**Application Name:** Healthchecks
+
+**Application Site:** https://healthchecks.io/
+
+**Docker Hub:** https://hub.docker.com/r/galexrt/healthchecks/
+
+**Github:** https://github.com/galexrt/docker-healthchecks
+    
 ----
 # Homer
 ![Homer](https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/homer.png)
@@ -387,8 +419,8 @@ Password: ```flarum```
 
 **Github:** https://github.com/bastienwirtz/homer
 ## Before running the docker
-```mkdir -p /mnt/user/appdata/homer/config/```
-```wget -O /mnt/user/appdata/homer/config/config.yml https://raw.githubusercontent.com/bastienwirtz/homer/master/config.yml```
+* ```mkdir -p /mnt/user/appdata/homer/config/```
+* ```wget -O /mnt/user/appdata/homer/config/config.yml https://raw.githubusercontent.com/bastienwirtz/homer/master/config.yml```
 
 ----
 # Jitsi
@@ -516,6 +548,24 @@ For more content https://wiki.kiwix.org/wiki/Content
 
 **Github:** https://github.com/mattermost/mattermost-server
 
+----
+# Mattermost-push-proxy
+![Mattermost-push-proxy](https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/mattermost-push-proxy.png)
+
+**Application Name:** Mattermost-push-proxy
+
+**Application Site:** https://mattermost.com/
+
+**Docker Hub:** https://hub.docker.com/r/mattermost/mattermost-push-proxy/
+
+**Github:** https://github.com/mattermost/mattermost-push-proxy
+## Notes
+* https://developers.mattermost.com/contribute/mobile/push-notifications/service/
+## Before running the docker
+* ```mkdir /mnt/user/appdata/mattermost-push-proxy/config```
+* ```cd /mnt/user/appdata/mattermost-push-proxy/config```
+* ```wget https://raw.githubusercontent.com/mattermost/mattermost-push-proxy/master/config/mattermost-push-proxy.json```
+
 ----
 # Mediagoblin
 ![Mediagoblin](https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/mediagoblin.png)
diff --git a/templates/commento.xml b/templates/commento.xml
new file mode 100644
index 0000000..19d7ca3
--- /dev/null
+++ b/templates/commento.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<Container version="2">
+  <Name>commento</Name>
+  <Repository>registry.gitlab.com/commento/commento</Repository>
+  <Registry>https://gitlab.com/commento/commento</Registry>
+  <Network>bridge</Network>
+  <Shell>sh</Shell>
+  <Privileged>false</Privileged>
+  <Support>https://forums.unraid.net/topic/89502-support-a75g-repo/</Support>
+  <Project>https://commento.io</Project>
+  <Overview>An open source, privacy focused discussion platform. </Overview>
+  <Category>Productivity: Network:Web Network:Management</Category>
+  <WebUI>http://[IP]:[PORT:8080]/</WebUI>
+  <TemplateURL>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/commento.xml</TemplateURL>
+  <Icon>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/commento.png</Icon>
+  <Description>An open source, privacy focused discussion platform. </Description>
+  <Config Name="Port" Target="8080" Default="8080" Mode="tcp" Description="Port" Type="Port" Display="always" Required="true" Mask="false">8080</Config>
+  <Config Name="COMMENTO_ORIGIN" Target="COMMENTO_ORIGIN" Default="https://commento.example.com" Mode="" Description="Can be https://commento.example.com or http://ip:port" Type="Variable" Display="always" Required="true" Mask="false">https://commento.example.com</Config>
+  <Config Name="COMMENTO_POSTGRES" Target="COMMENTO_POSTGRES" Default="postgres://postgres:mysupersecurepassword@db:5432/commento?sslmode=disable" Mode="" Description="PostgreSQL Change it using your info" Type="Variable" Display="always" Required="true" Mask="false">postgres://postgres:mysupersecurepassword@dbhostnameorip:5432/commento?sslmode=disable</Config>
+  <Config Name="SMTP HOST" Target="COMMENTO_SMTP_HOST" Default="example.com" Mode="" Description="SMTP HOST" Type="Variable" Display="always" Required="false" Mask="false">example.com</Config>
+  <Config Name="SMTP PORT" Target="COMMENTO_SMTP_PORT" Default="587" Mode="" Description="SMTP PORT" Type="Variable" Display="always" Required="false" Mask="false">587</Config>
+  <Config Name="SMTP USERNAME" Target="COMMENTO_SMTP_USERNAME" Default="user@example.com" Mode="" Description="SMTP USERNAME" Type="Variable" Display="always" Required="false" Mask="false">user@example.com</Config>
+  <Config Name="SMTP PASSWORD" Target="COMMENTO_SMTP_PASSWORD" Default="smtppassword" Mode="" Description="SMTP PASSWORD" Type="Variable" Display="always" Required="false" Mask="false">smtppassword</Config>
+  <Config Name="SMTP FROM ADDRESS" Target="COMMENTO_SMTP_FROM_ADDRESS" Default="fromaddress@example.com" Mode="" Description="SMTP FROM ADDRESS" Type="Variable" Display="always" Required="false" Mask="false">fromaddress@example.com</Config>
+  <Config Name="COMMENTO_PORT" Target="COMMENTO_PORT" Default="8080" Mode="" Description="COMMENTO_PORT" Type="Variable" Display="advanced" Required="true" Mask="false">8080</Config>
+</Container>
\ No newline at end of file
diff --git a/templates/healthchecks.xml b/templates/healthchecks.xml
new file mode 100644
index 0000000..a9d8328
--- /dev/null
+++ b/templates/healthchecks.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<Container version="2">
+  <Name>healthchecks</Name>
+  <Repository>galexrt/healthchecks:latest</Repository>
+  <Registry>https://hub.docker.com/r/galexrt/healthchecks/</Registry>
+  <Network>bridge</Network>
+  <Shell>sh</Shell>
+  <Privileged>false</Privileged>
+  <Support>https://hub.docker.com/r/galexrt/healthchecks/</Support>
+  <Project>https://healthchecks.io/</Project>
+  <Overview>Simple and Effective Cron Job Monitoring</Overview>
+  <Category>Tools: Network:Web Network:Management</Category>
+  <WebUI>http://[IP]:[PORT:8000]/</WebUI>
+  <TemplateURL>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/healthchecks.xml</TemplateURL>
+  <Icon>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/healthchecks.png</Icon>
+  <Description>Simple and Effective Cron Job Monitoring</Description>
+  <Config Name="Port" Target="8000" Default="8000" Mode="tcp" Description="Port" Type="Port" Display="always" Required="true" Mask="false">8000</Config>
+  <Config Name="Appdata" Target="/data" Default="/mnt/user/appdata/healthchecks/" Mode="rw" Description="Appdata" Type="Path" Display="always" Required="true" Mask="false">/mnt/user/appdata/healthchecks/</Config>
+  <Config Name="DB_NAME" Target="DB_NAME" Default="/data/hc.sqlite" Mode="" Description="DB_NAME" Type="Variable" Display="always" Required="true" Mask="false">/data/hc.sqlite</Config>
+  <Config Name="SECRET_KEY" Target="SECRET_KEY" Default="ChangeMe" Mode="" Description="SECRET_KEY" Type="Variable" Display="always" Required="true" Mask="false">ChangeMe</Config>
+  <Config Name="PING_EMAIL_DOMAIN" Target="PING_EMAIL_DOMAIN" Default="example.com" Mode="" Description="PING_EMAIL_DOMAIN" Type="Variable" Display="always" Required="true" Mask="false">example.com</Config>
+  <Config Name="SITE_ROOT" Target="SITE_ROOT" Default="http://example.com" Mode="" Description="SITE_ROOT" Type="Variable" Display="always" Required="true" Mask="false">http://example.com</Config>
+  <Config Name="EMAIL_HOST" Target="EMAIL_HOST" Default="smtp.example.com" Mode="" Description="EMAIL_HOST" Type="Variable" Display="always" Required="true" Mask="false">smtp.example.com</Config>
+  <Config Name="EMAIL_PORT" Target="EMAIL_PORT" Default="25" Mode="" Description="EMAIL_PORT" Type="Variable" Display="always" Required="true" Mask="false">25</Config>
+  <Config Name="EMAIL_USE_TLS" Target="EMAIL_USE_TLS" Default="True|False" Mode="" Description="EMAIL_USE_TLS" Type="Variable" Display="always" Required="true" Mask="false">True</Config>
+  <Config Name="EMAIL_HOST_USER" Target="EMAIL_HOST_USER" Default="user@example.com" Mode="" Description="EMAIL_HOST_USER" Type="Variable" Display="always" Required="true" Mask="false">user@example.com</Config>
+  <Config Name="EMAIL_HOST_PASSWORD" Target="EMAIL_HOST_PASSWORD" Default="YOUR_PASSWORD" Mode="" Description="EMAIL_HOST_PASSWORD" Type="Variable" Display="always" Required="true" Mask="false">YOUR_PASSWORD</Config>
+  <Config Name="ALLOWED_HOSTS" Target="ALLOWED_HOSTS" Default="*" Mode="" Description="ALLOWED_HOSTS" Type="Variable" Display="always" Required="true" Mask="false">*</Config>
+</Container>
\ No newline at end of file
diff --git a/templates/icons/commento.png b/templates/icons/commento.png
new file mode 100644
index 0000000..d78d56d
Binary files /dev/null and b/templates/icons/commento.png differ
diff --git a/templates/icons/healthchecks.png b/templates/icons/healthchecks.png
new file mode 100644
index 0000000..b3603a8
Binary files /dev/null and b/templates/icons/healthchecks.png differ
diff --git a/templates/icons/mattermost-push-proxy.png b/templates/icons/mattermost-push-proxy.png
new file mode 100644
index 0000000..1e77751
Binary files /dev/null and b/templates/icons/mattermost-push-proxy.png differ
diff --git a/templates/mattermost-push-proxy.xml b/templates/mattermost-push-proxy.xml
new file mode 100644
index 0000000..7678cbf
--- /dev/null
+++ b/templates/mattermost-push-proxy.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<Container version="2">
+  <Name>mattermost-push-proxy</Name>
+  <Repository>mattermost/mattermost-push-proxy:latest</Repository>
+  <Registry>https://hub.docker.com/r/mattermost/mattermost-push-proxy/</Registry>
+  <Network>bridge</Network>
+  <Shell>sh</Shell>
+  <Privileged>false</Privileged>
+  <Support>https://forums.unraid.net/topic/89502-support-a75g-repo/</Support>
+  <Project>https://github.com/mattermost/mattermost-push-proxy</Project>
+  <Overview>Mattermost Push Notification Service.&#xD;
+&#xD;
+after starting &#xD;
+mkdir /mnt/user/appdata/mattermost-push-proxy/config&#xD;
+cd /mnt/user/appdata/mattermost-push-proxy/config&#xD;
+wget https://raw.githubusercontent.com/mattermost/mattermost-push-proxy/master/config/mattermost-push-proxy.json&#xD;
+&#xD;
+https://developers.mattermost.com/contribute/mobile/push-notifications/service/</Overview>
+  <Category>Other:</Category>
+  <TemplateURL>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/mattermost-push-proxy.xml</TemplateURL>
+  <Icon>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/mattermost-push-proxy.png</Icon>
+  <Description>Mattermost Push Notification Service.&#xD;
+&#xD;
+after starting &#xD;
+mkdir /mnt/user/appdata/mattermost-push-proxy/config&#xD;
+cd /mnt/user/appdata/mattermost-push-proxy/config&#xD;
+wget https://raw.githubusercontent.com/mattermost/mattermost-push-proxy/master/config/mattermost-push-proxy.json&#xD;
+&#xD;
+https://developers.mattermost.com/contribute/mobile/push-notifications/service/</Description>
+  <Config Name="Port" Target="8066" Default="8066" Mode="tcp" Description="Port" Type="Port" Display="always" Required="true" Mask="false">8066</Config>
+  <Config Name="Mattermost Push Proxy Path" Target="/mattermost-push-proxy" Default="/mnt/user/appdata/mattermost-push-proxy/proxy/" Mode="rw" Description="Mattermost Push Proxy Path" Type="Path" Display="always" Required="true" Mask="false">/mnt/user/appdata/mattermost-push-proxy/</Config>
+  <Config Name="Config Path" Target="/config" Default="/mnt/user/appdata/mattermost-push-proxy/config/" Mode="rw" Description="Config Path" Type="Path" Display="always" Required="true" Mask="false">/mnt/user/appdata/mattermost-push-proxy/config/</Config>
+  <Config Name="Certs Path" Target="/certs" Default="" Mode="rw" Description="Certs Path" Type="Path" Display="always" Required="true" Mask="false">/mnt/user/appdata/mattermost-push-proxy/certs/</Config>
+</Container>
\ No newline at end of file