diff --git a/templates/GitLab/0/docker-compose.yml b/templates/GitLab/0/docker-compose.yml
index 20f15de..6ed3671 100644
--- a/templates/GitLab/0/docker-compose.yml
+++ b/templates/GitLab/0/docker-compose.yml
@@ -28,7 +28,7 @@ services:
       traefik.web.frontend.headers.STSPreload: true
       traefik.web.frontend.headers.STSSeconds: 15552000
       traefik.web.frontend.passHostHeader: true
-      traefik.web.frontend.rule: Host:${TRAEFIK_HOST}
+      traefik.web.frontend.rule: HostRegexp:${TRAEFIK_HOST},{subdomain:.+}.${TRAEFIK_HOST}
       traefik.web.port: "80"
       ### End Web Segment
       ### Start SSH Segment
diff --git a/templates/GitLab/0/rancher-compose.yml b/templates/GitLab/0/rancher-compose.yml
index 7606f17..d8f5c53 100644
--- a/templates/GitLab/0/rancher-compose.yml
+++ b/templates/GitLab/0/rancher-compose.yml
@@ -12,7 +12,7 @@ catalog:
       label: "Host Label Key/Value Pair"
       description: |
         The Label Key/Value pair of the host which containers should be deployed
-      default: "host.id=Host2"
+      default: "host.id=Host1"
       required: false
       type: string
 
diff --git a/templates/Wiki.js-v1/0/README.md b/templates/Wiki.js-v1/0/README.md
new file mode 100644
index 0000000..9407c84
--- /dev/null
+++ b/templates/Wiki.js-v1/0/README.md
@@ -0,0 +1,3 @@
+# Wiki.js (v1)
+
+Default admin password: "admin123"
\ No newline at end of file
diff --git a/templates/Wiki.js-v1/0/docker-compose.yml b/templates/Wiki.js-v1/0/docker-compose.yml
new file mode 100644
index 0000000..b4dd3e2
--- /dev/null
+++ b/templates/Wiki.js-v1/0/docker-compose.yml
@@ -0,0 +1,53 @@
+version: '2'
+
+services:
+  mongo:
+    image: mongo:3
+    command: '--smallfiles --bind_ip ::,0.0.0.0'
+    dns: # Using Cloudflare DNS
+      - 1.1.1.1
+      - 1.0.0.1
+    environment:
+      MONGO_LOG_DIR: /dev/null
+    labels:
+      io.rancher.container.pull_image: always
+      {{- if .Values.HOST_LABEL}}
+      io.rancher.scheduler.affinity:host_label: ${HOST_LABEL}
+      {{- 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
+      - /Rancher/${DATA_DIR}/Database/Data:/data/db
+      - /Rancher/${DATA_DIR}/Database/Dump:/dump
+  wikijs:
+    image: requarks/wiki:latest # v1 Only
+    dns: # Using Cloudflare DNS
+      - 1.1.1.1
+      - 1.0.0.1
+    environment:
+      WIKI_ADMIN_EMAIL: ${ADMIN_EMAIL}
+    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.web.frontend.entryPoints: http, https
+      traefik.web.frontend.headers.forceSTSHeader: true
+      traefik.web.frontend.headers.referrerPolicy: no-referrer # Security enhancement (Prevents leaking of referer information)
+      traefik.web.frontend.headers.SSLRedirect: true
+      traefik.web.frontend.headers.STSPreload: true
+      traefik.web.frontend.headers.STSSeconds: 15552000
+      traefik.web.frontend.passHostHeader: true
+      traefik.web.frontend.rule: "Host:${TRAEFIK_HOST}"
+      traefik.web.port: "80"
+      ### End Web Segment
+    links:
+      - mongo
+    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}/Wiki/config.yml:/var/wiki/config.yml
diff --git a/templates/Wiki.js-v1/0/rancher-compose.yml b/templates/Wiki.js-v1/0/rancher-compose.yml
new file mode 100644
index 0000000..dcae4dc
--- /dev/null
+++ b/templates/Wiki.js-v1/0/rancher-compose.yml
@@ -0,0 +1,42 @@
+version: '2'
+catalog:
+  name: Wiki.js (v1)
+  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.
+        Only one domain is allowed by Wiki.js
+      default: "subdomain.domain.tld"
+      required: true
+      type: string
+
+    - variable: "ADMIN_EMAIL"
+      label: "Administrator Email"
+      description: |
+        The email address for the main administrator
+      default: "user@tld.com"
+      required: true
+      type: string
+
+    - variable: "DATA_DIR"
+      label: "Data Directory"
+      description: |
+        The directory to store persistent data for the stack.
+      default: "Personal/Wiki.js"
+      required: true
+      type: string
\ No newline at end of file
diff --git a/templates/Wiki.js-v1/config.yml b/templates/Wiki.js-v1/config.yml
new file mode 100644
index 0000000..5bd5b6d
--- /dev/null
+++ b/templates/Wiki.js-v1/config.yml
@@ -0,0 +1,8 @@
+name: Wiki.js (v1)
+description: |
+  
+version: latest
+category: Wiki
+maintainer: WilliamMiceli
+# license:
+# projectURL:
\ No newline at end of file