diff --git a/files/collectd.conf b/files/collectd.conf
new file mode 100644
index 0000000000000000000000000000000000000000..1c5eb8e184b1083e8be54964d1fa246c6f0f4aa4
--- /dev/null
+++ b/files/collectd.conf
@@ -0,0 +1,8 @@
+AutoLoadPlugin true
+FQDNLookup false
+<Plugin syslog>
+        LogLevel info
+</Plugin>
+<Include "/etc/collectd/collectd.conf.d">
+        Filter "*.conf"
+</Include>
diff --git a/handlers/main.yml b/handlers/main.yml
index 36976375d086eb5accff280ea0a595835f85fdcc..79964fc3796c1d0efbe6777d65f3f417b68e1894 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -18,3 +18,8 @@
   service:
     name: ssh
     state: restarted
+
+- name: Restart Collectd
+  service:
+    name: collectd
+    state: restarted
diff --git a/tasks/collectd_agent.yml b/tasks/collectd_agent.yml
index 790933eebb13d20e9857e6aa04932aa1ac2f6869..4de14b8a96689bda30f27ba8259733f63306058b 100644
--- a/tasks/collectd_agent.yml
+++ b/tasks/collectd_agent.yml
@@ -7,7 +7,8 @@
 - name: apt install Collectd
   when: ansible_pkg_mgr == 'apt'
   apt:
-    name: collectd-core
+    name: collectd
+    install_recommends: no
     state: present
     update_cache: yes
     cache_valid_time: 3600
@@ -15,5 +16,23 @@
 - name: pkg install Collectd
   when: ansible_pkg_mgr == 'openbsd_pkg'
   openbsd_pkg:
-    name: collectd-5.5
+    name: '{{ openbsd_collectd_version[ansible_distribution_release] }}'
     state: present
+
+- name: Create configuration directory
+  file:
+    path: /etc/collectd/collectd.conf.d/
+    owner: root
+    group: root
+    mode: '0755'
+    state: directory
+
+- name: Base configuration
+  copy:
+    src: collectd.conf
+    dest: /etc/collectd/collectd.conf
+    owner: root
+    group: root
+    mode: '0644'
+  notify:
+  - Restart Collectd
diff --git a/vars/main.yml b/vars/main.yml
index 466d35218eb5814a751667fbf86ac17575b9a4e5..77c074f2902237db8b118b8bea086f41fba3bc7e 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -24,3 +24,9 @@ sudoers_location:
     FreeBSD: '/usr/local/etc/sudoers'
     Debian: '/etc/sudoers'
     OpenBSD: '/etc/sudoers'
+
+openbsd_collectd_version:
+    '5.5': 'collectd-4.10.2p4'
+    '5.6': 'collectd-4.10.2p4'
+    '5.7': 'collectd-5.4.1p1'
+    '5.8': 'collectd-5.5.0p1'