diff --git a/templates/chibisafe-caddy.xml b/templates/chibisafe-caddy.xml
new file mode 100644
index 0000000..a8df216
--- /dev/null
+++ b/templates/chibisafe-caddy.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<Container version="2">
+  <Name>chibisafe-caddy</Name>
+  <Repository>caddy:2-alpine</Repository>
+  <Registry>https://hub.docker.com/_/caddy/</Registry>
+  <Network>bridge</Network>
+  <Shell>sh</Shell>
+  <Privileged>false</Privileged>
+  <Support>https://forums.unraid.net/topic/89502-support-a75g-repo/</Support>
+  <Project>https://chibisafe.moe/</Project>
+  <Overview>chibisafe is a modern and self-hosted take on file uploading services that can handle anything you throw at it thanks to it's robust and fast API, chunked uploads support and more.&#xD;
+It's easily customizable and deploying your own instance is a breeze. &#xD;
+&#xD;
+1. Create docker network - "docker network create NETOWK" https://www.youtube.com/watch?v=7fzBDCI8O2w&#xD;
+2. Install chibisafe-server put it in the docker network you create and change SERVE_UPLOADS_FROM variable to your IP example "http://192.168.0.100:24424" &#xD;
+3. Install chibisafe put it in the docker network you create&#xD;
+4. Unraid CLI "wget -O /mnt/user/appdata/chibisafe/Caddyfile https://raw.githubusercontent.com/chibisafe/chibisafe/master/Caddyfile"&#xD;
+5. Install chibisafe-caddy and use it to access chibisafe&#xD;
+6. Access chibisafe using "http://Unraid_IP:24424"&#xD;
+6. Default login admin admin</Overview>
+  <Category>Productivity:</Category>
+  <WebUI>http://[IP]:[PORT:80]</WebUI>
+  <TemplateURL>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/chibisafe-caddy.xml</TemplateURL>
+  <Icon>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/chibisafe.png</Icon>
+  <Requires>Read Overview&#xD;
+chibisafe_server&#xD;
+chibisafe&#xD;
+docker network</Requires>
+  <Config Name="Host Port 1" Target="80" Default="" Mode="tcp" Description="" Type="Port" Display="always" Required="false" Mask="false">24424</Config>
+  <Config Name="CadyFile Path" Target="/etc/caddy/Caddyfile" Default="" Mode="ro" Description="" Type="Path" Display="always" Required="false" Mask="false">/mnt/cache/appdata/chibisafe/Caddyfile</Config>
+  <Config Name="Uploads Path" Target="/app/uploads" Default="" Mode="ro" Description="" Type="Path" Display="always" Required="false" Mask="false">/mnt/cache/appdata/chibisafe/uploads/</Config>
+  <Config Name="BASE_URL" Target="BASE_URL" Default="" Mode="" Description="" Type="Variable" Display="always" Required="false" Mask="false">:80</Config>
+</Container>
\ No newline at end of file
diff --git a/templates/chibisafe.xml b/templates/chibisafe.xml
index 9052131..47bc838 100644
--- a/templates/chibisafe.xml
+++ b/templates/chibisafe.xml
@@ -9,16 +9,22 @@
   <Support>https://forums.unraid.net/topic/89502-support-a75g-repo/</Support>
   <Project>https://chibisafe.moe/</Project>
   <Overview>chibisafe is a modern and self-hosted take on file uploading services that can handle anything you throw at it thanks to it's robust and fast API, chunked uploads support and more.&#xD;
-&#xD;
 It's easily customizable and deploying your own instance is a breeze. &#xD;
 &#xD;
-Default login admin admin</Overview>
-  <Category>Productivity: Tools:</Category>
-  <WebUI>http://[IP]:[PORT:8000]</WebUI>
+1. Create docker network - "docker network create NETOWK" https://www.youtube.com/watch?v=7fzBDCI8O2w&#xD;
+2. Install chibisafe-server put it in the docker network you create and change SERVE_UPLOADS_FROM variable to your IP example "http://192.168.0.100:24424" &#xD;
+3. Install chibisafe put it in the docker network you create&#xD;
+4. Unraid CLI "wget -O /mnt/user/appdata/chibisafe/Caddyfile https://raw.githubusercontent.com/chibisafe/chibisafe/master/Caddyfile"&#xD;
+5. Install chibisafe-caddy and use it to access chibisafe&#xD;
+6. Access chibisafe using "http://Unraid_IP:24424"&#xD;
+6. Default login admin admin</Overview>
+  <Category>Productivity: Tools:Utilities</Category>
+  <WebUI>http://[IP]:[PORT:8001]</WebUI>
   <TemplateURL>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/chibisafe.xml</TemplateURL>
   <Icon>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/chibisafe.png</Icon>
