diff --git a/templates/filebeat/0/docker-compose.yml b/templates/filebeat/0/docker-compose.yml
new file mode 100644
index 0000000..302081b
--- /dev/null
+++ b/templates/filebeat/0/docker-compose.yml
@@ -0,0 +1,20 @@
+version: '2'
+services:
+  filebeat:
+    image: eason02/filebeat-alpine:5.3.1
+    container_name: filebeat-alpine-5.3.1
+    restart: always
+    environment:
+      - env=${ENV}
+      - logstash=${LOGSTASH}
+      - project=${PROJECT}
+    network_mode: host
+    volumes:
+      - /var/lib/filebeat/:/filebeat/data
+      - ${APPLOG_PATH}:/home/user/:ro
+      - ${NGINXLOG_PATH}:/var/log/nginx/:ro
+    logging:
+      driver: json-file
+      options:
+        max-file: '5'
+        max-size: 10m
diff --git a/templates/filebeat/0/rancher-compose.yml b/templates/filebeat/0/rancher-compose.yml
new file mode 100644
index 0000000..5177491
--- /dev/null
+++ b/templates/filebeat/0/rancher-compose.yml
@@ -0,0 +1,38 @@
+version: '2'
+catalog:
+  name: "filebeat-alpine"
+  version: "5.3.1"
+  description: "Catalog's rancher-compose"
+  minimun_rancher_version: v1.0.1
+  maximun_rancher_version: v1.6.14
+  upgrade_from: "1.0.0"
+  questions:
+    - variable: "ENV"
+      label: "Environment Name"
+      description: "Environment to distinguish data source, you can set it as QA/PP/PROD or your preference."
+      default: "QA"
+      required: true
+      type: "string"
+    - variable: "PROJECT"
+      label: "Project Name"
+      description: "Indicated log of which project"
+      required: true
+      type: "string"
+    - variable: "LOGSTASH"
+      label: "Logstash Host"
+      description: "Specific Logstash Instance Running Host for log receiving"
+      required: true
+      type: "string"
+    - variable: "APPLOG_PATH"
+      label: "Application Log Path"
+      description: "For alignment, put your log into below path: ${HOME_PATH}/App1/logs/xxx.log, assume your HOME_PATH=/home/user, then set Application log Path as /home/user/."
+      required: true
+      default: "/home/user/"
+      type: "string"
+    - variable: "NGINXLOG_PATH"
+      label: "Nginx Log Path"
+      description: "Default it as /var/log/nginx/"
+      default: "/var/log/nginx/"
+      type: "string"
+      required: true
+
diff --git a/templates/filebeat/1/docker-compose.yml b/templates/filebeat/1/docker-compose.yml
new file mode 100644
index 0000000..e523439
--- /dev/null
+++ b/templates/filebeat/1/docker-compose.yml
@@ -0,0 +1,20 @@
+version: '2'
+services:
+  filebeat:
+    image: eason02/filebeat-alpine:5.6.3
+    container_name: filebeat-alpine-5.6.3
+    restart: always
+    environment:
+      - env=${ENV}
+      - logstash=${LOGSTASH}
+      - project=${PROJECT}
+    network_mode: host
+    volumes:
+      - /var/lib/filebeat/:/filebeat/data
+      - ${APPLOG_PATH}:/home/user/:ro
+      - ${NGINXLOG_PATH}:/var/log/nginx/:ro
+    logging:
+      driver: json-file
+      options:
+        max-file: '5'
+        max-size: 10m
diff --git a/templates/filebeat/1/rancher-compose.yml b/templates/filebeat/1/rancher-compose.yml
new file mode 100644
index 0000000..0ea389f
--- /dev/null
+++ b/templates/filebeat/1/rancher-compose.yml
@@ -0,0 +1,38 @@
+version: '2'
+catalog:
+  name: "filebeat-alpine"
+  version: "5.6.3"
+  description: "Catalog's rancher-compose"
+  minimun_rancher_version: v1.0.1
+  maximun_rancher_version: v1.6.14
+  upgrade_from: "1.0.0"
+  questions:
+    - variable: "ENV"
+      label: "Environment Name"
+      description: "Environment to distinguish data source, you can set it as QA/PP/PROD or your preference."
+      default: "QA"
+      required: true
+      type: "string"
+    - variable: "PROJECT"
+      label: "Project Name"
+      description: "Indicated log of which project"
+      required: true
+      type: "string"
+    - variable: "LOGSTASH"
+      label: "Logstash Host"
+      description: "Specific Logstash Instance Running Host for log receiving"
+      required: true
+      type: "string"
+    - variable: "APPLOG_PATH"
+      label: "Application Log Path"
+      description: "For alignment, put your log into below path: ${HOME_PATH}/App1/logs/xxx.log, assume your HOME_PATH=/home/user, then set Application log Path as /home/user/."
+      required: true
+      default: "/home/user/"
+      type: "string"
+    - variable: "NGINXLOG_PATH"
+      label: "Nginx Log Path"
+      description: "Default it as /var/log/nginx/"
+      default: "/var/log/nginx/"
+      type: "string"
+      required: true
+
diff --git a/templates/filebeat/2/docker-compose.yml b/templates/filebeat/2/docker-compose.yml
new file mode 100644
index 0000000..3549a96
--- /dev/null
+++ b/templates/filebeat/2/docker-compose.yml
@@ -0,0 +1,20 @@
+version: '2'
+services:
+  filebeat:
+    image: eason02/filebeat-alpine:6.1.1
+    container_name: filebeat-alpine-6.1.1
+    restart: always
+    environment:
+      - env=${ENV}
+      - logstash=${LOGSTASH}
+      - project=${PROJECT}
+    network_mode: host
+    volumes:
+      - /var/lib/filebeat/:/filebeat/data
+      - ${APPLOG_PATH}:/home/user/:ro
+      - ${NGINXLOG_PATH}:/var/log/nginx/:ro
+    logging:
+      driver: json-file
+      options:
+        max-file: '5'
+        max-size: 10m
diff --git a/templates/filebeat/2/rancher-compose.yml b/templates/filebeat/2/rancher-compose.yml
new file mode 100644
index 0000000..7b543e7
--- /dev/null
+++ b/templates/filebeat/2/rancher-compose.yml
@@ -0,0 +1,38 @@
+version: '2'
+catalog:
+  name: "filebeat-alpine"
+  version: "6.1.1"
+  description: "Catalog's rancher-compose"
+  minimun_rancher_version: v1.0.1
+  maximun_rancher_version: v1.6.14
+  upgrade_from: "1.0.0"
+  questions:
+    - variable: "ENV"
+      label: "Environment Name"
+      description: "Environment to distinguish data source, you can set it as QA/PP/PROD or your preference."
+      default: "QA"
+      required: true
+      type: "string"
+    - variable: "PROJECT"
+      label: "Project Name"
+      description: "Indicated log of which project"
+      required: true
+      type: "string"
+    - variable: "LOGSTASH"
+      label: "Logstash Host"
+      description: "Specific Logstash Instance Running Host for log receiving"
+      required: true
+      type: "string"
+    - variable: "APPLOG_PATH"
+      label: "Application Log Path"
+      description: "For alignment, put your log into below path: ${HOME_PATH}/App1/logs/xxx.log, assume your HOME_PATH=/home/user, then set Application log Path as /home/user/."
+      required: true
+      default: "/home/user/"
+      type: "string"
+    - variable: "NGINXLOG_PATH"
+      label: "Nginx Log Path"
+      description: "Default it as /var/log/nginx/"
+      default: "/var/log/nginx/"
+      type: "string"
+      required: true
+
diff --git a/templates/filebeat/catalogIcon-filebeat.svg b/templates/filebeat/catalogIcon-filebeat.svg
new file mode 100644
index 0000000..ce5be11
--- /dev/null
+++ b/templates/filebeat/catalogIcon-filebeat.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 79.37 79.37">
+  <defs>
+    <style>.cls-1{isolation:isolate;}.cls-2{fill:#40beb0;}.cls-2,.cls-3{fill-rule:evenodd;}.cls-3{fill:#09a5de;mix-blend-mode:multiply;}</style>
+  </defs>
+  <title>icons-masterfilefinal</title>
+  <g class="cls-1">
+    <g id="Layer_1">
+      <path class="cls-2" d="M43.87,15.27H20a2.39,2.39,0,0,0-2.39,2.39V63A2.39,2.39,0,0,0,20,65.41h38.2A2.39,2.39,0,0,0,60.58,63V32Z"/>
+      <path class="cls-3" d="M43.87,15.27V29.6A2.39,2.39,0,0,0,46.26,32H60.58Z"/>
+    </g>
+  </g>
+</svg>
diff --git a/templates/filebeat/config.yml b/templates/filebeat/config.yml
new file mode 100644
index 0000000..5999e9e
--- /dev/null
+++ b/templates/filebeat/config.yml
@@ -0,0 +1,8 @@
+name: Filebeat-Alpine
+description: Log Shipper to logstash
+
+version: 6.1.1
+category: Shipper
+maintainer: "Eason Lau <eason.lau02@hotmail.com>"
+license: MIT
+projectURL: https://github.com/easonlau02/filebeat-alpine