diff --git a/roles/zabbix-agent/templates/zabbix_agentd3.conf.j2 b/roles/zabbix-agent/templates/zabbix_agentd3.conf.j2
index 7092006..2552a30 100644
--- a/roles/zabbix-agent/templates/zabbix_agentd3.conf.j2
+++ b/roles/zabbix-agent/templates/zabbix_agentd3.conf.j2
@@ -28,7 +28,7 @@ PidFile={{ zabbix_run_dir.rstrip('/') }}/zabbix_agentd.pid
 # Default:
 # LogFile=
 
-LogFile=/var/log/zabbix/zabbix_agentd.log
+LogFile={{ zbx_agent_log_dir }}/zabbix_agentd.log
 
 ### Option: LogFileSize
 #	Maximum size of log file in MB.
@@ -260,15 +260,15 @@ HostMetadataItem={{ zabbix_metadata_item }}
 
 ### Option: Include
 #	You may include individual files or all files in a directory in the configuration file.
-#	Installing Zabbix will create include directory in /etc, unless modified during the compile time.
+#	Installing Zabbix will create include directory in {{ zbx_agent_config_basedir }}, unless modified during the compile time.
 #
 # Mandatory: no
 # Default:
 # Include=
 
-# Include=/etc/zabbix_agentd.userparams.conf
+# Include={{ zbx_agent_config_basedir }}/zabbix_agentd.userparams.conf
 Include={{ zbx_agent_config_dir }}
-# Include=/etc/zabbix_agentd.conf.d/*.conf
+# Include={{ zbx_agent_config_basedir }}/zabbix_agentd.conf.d/*.conf
 
 ####### USER-DEFINED MONITORED PARAMETERS #######
 
diff --git a/roles/zabbix-agent/vars/Debian.yml b/roles/zabbix-agent/vars/Debian.yml
new file mode 100644
index 0000000..8fcb4b9
--- /dev/null
+++ b/roles/zabbix-agent/vars/Debian.yml
@@ -0,0 +1,10 @@
+zbx_agent_required_packages:
+- zabbix-agent
+zbx_agent_config_tmpl: zabbix_agentd3.conf.j2
+zbx_agent_config_basedir: /etc/zabbix
+zbx_agent_config: '{{ zbx_agent_config_basedir }}/zabbix_agentd.conf'
+zbx_agent_config_dir: '{{ zbx_agent_config_basedir }}/zabbix_agentd.conf.d'
+zbx_agent_svc: zabbix-agent
+zbx_agent_log_dir: /var/log/zabbix-agent
+
+zabbix_metadata_item: system.run[lsb_release -sd]
diff --git a/roles/zabbix-agent/vars/Gentoo.yml b/roles/zabbix-agent/vars/Gentoo.yml
index d5a1009..2884dd3 100644
--- a/roles/zabbix-agent/vars/Gentoo.yml
+++ b/roles/zabbix-agent/vars/Gentoo.yml
@@ -1,8 +1,10 @@
 zbx_agent_required_packages:
 - zabbix
 zbx_agent_config_tmpl: zabbix_agentd2.conf.j2
-zbx_agent_config: /etc/zabbix/zabbix_agentd.conf
-zbx_agent_config_dir: /etc/zabbix/zabbix_agent.conf.d
+zbx_agent_config_basedir: /etc/zabbix
+zbx_agent_config: '{{ zbx_agent_config_basedir }}/zabbix_agentd.conf'
+zbx_agent_config_dir: '{{ zbx_agent_config_basedir }}/zabbix_agentd.conf.d'
 zbx_agent_svc: zabbix-agentd
+zbx_agent_log_dir: /var/log/zabbix
 
 zabbix_metadata_item: vfs.file.contents[/etc/gentoo-release]
diff --git a/roles/zabbix-agent/vars/defaults.yml b/roles/zabbix-agent/vars/defaults.yml
index 64ea45e..c3cc075 100644
--- a/roles/zabbix-agent/vars/defaults.yml
+++ b/roles/zabbix-agent/vars/defaults.yml
@@ -1,8 +1,10 @@
 zbx_agent_required_packages:
 - zabbix-agent
 zbx_agent_config_tmpl: zabbix_agentd3.conf.j2
-zbx_agent_config: /etc/zabbix_agentd.conf
-zbx_agent_config_dir: /etc/zabbix_agentd.conf.d
+zbx_agent_config_basedir: /etc
+zbx_agent_config: '{{ zbx_agent_config_basedir }}/zabbix_agentd.conf'
+zbx_agent_config_dir: '{{ zbx_agent_config_basedir }}/zabbix_agentd.conf.d'
 zbx_agent_svc: zabbix-agent
+zbx_agent_log_dir: /var/log/zabbix
 
 zabbix_metadata_item: vfs.file.contents[/etc/system-release]