diff --git a/README.md b/README.md
index 5bb600e..38f8cf3 100644
--- a/README.md
+++ b/README.md
@@ -34,6 +34,7 @@
 - [Jitsi](#jitsi)
   * [Change appdata location](#change-appdata-location)
   * [Notes](#notes-1)
+- [Keycloak](#keycloak)
 - [Kiwix-serve](#kiwix-serve)
   * [Notes](#notes-2)
   * [Content](#content)
@@ -55,6 +56,7 @@
 - [Riot-web](#riot-web)
   * [Before running the docker](#before-running-the-docker-3)
 - [Searx](#searx)
+- [Selfoss](#selfoss)
 - [Shiori](#shiori)
   * [Default username and password](#default-username-and-password-4)
   * [Notes](#notes-7)
@@ -352,6 +354,18 @@ Password: ```flarum```
 * How it all work
 ![](https://335wvf48o1332cksy23mw1pj-wpengine.netdna-ssl.com/wp-content/uploads/2018/07/docker-jitsi-meet.png)
 
+----
+# Keycloak
+![Keycloak](https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/keycloak.png)
+
+**Application Name:** Keycloak
+
+**Application Site:** https://www.keycloak.org/
+
+**Registry:** https://quay.io/repository/keycloak/keycloak
+
+**Github:** https://github.com/keycloak/keycloak
+
 ----
 # Kiwix-serve
 ![Kiwix-serve](https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/kiwix.png)
@@ -533,6 +547,18 @@ For more content https://wiki.kiwix.org/wiki/Content
 
 **Github:** https://github.com/asciimoo/searx
     
+----
+# Selfoss
+![Selfoss](https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/selfoss.png)
+
+**Application Name:** Selfoss
+
+**Application Site:** https://selfoss.aditu.de/
+
+**Docker Hub:** https://hub.docker.com/r/hardware/selfoss/
+
+**Github:** https://github.com/SSilence/selfoss/
+    
 ----
 # Shiori
 ![Shiori](https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/shiori.png)
diff --git a/templates/icons/keycloak.png b/templates/icons/keycloak.png
new file mode 100644
index 0000000..3d26bbd
Binary files /dev/null and b/templates/icons/keycloak.png differ
diff --git a/templates/icons/selfoss.png b/templates/icons/selfoss.png
new file mode 100644
index 0000000..fda5f53
Binary files /dev/null and b/templates/icons/selfoss.png differ
diff --git a/templates/keycloak.xml b/templates/keycloak.xml
new file mode 100644
index 0000000..6d185ed
--- /dev/null
+++ b/templates/keycloak.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<Container version="2">
+  <Name>keycloak</Name>
+  <Repository>quay.io/keycloak/keycloak:latest</Repository>
+  <Registry>https://quay.io/repository/keycloak/keycloak</Registry>
+  <Network>bridge</Network>
+  <Shell>sh</Shell>
+  <Privileged>false</Privileged>
+  <Support>https://forums.unraid.net/topic/89502-support-a75g-repo/</Support>
+  <Project>https://www.keycloak.org/</Project>
+  <Overview>Open Source Identity and Access Management.</Overview>
+  <Category>Security: Tools:</Category>
+  <WebUI>http://[IP]:[PORT:8080]/</WebUI>
+  <TemplateURL>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/keycloak.xml</TemplateURL>
+  <Icon>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/keycloak.png</Icon>
+  <ExtraParams/>
+  <PostArgs/>
+  <DonateText/>
+  <DonateLink/>
+  <Description>Open Source Identity and Access Management.</Description>
+  <Labels/>
+  <Config Name="Port" Target="8080" Default="8080" Mode="tcp" Description="Port" Type="Port" Display="always" Required="true" Mask="false">8080</Config>
+  <Config Name="KEYCLOAK_USER" Target="KEYCLOAK_USER" Default="Admin" Mode="" Description="User" Type="Variable" Display="always" Required="false" Mask="false">admin</Config>
+  <Config Name="KEYCLOAK_PASSWORD" Target="KEYCLOAK_PASSWORD" Default="admin" Mode="" Description="Password" Type="Variable" Display="always" Required="false" Mask="false">admin</Config>
+</Container>
\ No newline at end of file
diff --git a/templates/selfoss.xml b/templates/selfoss.xml
new file mode 100644
index 0000000..3c716a3
--- /dev/null
+++ b/templates/selfoss.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<Container version="2">
+  <Name>selfoss</Name>
+  <Repository>hardware/selfoss</Repository>
+  <Registry>https://hub.docker.com/r/hardware/selfoss/</Registry>
+  <Network>bridge</Network>
+  <Shell>sh</Shell>
+  <Privileged>false</Privileged>
+  <Support>https://forums.unraid.net/topic/89502-support-a75g-repo/</Support>
+  <Project>https://selfoss.aditu.de/</Project>
+  <Overview>Selfoss, the new multipurpose rss reader, live stream, mashup, aggregation web application.</Overview>
+  <Category>Other:</Category>
+  <WebUI>http://[IP]:[PORT:8888]/</WebUI>
+  <TemplateURL>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/selfoss.xml</TemplateURL>
+  <Icon>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/selfoss.png</Icon>
+  <ExtraParams/>
+  <PostArgs/>
+  <DonateText/>
+  <DonateLink/>
+  <Description>Selfoss, the new multipurpose rss reader, live stream, mashup, aggregation web application.</Description>
+  <Config Name="Port" Target="8888" Default="8888" Mode="tcp" Description="Port" Type="Port" Display="always" Required="true" Mask="false">8888</Config>
+  <Config Name="Appdata" Target="/selfoss/data" Default="/mnt/user/appdata/selfoss/" Mode="rw" Description="Appdata" Type="Path" Display="always" Required="true" Mask="false">/mnt/user/appdata/selfoss/</Config>
+  <Config Name="CRON_PERIOD" Target="CRON_PERIOD" Default="15m" Mode="" Description="Cronjob period for updating feeds" Type="Variable" Display="always" Required="false" Mask="false">15m</Config>
+  <Config Name="UPLOAD_MAX_SIZE" Target="UPLOAD_MAX_SIZE" Default="25M" Mode="" Description="Attachment size limit" Type="Variable" Display="always" Required="false" Mask="false">25M</Config>
+  <Config Name="LOG_TO_STDOUT" Target="LOG_TO_STDOUT" Default="false|true" Mode="" Description="Enable nginx and php error logs to stdout" Type="Variable" Display="always" Required="false" Mask="false">false</Config>
+  <Config Name="MEMORY_LIMIT" Target="MEMORY_LIMIT" Default="128M" Mode="" Description="PHP memory limit" Type="Variable" Display="always" Required="false" Mask="false">128M</Config>
+  <Config Name="UID" Target="UID" Default="99" Mode="" Description="UID" Type="Variable" Display="advanced" Required="false" Mask="false">99</Config>
+  <Config Name="GID" Target="GID" Default="100" Mode="" Description="GID" Type="Variable" Display="advanced" Required="false" Mask="false">100</Config>
+</Container>
\ No newline at end of file