-  <Config Name="Port 1" Target="8000" Default="" Mode="tcp" Description="" Type="Port" Display="always" Required="false" Mask="false">24424</Config>
-  <Config Name="Database Path" Target="/home/node/chibisafe/database" Default="" Mode="rw" Description="" Type="Path" Display="always" Required="false" Mask="false">/mnt/user/appdata/chibisafe/database/</Config>
-  <Config Name="Uploads Path" Target="/home/node/chibisafe/uploads" Default="" Mode="rw" Description="" Type="Path" Display="always" Required="false" Mask="false">/mnt/user/appdata/chibisafe/uploads/</Config>
-  <Config Name="Logs Path" Target="/home/node/chibisafe/logs" Default="" Mode="rw" Description="" Type="Path" Display="always" Required="false" Mask="false">/mnt/user/appdata/chibisafe/logs/</Config>
+  <Requires>Read Overview&#xD;
+chibisafe_server&#xD;
+chibisafe-caddy&#xD;
+docker network</Requires>
+  <Config Name="BASE_API_URL" Target="BASE_API_URL" Default="" Mode="" Description="Don't change this unless you know what you are doing " Type="Variable" Display="advanced" Required="false" Mask="false">http://chibisafe_server:8000</Config>
 </Container>
\ No newline at end of file
diff --git a/templates/chibisafe_server.xml b/templates/chibisafe_server.xml
new file mode 100644
index 0000000..04f2eac
--- /dev/null
+++ b/templates/chibisafe_server.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<Container version="2">
+  <Name>chibisafe_server</Name>
+  <Repository>chibisafe/chibisafe-server:latest</Repository>
+  <Registry>https://hub.docker.com/r/chibisafe/chibisafe/</Registry>
+  <Network>bridge</Network>
+  <Shell>sh</Shell>
+  <Privileged>false</Privileged>
+  <Support>https://forums.unraid.net/topic/89502-support-a75g-repo/</Support>
+  <Project>https://chibisafe.moe/</Project>
+  <Overview>chibisafe is a modern and self-hosted take on file uploading services that can handle anything you throw at it thanks to it's robust and fast API, chunked uploads support and more.&#xD;
+It's easily customizable and deploying your own instance is a breeze. &#xD;
+&#xD;
+1. Create docker network - "docker network create NETOWK" https://www.youtube.com/watch?v=7fzBDCI8O2w&#xD;
+2. Install chibisafe-server put it in the docker network you create and change SERVE_UPLOADS_FROM variable to your IP example "http://192.168.0.100:24424" &#xD;
+3. Install chibisafe put it in the docker network you create&#xD;
+4. Unraid CLI "wget -O /mnt/user/appdata/chibisafe/Caddyfile https://raw.githubusercontent.com/chibisafe/chibisafe/master/Caddyfile"&#xD;
+5. Install chibisafe-caddy and use it to access chibisafe&#xD;
+6. Access chibisafe using "http://Unraid_IP:24424"&#xD;
+6. Default login admin admin</Overview>
+  <Category>Productivity: Tools:Utilities</Category>
+  <WebUI>http://[IP]:[PORT:8000]</WebUI>
+  <TemplateURL>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/chibisafe_server.xml</TemplateURL>
+  <Icon>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/chibisafe.png</Icon>
+  <Requires>Read Overview&#xD;
+chibisafe&#xD;
+chibisafe-caddy&#xD;
+docker network</Requires>
+  <Config Name="Database Path" Target="/app/database" Default="" Mode="rw" Description="" Type="Path" Display="always" Required="false" Mask="false">/mnt/user/appdata/chibisafe/database/</Config>
+  <Config Name="Uploads Path" Target="/app/uploads" Default="" Mode="rw" Description="" Type="Path" Display="always" Required="false" Mask="false">/mnt/user/appdata/chibisafe/uploads/</Config>
+  <Config Name="Logs Path" Target="/app/logs" Default="" Mode="rw" Description="" Type="Path" Display="always" Required="false" Mask="false">/mnt/user/appdata/chibisafe/logs/</Config>
+  <Config Name="SERVE_UPLOADS_FROM" Target="SERVE_UPLOADS_FROM" Default="" Mode="" Description="Change it to Unraid IP" Type="Variable" Display="always" Required="false" Mask="false">http://Unraid_IP:24424</Config>
+</Container>
\ No newline at end of file