diff --git a/defaults/main.yml b/defaults/main.yml
index fc5aa7a..2bb964c 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,9 +1,10 @@
 ---
-ldap_proxy_base_dir: /etc/openldap
 ldap_proxy_urls:
   - "ldapi:/// ldap:///"
 ldap_proxy_options: []
 
+ldap_proxy_base_dir: /etc/openldap
+
 ldap_proxy_tls_enabled: False
 ldap_proxy_tls_cert_source: mycert.pem
 ldap_proxy_tls_key_source: mykey.pem
diff --git a/handlers/main.yml b/handlers/main.yml
index eead676..6ef9467 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -4,6 +4,7 @@
       service:
         state: restarted
         name: slapd
+        daemon_reload: yes
       listen: __slapd_restart
   become: True
   become_user: root
diff --git a/tasks/main.yml b/tasks/main.yml
index 49d195e..50715bc 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -14,6 +14,19 @@
 
 - include_tasks: overwrites.yml
 - include_tasks: setup.yml
+
+- include_tasks: "{{ task_files }}"
+  vars:
+    task_files: "{{ lookup('first_found', params, errors='ignore') }}"
+    params:
+      files:
+        - "setup_{{ ansible_lsb.id | default('') | lower }}.yml"
+        - "setup_{{ ansible_os_family | lower }}{{ ansible_distribution_major_version }}.yml"
+        - "setup_{{ ansible_os_family | lower }}.yml"
+      paths:
+        - "tasks"
+  when: task_files
+
 - import_tasks: tls.yml
   when: ldap_proxy_tls_enabled | bool
 - include_tasks: post_tasks.yml
diff --git a/tasks/post_tasks.yml b/tasks/post_tasks.yml
index 5744932..ed5874a 100644
--- a/tasks/post_tasks.yml
+++ b/tasks/post_tasks.yml
@@ -4,5 +4,6 @@
     state: started
     enabled: yes
     name: slapd
+    daemon_reload: yes
   become: True
   become_user: root
diff --git a/tasks/setup_redhat8.yml b/tasks/setup_redhat8.yml
new file mode 100644
index 0000000..a0cd1f2
--- /dev/null
+++ b/tasks/setup_redhat8.yml
@@ -0,0 +1,7 @@
+---
+- name: Setup custom systemd service
+  template:
+    src: etc/systemd/system/slapd.service.j2
+    dest: "/etc/systemd/system/slapd.service"
+    mode: 0644
+  notify: __slapd_restart
diff --git a/templates/etc/systemd/system/slapd.service.j2 b/templates/etc/systemd/system/slapd.service.j2
new file mode 100644
index 0000000..d9c5b40
--- /dev/null
+++ b/templates/etc/systemd/system/slapd.service.j2
@@ -0,0 +1,6 @@
+[Service]
+Type=forking
+Environment="SLAPD_URLS=ldap:/// ldaps:/// ldapi:///" "SLAPD_OPTIONS="
+EnvironmentFile=/etc/sysconfig/slapd
+ExecStart=
+ExecStart=/usr/sbin/slapd -u ldap -h ${SLAPD_URLS} $SLAPD_OPTIONS