diff --git a/Cool Stuff.md b/Cool Stuff.md
index 9693a13..40dd7b5 100644
--- a/Cool Stuff.md	
+++ b/Cool Stuff.md	
@@ -46,6 +46,7 @@
 [https://getcockpit.com/]
 [https://hub.docker.com/r/agentejo/cockpit]
 [https://hub.docker.com/r/homeassistant/home-assistant]
+
 - Factorio
 - Eclipse Theia
 - Joomla
@@ -55,6 +56,12 @@
 - Transmission
 - YOURLS
 
+  [https://www.silverstripe.com/]
+
+[https://www.mautic.org/](https://www.mautic.org/)
+
+
+
 ###### GitLab Runner
 
 [https://docs.gitlab.com/runner/install/docker.html]
diff --git a/templates/Bind/0/docker-compose.yml b/templates/Bind/0/docker-compose.yml
index 5d6f56e..24adb08 100644
--- a/templates/Bind/0/docker-compose.yml
+++ b/templates/Bind/0/docker-compose.yml
@@ -5,6 +5,8 @@ services:
     dns:
       - 1.1.1.1
       - 1.0.0.1
+      - 2606:4700:4700::1111
+      - 2606:4700:4700::1001
     environment:
       WEBMIN_ENABLED: ${WEBMIN_ENABLED}
       {{- if eq .Values.WEBMIN_ENABLED "true"}}
diff --git a/templates/Cryptpad/0/docker-compose.yml b/templates/Cryptpad/0/docker-compose.yml
index 41c3c5e..753c55e 100644
--- a/templates/Cryptpad/0/docker-compose.yml
+++ b/templates/Cryptpad/0/docker-compose.yml
@@ -6,6 +6,8 @@ services:
     dns: # Using Cloudflare DNS
       - 1.1.1.1
       - 1.0.0.1
+      - 2606:4700:4700::1111
+      - 2606:4700:4700::1001
     labels:
       io.rancher.container.pull_image: always
       {{- if .Values.HOST_LABEL}}
diff --git a/templates/Ghost/0/docker-compose.yml b/templates/Ghost/0/docker-compose.yml
index a7348b0..2506595 100644
--- a/templates/Ghost/0/docker-compose.yml
+++ b/templates/Ghost/0/docker-compose.yml
@@ -6,6 +6,8 @@ services:
     dns:
       - 1.1.1.1
       - 1.0.0.1
+      - 2606:4700:4700::1111
+      - 2606:4700:4700::1001
     environment:
       {{- if .Values.TRAEFIK_HOST}}
       node_env: production
diff --git a/templates/GitLab/0/docker-compose.yml b/templates/GitLab/0/docker-compose.yml
index 6ed3671..c8d4356 100644
--- a/templates/GitLab/0/docker-compose.yml
+++ b/templates/GitLab/0/docker-compose.yml
@@ -6,6 +6,8 @@ services:
     dns:
       - 1.1.1.1
       - 1.0.0.1
+      - 2606:4700:4700::1111
+      - 2606:4700:4700::1001
     environment:
       GITLAB_OMNIBUS_CONFIG: |
         external_url 'https://${TRAEFIK_HOST}'
diff --git a/templates/Gitea/0/docker-compose.yml b/templates/Gitea/0/docker-compose.yml
index 80aab9e..bfa315c 100644
--- a/templates/Gitea/0/docker-compose.yml
+++ b/templates/Gitea/0/docker-compose.yml
@@ -6,6 +6,8 @@ services:
     dns:
       - 1.1.1.1
       - 1.0.0.1
+      - 2606:4700:4700::1111
+      - 2606:4700:4700::1001
     environment:
       USER_UID: '1000'
       USER_GID: '1000'
@@ -46,6 +48,8 @@ services:
     dns:
       - 1.1.1.1
       - 1.0.0.1
+      - 2606:4700:4700::1111
+      - 2606:4700:4700::1001
     environment:
       POSTGRES_DB: gitea_db
       POSTGRES_USER: gitea_user
diff --git a/templates/Grav/0/docker-compose.yml b/templates/Grav/0/docker-compose.yml
index eab91e8..a1f88fd 100644
--- a/templates/Grav/0/docker-compose.yml
+++ b/templates/Grav/0/docker-compose.yml
@@ -6,6 +6,8 @@ services:
     dns: # Using Cloudflare DNS
       - 1.1.1.1
       - 1.0.0.1
+      - 2606:4700:4700::1111
+      - 2606:4700:4700::1001
     labels:
       io.rancher.container.pull_image: always
       {{- if .Values.HOST_LABEL}}
@@ -29,4 +31,4 @@ services:
       - /etc/timezone:/etc/timezone:ro # Syncronize timezone of container with the host system
       - /Rancher/${DATA_DIR}/Backups:/var/www/backup # Backups
       - /Rancher/${DATA_DIR}/Images:/var/www/images # Images
-      - /Rancher/${DATA_DIR}/User:/var/www/user # User Data
\ No newline at end of file
+      - /Rancher/${DATA_DIR}/User:/var/www/user # User Data
diff --git a/templates/Guacamole/0/docker-compose.yml b/templates/Guacamole/0/docker-compose.yml
index 0a2c4c1..af9e337 100644
--- a/templates/Guacamole/0/docker-compose.yml
+++ b/templates/Guacamole/0/docker-compose.yml
@@ -6,6 +6,8 @@ services:
     dns:
       - 1.1.1.1
       - 1.0.0.1
+      - 2606:4700:4700::1111
+      - 2606:4700:4700::1001
     environment:
       GUACD_HOSTNAME: guacd
       MYSQL_HOSTNAME: mysql
@@ -58,6 +60,8 @@ services:
     dns:
       - 1.1.1.1
       - 1.0.0.1
+      - 2606:4700:4700::1111
+      - 2606:4700:4700::1001
     environment:
       MYSQL_DATABASE: guacamole_db
       MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASS}
diff --git a/templates/HTTPD/0/docker-compose.yml b/templates/HTTPD/0/docker-compose.yml
index 964dd86..f044c4a 100644
--- a/templates/HTTPD/0/docker-compose.yml
+++ b/templates/HTTPD/0/docker-compose.yml
@@ -6,6 +6,8 @@ services:
     dns:
       - 1.1.1.1
       - 1.0.0.1
+      - 2606:4700:4700::1111
+      - 2606:4700:4700::1001
     labels:
       io.rancher.container.pull_image: always
       {{- if .Values.HOST_LABEL}}
diff --git a/templates/InvoiceNinja/0/docker-compose.yml b/templates/InvoiceNinja/0/docker-compose.yml
index accaeb3..d27c026 100644
--- a/templates/InvoiceNinja/0/docker-compose.yml
+++ b/templates/InvoiceNinja/0/docker-compose.yml
@@ -6,6 +6,8 @@ services:
     dns:
       - 1.1.1.1
       - 1.0.0.1
+      - 2606:4700:4700::1111
+      - 2606:4700:4700::1001
     labels:
       io.rancher.container.pull_image: always
       {{- if (.Values.HOST_LABEL)}}
@@ -26,6 +28,8 @@ services:
     dns:
       - 1.1.1.1
       - 1.0.0.1
+      - 2606:4700:4700::1111
+      - 2606:4700:4700::1001
     entrypoint: |
       bash -c 'bash -s <<EOF
       trap "break;exit" SIGHUP SIGINT SIGTERM
@@ -52,6 +56,8 @@ services:
     dns:
       - 1.1.1.1
       - 1.0.0.1
+      - 2606:4700:4700::1111
+      - 2606:4700:4700::1001
     environment:
       MYSQL_DATABASE: ninja_db
       MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASS}
@@ -73,6 +79,8 @@ services:
     dns:
       - 1.1.1.1
       - 1.0.0.1
+      - 2606:4700:4700::1111
+      - 2606:4700:4700::1001
     labels:
       io.rancher.container.pull_image: always
       {{- if .Values.HOST_LABEL}}
diff --git a/templates/Jellyfin/0/docker-compose.yml b/templates/Jellyfin/0/docker-compose.yml
index 7406fde..fc8bf22 100644
--- a/templates/Jellyfin/0/docker-compose.yml
+++ b/templates/Jellyfin/0/docker-compose.yml
@@ -6,6 +6,8 @@ services:
     dns: # Using Cloudflare DNS
       - 1.1.1.1
       - 1.0.0.1
+      - 2606:4700:4700::1111
+      - 2606:4700:4700::1001
     labels:
       io.rancher.container.pull_image: always
       {{- if .Values.HOST_LABEL}}
diff --git a/templates/Joomla/0/README.md b/templates/Joomla/0/README.md
new file mode 100644
index 0000000..65190bd
--- /dev/null
+++ b/templates/Joomla/0/README.md
@@ -0,0 +1 @@
+# Joomla
\ No newline at end of file
diff --git a/templates/Joomla/0/docker-compose.yml b/templates/Joomla/0/docker-compose.yml
new file mode 100644
index 0000000..50c1836
--- /dev/null
+++ b/templates/Joomla/0/docker-compose.yml
@@ -0,0 +1,62 @@
+version: '2'
+
+services:
+  joomla:
+    image: williammiceli/joomla:${IMAGE_VERSION}
+    dns: # Using Cloudflare DNS
+      - 1.1.1.1
+      - 1.0.0.1
+      - 2606:4700:4700::1111
+      - 2606:4700:4700::1001
+    environment:
+      JOOMLA_DB_HOST: mysql
+      JOOMLA_DB_NAME: joomla_db
+      JOOMLA_DB_USER: joomla_user
+      JOOMLA_DB_PASSWORD: ${DB_USER_PASS}
+    labels:
+      io.rancher.container.pull_image: always
+      {{- if .Values.HOST_LABEL}}
+      io.rancher.scheduler.affinity:host_label: ${HOST_LABEL}
+      {{- end}}
+      traefik.enable: true
+      ### Start Joomla Segment
+      traefik.frontend.entryPoints: http,https
+      traefik.frontend.headers.forceSTSHeader: true
+      traefik.frontend.headers.referrerPolicy: no-referrer # Security enhancement (Prevents leaking of referer information)
+      traefik.frontend.headers.SSLRedirect: true
+      traefik.frontend.headers.STSPreload: true
+      traefik.frontend.headers.STSSeconds: 15552000
+      traefik.frontend.passHostHeader: true
+      traefik.frontend.rule: Host:${TRAEFIK_HOST}
+      traefik.port: "80"
+      ### End Joomla Segment
+    links:
+      - mysql
+    restart: on-failure
+    volumes:
+      - /etc/localtime:/etc/localtime:ro # Syncronize time of container with the host system
+      - /etc/timezone:/etc/timezone:ro # Syncronize timezone of container with the host system
+      - /Rancher/${DATA_DIR}/Files:/var/www/html # Joomla Public Files
+  mysql:
+    image: mysql:5
+    dns: # Using Cloudflare DNS
+      - 1.1.1.1
+      - 1.0.0.1
+      - 2606:4700:4700::1111
+      - 2606:4700:4700::1001
+    environment:
+      MYSQL_DATABASE: joomla_db
+      MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASS}
+      MYSQL_USER: joomla_user
+      MYSQL_PASSWORD: ${DB_USER_PASS}
+    labels:
+      io.rancher.container.pull_image: always
+      {{- if .Values.HOST_LABEL}}
+      io.rancher.scheduler.affinity:host_label: ${HOST_LABEL}
+      {{- end}}
+      traefik.enable: false
+    restart: on-failure
+    volumes:
+      - /etc/localtime:/etc/localtime:ro # Syncronize time of container with the host system
+      - /etc/timezone:/etc/timezone:ro # Syncronize timezone of container with the host system
+      - /Rancher/${DATA_DIR}/Database:/var/lib/mysql # MySQL data
diff --git a/templates/Joomla/0/rancher-compose.yml b/templates/Joomla/0/rancher-compose.yml
new file mode 100644
index 0000000..31501c4
--- /dev/null
+++ b/templates/Joomla/0/rancher-compose.yml
@@ -0,0 +1,59 @@
+version: '2'
+catalog:
+  name: Joomla
+  version: latest
+  # description:
+  # minimum_rancher_version:
+  # maximum_rancher_version:
+  # upgrade_from:
+  questions:
+
+    - variable: "HOST_LABEL"
+      label: "Host Label Key/Value Pair"
+      description: |
+        The Label Key/Value pair of the host which containers should be deployed
+      default: "host.id=Host1"
+      required: false
+      type: string
+
+    - variable: "TRAEFIK_HOST"
+      label: "Public Host Domain"
+      description: |
+        The host that Traefik will use to provide public access.
+      default: "subdomain.domain.tld"
+      required: true
+      type: string
+
+    - variable: "DB_ROOT_PASS"
+      label: "Database Root Password"
+      description: |
+        A secure password to be used by the "root" database user.
+      # default:
+      required: true
+      type: password
+
+    - variable: "DB_USER_PASS"
+      label: "Database User Password"
+      description: |
+        A secure password to be used by the database user.
+      # default:
+      required: true
+      type: password
+
+    - variable: "IMAGE_VERSION"
+      label: "Image Version"
+      description: |
+        What version of the image should be used.
+      # default:
+      required: true
+      type: enum
+      options:
+        - php7.3
+
+    - variable: "DATA_DIR"
+      label: "Data Directory"
+      description: |
+        The directory to store persistent data for the stack.
+      default: "Personal/Joomla"
+      required: true
+      type: string
\ No newline at end of file
diff --git a/templates/Joomla/config.yml b/templates/Joomla/config.yml
new file mode 100644
index 0000000..087fb87
--- /dev/null
+++ b/templates/Joomla/config.yml
@@ -0,0 +1,8 @@
+name: Joomla
+description: |
+  
+version: latest
+# category:
+maintainer: WilliamMiceli
+# license:
+# projectURL:
\ No newline at end of file
diff --git a/templates/Nextcloud/0/docker-compose.yml b/templates/Nextcloud/0/docker-compose.yml
index 04c5a92..902df47 100644
--- a/templates/Nextcloud/0/docker-compose.yml
+++ b/templates/Nextcloud/0/docker-compose.yml
@@ -24,6 +24,8 @@ services:
     dns: # Using Cloudflare DNS
       - 1.1.1.1
       - 1.0.0.1
+      - 2606:4700:4700::1111
+      - 2606:4700:4700::1001
     environment:
       MYSQL_HOST: mysql
       MYSQL_DATABASE: nextcloud_db
@@ -68,6 +70,8 @@ services:
     dns: # Using Cloudflare DNS
       - 1.1.1.1
       - 1.0.0.1
+      - 2606:4700:4700::1111
+      - 2606:4700:4700::1001
     environment:
       MYSQL_DATABASE: nextcloud_db
       MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASS}
@@ -90,6 +94,8 @@ services:
     dns: # Using Cloudflare DNS
       - 1.1.1.1
       - 1.0.0.1
+      - 2606:4700:4700::1111
+      - 2606:4700:4700::1001
     labels:
       io.rancher.container.pull_image: always
       {{- if .Values.HOST_LABEL}}
diff --git a/templates/Nginx/0/docker-compose.yml b/templates/Nginx/0/docker-compose.yml
index 930245f..8ff9553 100644
--- a/templates/Nginx/0/docker-compose.yml
+++ b/templates/Nginx/0/docker-compose.yml
@@ -6,6 +6,8 @@ services:
     dns: # Using Cloudflare DNS
       - 1.1.1.1
       - 1.0.0.1
+      - 2606:4700:4700::1111
+      - 2606:4700:4700::1001
     labels:
       io.rancher.container.pull_image: always
       {{- if .Values.HOST_LABEL}}
diff --git a/templates/OpenProject/0/docker-compose.yml b/templates/OpenProject/0/docker-compose.yml
index af05e96..45d58b3 100644
--- a/templates/OpenProject/0/docker-compose.yml
+++ b/templates/OpenProject/0/docker-compose.yml
@@ -6,6 +6,8 @@ services:
     dns:
       - 1.1.1.1
       - 1.0.0.1
+      - 2606:4700:4700::1111
+      - 2606:4700:4700::1001
     labels:
       io.rancher.container.pull_image: always
       {{- if .Values.HOST_LABEL}}
diff --git a/templates/PHPMyAdmin/0/docker-compose.yml b/templates/PHPMyAdmin/0/docker-compose.yml
index 084997f..46c5021 100644
--- a/templates/PHPMyAdmin/0/docker-compose.yml
+++ b/templates/PHPMyAdmin/0/docker-compose.yml
@@ -6,6 +6,8 @@ services:
     dns:
       - 1.1.1.1
       - 1.0.0.1
+      - 2606:4700:4700::1111
+      - 2606:4700:4700::1001
     environment:
       PMA_ARBITRARY: 1 # Allows the user to specify any arbitrary server using address/hostname and port
     {{- if or .Values.SERVICE_LINK_1 .Values.SERVICE_LINK_2 .Values.SERVICE_LINK_3}}
diff --git a/templates/Pydio-Cells/0/docker-compose.yml b/templates/Pydio-Cells/0/docker-compose.yml
index 86201ec..f3e1a04 100644
--- a/templates/Pydio-Cells/0/docker-compose.yml
+++ b/templates/Pydio-Cells/0/docker-compose.yml
@@ -6,6 +6,8 @@ services:
     dns: # Using Cloudflare DNS
       - 1.1.1.1
       - 1.0.0.1
+      - 2606:4700:4700::1111
+      - 2606:4700:4700::1001
     environment:
       CELLS_BIND: "localhost:80"
       CELLS_EXTERNAL: "${TRAEFIK_HOST}:443"
@@ -39,6 +41,8 @@ services:
     dns: # Using Cloudflare DNS
       - 1.1.1.1
       - 1.0.0.1
+      - 2606:4700:4700::1111
+      - 2606:4700:4700::1001
     environment:
       MYSQL_DATABASE: cells_db
       MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASS}
diff --git a/templates/Redis/0/docker-compose.yml b/templates/Redis/0/docker-compose.yml
index 8d4ad02..c9d6f0e 100644
--- a/templates/Redis/0/docker-compose.yml
+++ b/templates/Redis/0/docker-compose.yml
@@ -6,6 +6,8 @@ services:
     dns: # Using Cloudflare DNS
       - 1.1.1.1
       - 1.0.0.1
+      - 2606:4700:4700::1111
+      - 2606:4700:4700::1001
     labels:
       io.rancher.container.pull_image: always
       {{- if .Values.HOST_LABEL}}
diff --git a/templates/RocketChat/0/docker-compose.yml b/templates/RocketChat/0/docker-compose.yml
index e9d8479..a5dff24 100644
--- a/templates/RocketChat/0/docker-compose.yml
+++ b/templates/RocketChat/0/docker-compose.yml
@@ -6,6 +6,8 @@ services:
     dns: # Using Cloudflare DNS
       - 1.1.1.1
       - 1.0.0.1
+      - 2606:4700:4700::1111
+      - 2606:4700:4700::1001
     environment:
       ROCKETCHAT_URL: hubot.${TRAEFIK_HOST}
       ROCKETCHAT_ROOM: GENERAL
@@ -40,6 +42,8 @@ services:
     dns: # Using Cloudflare DNS
       - 1.1.1.1
       - 1.0.0.1
+      - 2606:4700:4700::1111
+      - 2606:4700:4700::1001
     labels:
       io.rancher.container.pull_image: always
       {{- if .Values.HOST_LABEL}}
@@ -57,6 +61,8 @@ services:
     dns: # Using Cloudflare DNS
       - 1.1.1.1
       - 1.0.0.1
+      - 2606:4700:4700::1111
+      - 2606:4700:4700::1001
     environment:
       MONGO_URL: mongodb://mongo:27017/rocketchat
       ROOT_URL: https://${TRAEFIK_HOST}
diff --git a/templates/Snipe-IT/0/docker-compose.yml b/templates/Snipe-IT/0/docker-compose.yml
index ba0c621..58696f2 100644
--- a/templates/Snipe-IT/0/docker-compose.yml
+++ b/templates/Snipe-IT/0/docker-compose.yml
@@ -6,6 +6,8 @@ services:
     dns:
       - 1.1.1.1
       - 1.0.0.1
+      - 2606:4700:4700::1111
+      - 2606:4700:4700::1001
     environment:
       APP_ENV: production # [ development | production ]
       APP_DEBUG: false
@@ -45,6 +47,8 @@ services:
     dns:
       - 1.1.1.1
       - 1.0.0.1
+      - 2606:4700:4700::1111
+      - 2606:4700:4700::1001
     environment:
       MYSQL_DATABASE: snipeit_db
       MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASS}
