diff --git a/cookbooks/rsyslog/templates/host-database/spb_log.conf.erb b/cookbooks/rsyslog/templates/host-database/spb_log.conf.erb
new file mode 100644
index 0000000..b7705d3
--- /dev/null
+++ b/cookbooks/rsyslog/templates/host-database/spb_log.conf.erb
@@ -0,0 +1,2 @@
+# Sending <%= node.name %> logs
+*.*                                                     @@<%= node['peers']['monitor'] %>
\ No newline at end of file
diff --git a/cookbooks/rsyslog/templates/host-email/spb_log.conf.erb b/cookbooks/rsyslog/templates/host-email/spb_log.conf.erb
new file mode 100644
index 0000000..b7705d3
--- /dev/null
+++ b/cookbooks/rsyslog/templates/host-email/spb_log.conf.erb
@@ -0,0 +1,2 @@
+# Sending <%= node.name %> logs
+*.*                                                     @@<%= node['peers']['monitor'] %>
\ No newline at end of file
diff --git a/cookbooks/rsyslog/templates/host-integration/spb_log.conf.erb b/cookbooks/rsyslog/templates/host-integration/spb_log.conf.erb
new file mode 100644
index 0000000..b7705d3
--- /dev/null
+++ b/cookbooks/rsyslog/templates/host-integration/spb_log.conf.erb
@@ -0,0 +1,2 @@
+# Sending <%= node.name %> logs
+*.*                                                     @@<%= node['peers']['monitor'] %>
\ No newline at end of file
diff --git a/cookbooks/rsyslog/templates/host-monitor/spb_log.conf.erb b/cookbooks/rsyslog/templates/host-monitor/spb_log.conf.erb
new file mode 100644
index 0000000..4f5e630
--- /dev/null
+++ b/cookbooks/rsyslog/templates/host-monitor/spb_log.conf.erb
@@ -0,0 +1,15 @@
+# Provides TCP syslog reception
+$ModLoad imtcp
+$InputTCPServerRun 514
+
+# Setting up dir to storage the logs from SPB env
+# Dir to storage Social logs
+if $fromhost-ip=='<%= node['peers']['social']%>' then /var/log/spb/social/social.log
+# Dir to storage Email logs
+if $fromhost-ip=='<%= node['peers']['email']%>' then /var/log/spb/email/email.log
+# Dir to storage database logs
+if $fromhost-ip=='<%= node['peers']['database']%>' then /var/log/spb/database/database.log
+# Dir to storage integration logs
+if $fromhost-ip=='<%= node['peers']['integration']%>' then /var/log/spb/integration/integration.log
+# Dir to storage reverseproxy logs
+if $fromhost-ip=='<%= node['peers']['reverseproxy']%>' then /var/log/spb/reverseproxy/reverseproxy.log
diff --git a/cookbooks/rsyslog/templates/host-reverseproxy/spb_log.conf.erb b/cookbooks/rsyslog/templates/host-reverseproxy/spb_log.conf.erb
new file mode 100644
index 0000000..b7705d3
--- /dev/null
+++ b/cookbooks/rsyslog/templates/host-reverseproxy/spb_log.conf.erb
@@ -0,0 +1,2 @@
+# Sending <%= node.name %> logs
+*.*                                                     @@<%= node['peers']['monitor'] %>
\ No newline at end of file
diff --git a/cookbooks/rsyslog/templates/host-social/spb_log.conf.erb b/cookbooks/rsyslog/templates/host-social/spb_log.conf.erb
new file mode 100644
index 0000000..b7705d3
--- /dev/null
+++ b/cookbooks/rsyslog/templates/host-social/spb_log.conf.erb
@@ -0,0 +1,2 @@
+# Sending <%= node.name %> logs
+*.*                                                     @@<%= node['peers']['monitor'] %>
\ No newline at end of file
diff --git a/cookbooks/rsyslog/templates/node/node-integration.conf.erb b/cookbooks/rsyslog/templates/node/node-integration.conf.erb
deleted file mode 100644
index 690ed41..0000000
--- a/cookbooks/rsyslog/templates/node/node-integration.conf.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-# Node <%= node.name %>
-# The following configurations sends the
-# files to rsyslog server
-
-$Modload imfile
-# Logs to send
-# TODO: add a for to increment 'var log path', 'severity', 'tag', 'facility', 'state file'
-$InputFileName 'var log path'
-$InputFileTag 'tag'
-$InputFileStateFile 'state file' # Be careful, this must be unique
-
-$InputFileSeverity 'severity'
-$InputFileFacility 'facility'
-$InputRunFileMonitor
diff --git a/cookbooks/rsyslog/templates/node/node.conf.erb b/cookbooks/rsyslog/templates/node/node.conf.erb
deleted file mode 100644
index b7705d3..0000000
--- a/cookbooks/rsyslog/templates/node/node.conf.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-# Sending <%= node.name %> logs
-*.*                                                     @@<%= node['peers']['monitor'] %>
\ No newline at end of file
diff --git a/cookbooks/rsyslog/templates/server/server.conf.erb b/cookbooks/rsyslog/templates/server/server.conf.erb
deleted file mode 100644
index 4f5e630..0000000
--- a/cookbooks/rsyslog/templates/server/server.conf.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-# Provides TCP syslog reception
-$ModLoad imtcp
-$InputTCPServerRun 514
-
-# Setting up dir to storage the logs from SPB env
-# Dir to storage Social logs
-if $fromhost-ip=='<%= node['peers']['social']%>' then /var/log/spb/social/social.log
-# Dir to storage Email logs
-if $fromhost-ip=='<%= node['peers']['email']%>' then /var/log/spb/email/email.log
-# Dir to storage database logs
-if $fromhost-ip=='<%= node['peers']['database']%>' then /var/log/spb/database/database.log
-# Dir to storage integration logs
-if $fromhost-ip=='<%= node['peers']['integration']%>' then /var/log/spb/integration/integration.log
-# Dir to storage reverseproxy logs
-if $fromhost-ip=='<%= node['peers']['reverseproxy']%>' then /var/log/spb/reverseproxy/reverseproxy.log
--
libgit2 0.21.2