diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index d7060ce..d07d6ee 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -3,7 +3,7 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
+lint: 
   name: yamllint
 platforms:
   - name: fluentbit_centos7_instance
diff --git a/tasks/install-RedHat.yml b/tasks/install-RedHat.yml
index 160a72d..6614a2e 100644
--- a/tasks/install-RedHat.yml
+++ b/tasks/install-RedHat.yml
@@ -1,9 +1,12 @@
 ---
 
-- name: Install Redhat | Add yum repository
+- name: Install Redhat | Detect Centos/Rocky linux version
+  set_fact: distro_version="{{ ansible_distribution_version|int }}"
+
+- name: Install Redhat | "Add yum repository for {{ ansible_distribution }}-{{ distro_version }}"
   yum_repository:
     name: TD_Agent_Bit
-    baseurl: http://packages.fluentbit.io/centos/7/$basearch/
+    baseurl: "http://packages.fluentbit.io/centos/{{ distro_version }}/$basearch/"
     gpgcheck: true
     gpgkey: http://packages.fluentbit.io/fluentbit.key
     description: Fluent bit repo
diff --git a/tasks/main.yml b/tasks/main.yml
index 20b0f96..5754ea2 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,6 +1,8 @@
 ---
 # tasks file for ansible-role-fluentbit
 
+# - debug: msg="{{ 'Systemd_Filter:0' | split(':') | first }}"
+
 - name: Install Fluentbit
   include_tasks: 'install-{{ ansible_os_family }}.yml'
   tags: ['install']
diff --git a/templates/td-agent-bit.conf.j2 b/templates/td-agent-bit.conf.j2
index 5f54497..6114da8 100644
--- a/templates/td-agent-bit.conf.j2
+++ b/templates/td-agent-bit.conf.j2
@@ -49,14 +49,14 @@
 {% for input in fluentbit_inputs %}
 [INPUT]
 {% for key in input %}
-    {{ key }} {{ input[key] }}
+    {{ key | split(':') | first }} {{ input[key] }}
 {% endfor %}
 {% endfor %}
 
 {% for input in fluentbit_outputs %}
 [OUTPUT]
 {% for key in input %}
-    {{ key }} {{ input[key] }}
+    {{ key | split(':') | first }} {{ input[key] }}
 {% endfor %}
 {% endfor %}