diff --git a/templates/Traefik/0/docker-compose.yml b/templates/Traefik/0/docker-compose.yml
index 6db801b..d88cf4d 100644
--- a/templates/Traefik/0/docker-compose.yml
+++ b/templates/Traefik/0/docker-compose.yml
@@ -7,6 +7,8 @@ services:
     dns:
       - 1.1.1.1 # Cloudflare Public DNS 1
       - 1.0.0.1 # Cloudflare Public DNS 2
+      - 2606:4700:4700::1111
+      - 2606:4700:4700::1001
     labels:
       io.rancher.container.agent.role: environment
       io.rancher.container.create_agent: true
diff --git a/templates/Wiki.js-v1/0/docker-compose.yml b/templates/Wiki.js-v1/0/docker-compose.yml
index b4dd3e2..5d589b7 100644
--- a/templates/Wiki.js-v1/0/docker-compose.yml
+++ b/templates/Wiki.js-v1/0/docker-compose.yml
@@ -7,6 +7,8 @@ services:
     dns: # Using Cloudflare DNS
       - 1.1.1.1
       - 1.0.0.1
+      - 2606:4700:4700::1111
+      - 2606:4700:4700::1001
     environment:
       MONGO_LOG_DIR: /dev/null
     labels:
@@ -25,6 +27,8 @@ services:
     dns: # Using Cloudflare DNS
       - 1.1.1.1
       - 1.0.0.1
