diff --git a/templates/XWiki/0/docker-compose.yml b/templates/XWiki/0/docker-compose.yml
new file mode 100644
index 0000000..27a34b4
--- /dev/null
+++ b/templates/XWiki/0/docker-compose.yml
@@ -0,0 +1,79 @@
+version: '2'
+
+services:
+  xwiki:
+    image: xwiki:stable-postgres-tomcat
+    container_name: xwiki
+    dns:
+      - 1.1.1.1
+      - 1.0.0.1
+    environment:
+      DB_HOST: postgresql
+      DB_DATABASE: xwiki
+      DB_USER: xwiki_user
+      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}}
+      {{- if .Values.TRAEFIK_HOST}}
+      traefik.enable: true
+      ### Start Web Segment
+      traefik.frontend.entryPoints: http,https
+      traefik.frontend.headers.forceSTSHeader: true
+      traefik.frontend.headers.referrerPolicy: no-referrer
+      traefik.frontend.headers.SSLRedirect: true
+      traefik.frontend.headers.STSPreload: true
+      traefik.frontend.headers.STSSeconds: 15552000
+      traefik.frontend.rule: Host:${TRAEFIK_HOST}
+      traefik.port: "8080"
+      ### End Web Segment
+      {{- else}}
+      traefik.enable: false
+      {{- end}}
+    links:
+      - postgresql # Using links because "depends_on" does not work in Rancher 1.6
+    networks:
+      - public-proxy
+    {{- if .Values.WEB_PORT}}
+    ports:
+      - "${WEB_PORT}:8080"
+    {{- end}}
+    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
+      - /RancherCattle/${DATA_DIR}/Application:/usr/local/xwiki
+  postgresql:
+    image: postgres:9.5
+    container_name: postgresql
+    dns:
+      - 1.1.1.1
+      - 1.0.0.1
+    environment:
+      POSTGRES_INITDB_ARGS: "--encoding=UTF8"
+      POSTGRES_DATABASE: xwiki
+      POSTGRES_ROOT_PASSWORD: ${DB_ROOT_PASS}
+      POSTGRES_USER: xwiki_user
+      POSTGRES_PASSWORD: ${DB_USER_PASS}
+    labels:
+      io.rancher.container.pull_image: always
+      {{- if .Values.HOST_LABEL}}
+      io.rancher.scheduler.affinity:host_label: ${HOST_LABEL}
+      {{- end}}
+    networks:
+      db-admin:
+        aliases:
+          - xwiki
+    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
+      - /RancherCattle/${DATA_DIR}/Database:/var/lib/postgresql/data
+
+networks:
+  db-admin:
+    external: true
+  public-proxy:
+    external: true
\ No newline at end of file
diff --git a/templates/XWiki/0/rancher-compose.yml b/templates/XWiki/0/rancher-compose.yml
new file mode 100644
index 0000000..2a52c70
--- /dev/null
+++ b/templates/XWiki/0/rancher-compose.yml
@@ -0,0 +1,59 @@
+version: '2'
+catalog:
+  name: XWiki
+  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 on 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.
+        Leaving this empty will disable Traefik on this stack.
+      default: "subdomain.domain.tld"
+      required: false
+      type: string
+
+    - variable: "WEB_PORT"
+      label: "Web Port"
+      description: |
+        The port to locally access the web interface on.
+        Leaving this empty will disable opening any port on the host system.
+      default: "11100"
+      required: true
+      type: string # "Int" sometimes causes problems, and not a huge issue
+
+    - variable: "DB_ROOT_PASS"
+      label: "Database Root Password"
+      description: |
+        A secure password to be used by the "root" MySQL user.
+      # default:
+      required: true
+      type: password
+
+    - variable: "DB_USER_PASS"
+      label: "Database User Password"
+      description: |
+        A secure password to be used by the "xwiki_user" MySQL user.
+      # default:
+      required: true
+      type: password
+
+    - variable: "DATA_DIR"
+      label: "Data Directory"
+      description: |
+        The directory to store persistent data for the stack.
+      default: "Personal/XWiki"
+      required: true
+      type: string
\ No newline at end of file
diff --git a/templates/XWiki/config.yml b/templates/XWiki/config.yml
new file mode 100644
index 0000000..ed31e90
--- /dev/null
+++ b/templates/XWiki/config.yml
@@ -0,0 +1,8 @@
+name: XWiki
+description: |
+  Status: EXPERIMENTAL
+version: latest
+category: Wiki
+maintainer: WilliamMiceli
+# license:
+# projectURL:
\ No newline at end of file