diff --git a/README.md b/README.md
index 02814d1..6bb758e 100644
--- a/README.md
+++ b/README.md
@@ -42,6 +42,7 @@
 - [Leantime](#leantime)
   * [First installation](#first-installation-3)
 - [Mailpile](#mailpile)
+- [Matomo](#matomo)
 - [Matrix](#matrix)
   * [Guides](#guides)
 - [Mattermost](#mattermost)
@@ -55,6 +56,8 @@
 - [Pure-FTPd](#pure-ftpd)
   * [Notes](#notes-6)
 - [Pwndrop](#pwndrop)
+- [Quakejs](#quakejs)
+- [Notes](#notes-7)
 - [Reactive-resume](#reactive-resume)
 - [Riot-web](#riot-web)
   * [Before running the docker](#before-running-the-docker-3)
@@ -62,7 +65,7 @@
 - [Selfoss](#selfoss)
 - [Shiori](#shiori)
   * [Default username and password](#default-username-and-password-4)
-  * [Notes](#notes-7)
+  * [Notes](#notes-8)
 - [StackEdit](#stackedit)
 - [Wallabag](#wallabag)
   * [Default username and password](#default-username-and-password-5)
@@ -423,6 +426,18 @@ For more content https://wiki.kiwix.org/wiki/Content
 
 **Github:** https://github.com/rroemhild/docker-mailpile
  
+----
+# Matomo
+![Mailpile](https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/matomo.png)
+
+**Application Name:** Matomo
+
+**Application Site:** https://matomo.org/
+
+**Docker Hub:** https://hub.docker.com/r/bitnami/matomo/
+
+**Github:** https://github.com/bitnami/bitnami-docker-matomo
+ 
 ----
 # Matrix
 ![Matrix](https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/matrix.png)
@@ -526,17 +541,32 @@ For more content https://wiki.kiwix.org/wiki/Content
 * https://github.com/crazy-max/docker-pure-ftpd#notes
 
 ----
+
 # Pwndrop
 ![Pwndrop](https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/pwndrop.png)
 
 **Application Name:** Pwndrop
 
-**Application Site:** https://github.com/kgretzky/pwndrop
+**Application Site:** ttps://github.com/treyyoder/quakejs-docker
 
 **Docker Hub:** https://hub.docker.com/r/harshavardhanj/pwndrop
 
-**Github:** https://github.com/kgretzky/pwndrop
+**Github:** ttps://github.com/treyyoder/quakejs-docker
 
+----
+# Quakejs
+![Quakejs](https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/quakejs.png)
+
+**Application Name:** Quakejs
+
+**Application Site:** https://github.com/treyyoder/quakejs-docker
+
+**Docker Hub:** https://hub.docker.com/r/treyyoder/quakejs/
+
+**Github:** https://github.com/treyyoder/quakejs-docker
+# Notes
+* Use Custom:br0 https://youtu.be/2VnQxxn00jU?t=121 put Fixed IP address
+* Copy the ip and access it using you broswer
 ----
 # Reactive-resume
 ![Reactive-resume](https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/reactive-resume.png)
diff --git a/templates/icons/matomo.png b/templates/icons/matomo.png
new file mode 100644
index 0000000..0ae8052
Binary files /dev/null and b/templates/icons/matomo.png differ
diff --git a/templates/icons/quakejs.png b/templates/icons/quakejs.png
new file mode 100644
index 0000000..adbdf3b
Binary files /dev/null and b/templates/icons/quakejs.png differ
diff --git a/templates/matomo.xml b/templates/matomo.xml
new file mode 100644
index 0000000..1a692ab
--- /dev/null
+++ b/templates/matomo.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<Container version="2">
+  <Name>matomo</Name>
+  <Repository>bitnami/matomo:latest</Repository>
+  <Registry>https://hub.docker.com/r/bitnami/matomo/</Registry>
+  <Network>bridge</Network>
+  <Shell>sh</Shell>
+  <Privileged>false</Privileged>
+  <Support>https://forums.unraid.net/topic/89502-support-a75g-repo/</Support>
+  <Project>https://matomo.org/</Project>
+  <Overview>Matomo is a free and open source web analytics application written by a team of international developers that runs on a PHP/MySQL webserver.</Overview>
+  <Category>Productivity: Tools: Network:Management</Category>
+  <WebUI>https://[IP]:[PORT:443]/</WebUI>
+  <TemplateURL>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/matomo.xml</TemplateURL>
+  <Icon>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/matomo.png</Icon>
+  <ExtraParams/>
+  <PostArgs/>
+  <DonateText/>
+  <DonateLink/>
+  <Description>Matomo is a free and open source web analytics application written by a team of international developers that runs on a PHP/MySQL webserver.</Description>
+  <Config Name="HTTP" Target="80" Default="8000" Mode="tcp" Description="HTTP" Type="Port" Display="always" Required="true" Mask="false">8000</Config>
+  <Config Name="HTTPs" Target="443" Default="8443" Mode="tcp" Description="HTTPs" Type="Port" Display="always" Required="true" Mask="false">8443</Config>
+  <Config Name="Appdata" Target="/bitnami" Default="/mnt/user/appdata/matomo/" Mode="rw" Description="Appdata" Type="Path" Display="always" Required="true" Mask="false">/mnt/user/appdata/matomo/</Config>
+  <Config Name="MARIADB_HOST" Target="MARIADB_HOST" Default="mariadb" Mode="" Description="Hostname or IP for MariaDB server." Type="Variable" Display="always" Required="true" Mask="false">mariadb</Config>
+  <Config Name="MARIADB_PORT_NUMBER" Target="MARIADB_PORT_NUMBER" Default="3306" Mode="" Description="Port used by MariaDB server. " Type="Variable" Display="always" Required="true" Mask="false">3306</Config>
+  <Config Name="MATOMO_DATABASE_NAME" Target="MATOMO_DATABASE_NAME" Default="bitnami_matomo" Mode="" Description="Database name that Matomo will use to connect with the database." Type="Variable" Display="always" Required="true" Mask="false">bitnami_matomo</Config>
+  <Config Name="MATOMO_DATABASE_USER" Target="MATOMO_DATABASE_USER" Default="bn_matomo" Mode="" Description="Database user that Matomo will use to connect with the database. " Type="Variable" Display="always" Required="true" Mask="false">bn_matomo</Config>
+  <Config Name="MATOMO_DATABASE_PASSWORD" Target="MATOMO_DATABASE_PASSWORD" Default="password" Mode="" Description="Database password that Matomo will use to connect with the database. " Type="Variable" Display="always" Required="true" Mask="false">password</Config>
+  <Config Name="MATOMO_USERNAME" Target="MATOMO_USERNAME" Default="User" Mode="" Description="Matomo application username." Type="Variable" Display="always" Required="false" Mask="false">User</Config>
+  <Config Name="MATOMO_HOST" Target="MATOMO_HOST" Default="192.168.0.100" Mode="" Description="Matomo application host. Change it to your IP" Type="Variable" Display="always" Required="true" Mask="false">192.168.0.100</Config>
+  <Config Name="MATOMO_PASSWORD" Target="MATOMO_PASSWORD" Default="bitnami" Mode="" Description="Matomo application password" Type="Variable" Display="always" Required="false" Mask="false">bitnami</Config>
+  <Config Name="ALLOW_EMPTY_PASSWORD" Target="ALLOW_EMPTY_PASSWORD" Default="no|yes" Mode="" Description="It can be used to allow blank passwords." Type="Variable" Display="advanced" Required="true" Mask="false">no</Config>
+  <Config Name="PHP_MEMORY_LIMIT" Target="PHP_MEMORY_LIMIT" Default="128M" Mode="" Description="Memory limit for PHP." Type="Variable" Display="advanced" Required="true" Mask="false">128M</Config>
+</Container>
\ No newline at end of file
diff --git a/templates/quakejs.xml b/templates/quakejs.xml
new file mode 100644
index 0000000..d4c3cf9
--- /dev/null
+++ b/templates/quakejs.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<Container version="2">
+  <Name>quakejs</Name>
+  <Repository>treyyoder/quakejs:latest</Repository>
+  <Registry>https://hub.docker.com/r/treyyoder/quakejs/</Registry>
+  <Network>br0</Network>
+  <MyIP>192.168.0.266</MyIP>
+  <Shell>sh</Shell>
+  <Privileged>false</Privileged>
+  <Support>https://forums.unraid.net/topic/89502-support-a75g-repo/</Support>
+  <Project>https://github.com/treyyoder/quakejs-docker</Project>
+  <Overview>QuakeJS is a port of ioquake3 to JavaScript with the help of Emscripten.[br]IMPORTANT Use Custom:br0 https://youtu.be/2VnQxxn00jU?t=121 put Fixed IP address, then copy the ip and access it using you broswer [BR][span style='color: #ff9900;'][B]DON'T USE BRIDGE I'M NOT RESPONSABLE FOR UNRAID CONFLICTING WITH PORT 80 FOR THIS DOCKER[/B]</Overview>
+  <Category>Other:</Category>
+  <WebUI>http://[IP]:[PORT:80]/</WebUI>
+  <TemplateURL>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/matomo.xml</TemplateURL>
+  <Icon>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/quakejs.png</Icon>
+  <ExtraParams/>
+  <PostArgs/>
+  <DonateText/>
+  <DonateLink/>
+  <Description>QuakeJS is a port of ioquake3 to JavaScript with the help of Emscripten.[br]IMPORTANT Use Custom:br0 https://youtu.be/2VnQxxn00jU?t=121 put Fixed IP address, then copy the ip and access it using you broswer [BR][span style='color: #ff9900;'][B]DON'T USE BRIDGE I'M NOT RESPONSABLE FOR UNRAID CONFLICTING WITH PORT 80 FOR THIS DOCKER[/B]</Description>
+  <Config Name="HTTP" Target="80" Default="80" Mode="" Description="HTTP" Type="Variable" Display="always" Required="true" Mask="false">80</Config>
+  <Config Name="Game Port" Target="27960" Default="27960" Mode="tcp" Description="Game Port" Type="Port" Display="always" Required="true" Mask="false">27960</Config>
+  <Config Name="SERVER" Target="SERVER" Default="192.168.0.266" Mode="" Description="Put your Fixed IP address Here" Type="Variable" Display="always" Required="true" Mask="false">192.168.0.266</Config>
+  <Config Name="HTTP_PORT" Target="HTTP_PORT" Default="80" Mode="" Description="HTTP_PORT" Type="Variable" Display="always" Required="true" Mask="false">80</Config>
+</Container>
\ No newline at end of file