+      - 2606:4700:4700::1111
+      - 2606:4700:4700::1001
     environment:
       WIKI_ADMIN_EMAIL: ${ADMIN_EMAIL}
     labels:
diff --git a/templates/WordPress/0/docker-compose.yml b/templates/WordPress/0/docker-compose.yml
index 65d3d9d..d8874c6 100644
--- a/templates/WordPress/0/docker-compose.yml
+++ b/templates/WordPress/0/docker-compose.yml
@@ -6,6 +6,8 @@ services:
     dns:
       - 1.1.1.1
       - 1.0.0.1
+      - 2606:4700:4700::1111
+      - 2606:4700:4700::1001
     environment:
       WORDPRESS_DB_HOST: mysql
       WORDPRESS_DB_NAME: wordpress_db
@@ -40,6 +42,8 @@ services:
     dns:
       - 1.1.1.1
       - 1.0.0.1
+      - 2606:4700:4700::1111
+      - 2606:4700:4700::1001
     environment:
       MYSQL_DATABASE: wordpress_db
       MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASS}
diff --git a/templates/XWiki/0/docker-compose.yml b/templates/XWiki/0/docker-compose.yml
index bd73af2..68cceab 100644
--- a/templates/XWiki/0/docker-compose.yml
+++ b/templates/XWiki/0/docker-compose.yml
@@ -6,6 +6,8 @@ services:
     dns:
       - 1.1.1.1
       - 1.0.0.1
