diff --git a/templates/filebeat/0/docker-compose.yml b/templates/filebeat/0/docker-compose.yml
index 0b39222..203767f 100644
--- a/templates/filebeat/0/docker-compose.yml
+++ b/templates/filebeat/0/docker-compose.yml
@@ -4,8 +4,6 @@ services:
     image: eason02/filebeat-alpine:5.3.1
     container_name: filebeat-alpine-5.3.1
     restart: always
-    labels:
-      io.rancher.container.pull_image: always
     environment:
       - env=${ENV}
       - logstash=${LOGSTASH}
diff --git a/templates/filebeat/0/rancher-compose.yml b/templates/filebeat/0/rancher-compose.yml
index b7f3ad1..5177491 100644
--- a/templates/filebeat/0/rancher-compose.yml
+++ b/templates/filebeat/0/rancher-compose.yml
@@ -4,20 +4,15 @@ catalog:
   version: "5.3.1"
   description: "Catalog's rancher-compose"
   minimun_rancher_version: v1.0.1
-  maximun_rancher_version: v1.6.12
+  maximun_rancher_version: v1.6.14
   upgrade_from: "1.0.0"
   questions:
     - variable: "ENV"
       label: "Environment Name"
-      description: "Environment to distinguish data source"
+      description: "Environment to distinguish data source, you can set it as QA/PP/PROD or your preference."
       default: "QA"
       required: true
-      type: "enum"
-      options:
-        - QA
-        - PP
-        - INT
-        - PROD
+      type: "string"
     - variable: "PROJECT"
       label: "Project Name"
       description: "Indicated log of which project"
diff --git a/templates/filebeat/1/docker-compose.yml b/templates/filebeat/1/docker-compose.yml
index f1da36d..9171527 100644
--- a/templates/filebeat/1/docker-compose.yml
+++ b/templates/filebeat/1/docker-compose.yml
@@ -4,8 +4,6 @@ services:
     image: eason02/filebeat-alpine:5.6.3
     container_name: filebeat-alpine-5.6.3
     restart: always
-    labels:
-      io.rancher.container.pull_image: always
     environment:
       - env=${ENV}
       - logstash=${LOGSTASH}
diff --git a/templates/filebeat/1/rancher-compose.yml b/templates/filebeat/1/rancher-compose.yml
index 40b0480..0ea389f 100644
--- a/templates/filebeat/1/rancher-compose.yml
+++ b/templates/filebeat/1/rancher-compose.yml
@@ -4,20 +4,15 @@ catalog:
   version: "5.6.3"
   description: "Catalog's rancher-compose"
   minimun_rancher_version: v1.0.1
-  maximun_rancher_version: v1.6.12
+  maximun_rancher_version: v1.6.14
   upgrade_from: "1.0.0"
   questions:
     - variable: "ENV"
       label: "Environment Name"
-      description: "Environment to distinguish data source"
+      description: "Environment to distinguish data source, you can set it as QA/PP/PROD or your preference."
       default: "QA"
       required: true
-      type: "enum"
-      options:
-        - QA
-        - PP
-        - INT
-        - PROD
+      type: "string"
     - variable: "PROJECT"
       label: "Project Name"
       description: "Indicated log of which project"
diff --git a/templates/filebeat/2/docker-compose.yml b/templates/filebeat/2/docker-compose.yml
index c6809e4..2aa9a50 100644
--- a/templates/filebeat/2/docker-compose.yml
+++ b/templates/filebeat/2/docker-compose.yml
@@ -4,8 +4,6 @@ services:
     image: eason02/filebeat-alpine:6.1.1
     container_name: filebeat-alpine-6.1.1
     restart: always
-    labels:
-      io.rancher.container.pull_image: always
     environment:
       - env=${ENV}
       - logstash=${LOGSTASH}
diff --git a/templates/filebeat/2/rancher-compose.yml b/templates/filebeat/2/rancher-compose.yml
index c279ce6..7b543e7 100644
--- a/templates/filebeat/2/rancher-compose.yml
+++ b/templates/filebeat/2/rancher-compose.yml
@@ -4,20 +4,15 @@ catalog:
   version: "6.1.1"
   description: "Catalog's rancher-compose"
   minimun_rancher_version: v1.0.1
-  maximun_rancher_version: v1.6.12
+  maximun_rancher_version: v1.6.14
   upgrade_from: "1.0.0"
   questions:
     - variable: "ENV"
       label: "Environment Name"
-      description: "Environment to distinguish data source"
+      description: "Environment to distinguish data source, you can set it as QA/PP/PROD or your preference."
       default: "QA"
       required: true
-      type: "enum"
-      options:
-        - QA
-        - PP
-        - INT
-        - PROD
+      type: "string"
     - variable: "PROJECT"
       label: "Project Name"
       description: "Indicated log of which project"
diff --git a/templates/filebeat/config.yml b/templates/filebeat/config.yml
index 1d67384..398d1ae 100644
--- a/templates/filebeat/config.yml
+++ b/templates/filebeat/config.yml
@@ -3,6 +3,6 @@ description: Log Shipper to logstash
 
 version: 6.1.1
 category: Shipper
-#maintainer: eason.lau02@hotmail.com
+maintainer: "Eason Lau <eason.lau02@hotmail.com>"
 #license: MIT
 projectURL: https://github.com/easonlau02/filebeat-alpine