diff --git a/templates/cyberchef.xml b/templates/cyberchef.xml
new file mode 100644
index 0000000..a874d05
--- /dev/null
+++ b/templates/cyberchef.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<Container version="2">
+  <Name>cyberchef</Name>
+  <Repository>mpepping/cyberchef</Repository>
+  <Registry>https://hub.docker.com/r/mpepping/cyberchef/</Registry>
+  <Network>bridge</Network>
+  <MyIP/>
+  <Shell>sh</Shell>
+  <Privileged>false</Privileged>
+  <Support>https://hub.docker.com/r/mpepping/cyberchef/</Support>
+  <Project/>
+  <Overview>The Cyber Swiss Army Knife - a web app for encryption, encoding, compression and data analysis.</Overview>
+  <Category/>
+  <WebUI>http://[IP]:[PORT:8000]</WebUI>
+  <TemplateURL/>
+  <Icon>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/cyberchef.png</Icon>
+  <ExtraParams/>
+  <PostArgs/>
+  <CPUset/>
+  <DateInstalled>1581355422</DateInstalled>
+  <DonateText/>
+  <DonateLink/>
+  <Description>The Cyber Swiss Army Knife - a web app for encryption, encoding, compression and data analysis.</Description>
+  <Networking>
+    <Mode>bridge</Mode>
+    <Publish>
+      <Port>
+        <HostPort>8000</HostPort>
+        <ContainerPort>8000</ContainerPort>
+        <Protocol>tcp</Protocol>
+      </Port>
+    </Publish>
+  </Networking>
+  <Data/>
+  <Environment/>
+  <Labels/>
+  <Config Name="Host Port 1" Target="8000" Default="8000" Mode="tcp" Description="Container Port: 8000" Type="Port" Display="always" Required="false" Mask="false">8000</Config>
+</Container>
\ No newline at end of file
diff --git a/templates/icons/cyberchef.png b/templates/icons/cyberchef.png
new file mode 100644
index 0000000..eb18228
Binary files /dev/null and b/templates/icons/cyberchef.png differ
diff --git a/templates/icons/mailpile.png b/templates/icons/mailpile.png
new file mode 100644
index 0000000..7652677
Binary files /dev/null and b/templates/icons/mailpile.png differ
diff --git a/templates/mailpile.xml b/templates/mailpile.xml
new file mode 100644
index 0000000..1107f6e
--- /dev/null
+++ b/templates/mailpile.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+<Container version="2">
+  <Name>mailpile</Name>
+  <Repository>rroemhild/mailpile</Repository>
+  <Registry>https://hub.docker.com/r/rroemhild/mailpile/</Registry>
+  <Network>bridge</Network>
+  <MyIP/>
+  <Shell>sh</Shell>
+  <Privileged>false</Privileged>
+  <Support>https://hub.docker.com/r/rroemhild/mailpile/</Support>
+  <Project/>
+  <Overview>Mailpile is software, an e-mail client. It runs on your desktop or laptop computer and you interact with it by using your web browser. The goal of Mailpile is to allow people to send e-mail in a more secure and private manner than before.</Overview>
+  <Category/>
+  <WebUI>http://[IP]:[PORT:33411]</WebUI>
+  <TemplateURL/>
+  <Icon>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/mailpile.png</Icon>
+  <ExtraParams/>
+  <PostArgs/>
+  <CPUset/>
+  <DateInstalled>1581354570</DateInstalled>
+  <DonateText/>
+  <DonateLink/>
+  <Description>Mailpile is software, an e-mail client. It runs on your desktop or laptop computer and you interact with it by using your web browser. The goal of Mailpile is to allow people to send e-mail in a more secure and private manner than before.</Description>
+  <Networking>
+    <Mode>bridge</Mode>
+    <Publish>
+      <Port>
+        <HostPort>33411</HostPort>
+        <ContainerPort>33411</ContainerPort>
+        <Protocol>tcp</Protocol>
+      </Port>
+    </Publish>
+  </Networking>
+  <Data>
+    <Volume>
+      <HostDir>/mnt/user/appdata/Mailpile/</HostDir>
+      <ContainerDir>/root/.local/share/Mailpile</ContainerDir>
+      <Mode>rw</Mode>
+    </Volume>
+    <Volume>
+      <HostDir>/mnt/user/appdata/Mailpile/gnupg/</HostDir>
+      <ContainerDir>/root/.gnupg</ContainerDir>
+      <Mode>rw</Mode>
+    </Volume>
+  </Data>
+  <Environment/>
+  <Labels/>
+  <Config Name="Port 1" Target="33411" Default="" Mode="tcp" Description="Container Port: 33411" Type="Port" Display="always" Required="true" Mask="false">33411</Config>
+  <Config Name="Path 1" Target="/root/.local/share/Mailpile" Default="" Mode="rw" Description="Container Path: /root/.local/share/Mailpile" Type="Path" Display="always" Required="true" Mask="false">/mnt/user/appdata/Mailpile/</Config>
+  <Config Name="Path 2" Target="/root/.gnupg" Default="" Mode="rw" Description="Container Path: /root/.gnupg" Type="Path" Display="always" Required="true" Mask="false">/mnt/user/appdata/Mailpile/gnupg/</Config>
+</Container>
\ No newline at end of file