+      - 2606:4700:4700::1111
+      - 2606:4700:4700::1001
     environment:
       DB_HOST: postgresql
       DB_DATABASE: xwiki_db
@@ -42,6 +44,8 @@ services:
     dns:
       - 1.1.1.1
       - 1.0.0.1
+      - 2606:4700:4700::1111
+      - 2606:4700:4700::1001
     environment:
       POSTGRES_INITDB_ARGS: "--encoding=UTF8"
       POSTGRES_DB: xwiki_db
diff --git a/templates/YOURLS/0/docker-compose.yml b/templates/YOURLS/0/docker-compose.yml
index 0fbdb04..3fd3fdd 100644
--- a/templates/YOURLS/0/docker-compose.yml
+++ b/templates/YOURLS/0/docker-compose.yml
@@ -6,6 +6,8 @@ services:
     dns: # Using Cloudflare DNS
       - 1.1.1.1
       - 1.0.0.1
+      - 2606:4700:4700::1111
+      - 2606:4700:4700::1001
     environment:
       YOURLS_DB_HOST: mysql
       YOURLS_DB_NAME: yourls_db
@@ -39,6 +41,8 @@ services:
     dns: # Using Cloudflare DNS
       - 1.1.1.1
       - 1.0.0.1
+      - 2606:4700:4700::1111
+      - 2606:4700:4700::1001
     environment:
       MYSQL_DATABASE: yourls_db
       MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASS}
