diff --git a/meta/main.yml b/meta/main.yml
index 13f53af6ff43d722b15c020c56f064d8dae3bb26..425efdb4c533b9f5e619c2cc66037ecfb7ad5e54 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -2,4 +2,3 @@
 
 dependencies:
   - { role: fluentd-client }
-  - { role: kibana }
diff --git a/tasks/main.yml b/tasks/main.yml
index 2c11d2e312f427d790796694047bbe8c7439d52b..43297f6628762a505c8c5da9379a0e55361f3681 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -13,7 +13,6 @@
       - 'fluent-plugin-elasticsearch'
       - 'fluent-plugin-elasticsearch-timestamp-check'
       - 'fluent-plugin-kvp-filter'
-      - 'fluent-plugin-record-reformer'
 
   - name: "Copy SSL Key"
     copy:
@@ -23,4 +22,4 @@
       group='root'
       mode='644'
 
-  when: '"fluentd" not in excluded_roles'
+  when: '"fluentd" not in excluded_roles and inventory_hostname in groups.logserver'