diff --git a/templates/sysPass/0/README.md b/templates/sysPass/0/README.md
new file mode 100644
index 0000000..acb2f8e
--- /dev/null
+++ b/templates/sysPass/0/README.md
@@ -0,0 +1,5 @@
+# sysPass
+
+[http://syspass.org/en]
+
+[https://doc.syspass.org/en/3.0/]
\ No newline at end of file
diff --git a/templates/sysPass/0/docker-compose.yml b/templates/sysPass/0/docker-compose.yml
new file mode 100644
index 0000000..7e47a02
--- /dev/null
+++ b/templates/sysPass/0/docker-compose.yml
@@ -0,0 +1,55 @@
+version: '2'
+
+services:
+  syspass:
+    image: syspass/syspass:3.0.5
+    dns: # Using Cloudflare DNS
+      - 1.1.1.1
+      - 1.0.0.1
+      - 2606:4700:4700::1111
+      - 2606:4700:4700::1001
+    labels:
+      io.rancher.container.pull_image: always
+      {{- if .Values.HOST_LABEL}}
+      io.rancher.scheduler.affinity:host_label: ${HOST_LABEL}
+      {{- end}}
+      traefik.enable: true
+      ### Start Web Segment
+      traefik.frontend.entryPoints: http,https
+      traefik.frontend.headers.forceSTSHeader: true
+      traefik.frontend.headers.referrerPolicy: no-referrer # Security enhancement (Prevents leaking of referer information)
+      traefik.frontend.headers.SSLRedirect: true
+      traefik.frontend.headers.STSPreload: true
+      traefik.frontend.headers.STSSeconds: 15552000
+      traefik.frontend.passHostHeader: true
+      traefik.frontend.rule: Host:${TRAEFIK_HOST}
+      traefik.port: "80"
+      ### End Web Segment
+    links:
+      - mysql
+    restart: on-failure
+    volumes:
+      - /etc/localtime:/etc/localtime:ro # Syncronize time of container with the host system
+      - /etc/timezone:/etc/timezone:ro # Syncronize timezone of container with the host system
+      - /Rancher/${DATA_DIR}/Configuration:/var/www/html/sysPass/app/config # sysPass configuration files
+      - /Rancher/${DATA_DIR}/Backups:/var/www/html/sysPass/app/backup # sysPass backups
+  mysql:
+    image: mysql:5
+    dns: # Using Cloudflare DNS
+      - 1.1.1.1
+      - 1.0.0.1
+      - 2606:4700:4700::1111
+      - 2606:4700:4700::1001
+    environment:
+      MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASS}
+    labels:
+      io.rancher.container.pull_image: always
+      {{- if .Values.HOST_LABEL}}
+      io.rancher.scheduler.affinity:host_label: ${HOST_LABEL}
+      {{- end}}
+      traefik.enable: false
+    restart: on-failure
+    volumes:
+      - /etc/localtime:/etc/localtime:ro # Syncronize time of container with the host system
+      - /etc/timezone:/etc/timezone:ro # Syncronize timezone of container with the host system
+      - /Rancher/${DATA_DIR}/Database:/var/lib/mysql # MySQL database files
diff --git a/templates/sysPass/0/rancher-compose.yml b/templates/sysPass/0/rancher-compose.yml
new file mode 100644
index 0000000..9217820
--- /dev/null
+++ b/templates/sysPass/0/rancher-compose.yml
@@ -0,0 +1,41 @@
+version: '2'
+catalog:
+  name: sysPass
+  version: latest
+  # description:
+  # minimum_rancher_version:
+  # maximum_rancher_version:
+  # upgrade_from:
+  questions:
+
+    - variable: "HOST_LABEL"
+      label: "Host Label Key/Value Pair"
+      description: |
+        The Label Key/Value pair of the host which containers should be deployed
+      default: "host.id=Host1"
+      required: false
+      type: string
+
+    - variable: "TRAEFIK_HOST"
+      label: "Public Host Domain"
+      description: |
+        The host that Traefik will use to provide public access.
+      default: "subdomain.domain.tld"
+      required: true
+      type: string
+
+    - variable: "DB_ROOT_PASS"
+      label: "Database Root Password"
+      description: |
+        A secure password to be used by the "root" database user.
+      # default:
+      required: true
+      type: password
+
+    - variable: "DATA_DIR"
+      label: "Data Directory"
+      description: |
+        The directory to store persistent data for the stack.
+      default: "Personal/sysPass"
+      required: true
+      type: string
\ No newline at end of file
diff --git a/templates/sysPass/config.yml b/templates/sysPass/config.yml
new file mode 100644
index 0000000..da454ce
--- /dev/null
+++ b/templates/sysPass/config.yml
@@ -0,0 +1,8 @@
+name: sysPass
+description: |
+  
+version: latest
+# category:
+maintainer: WilliamMiceli
+# license:
+# projectURL:
\ No newline at end of file