diff --git a/roles/psacct/tasks/main.yml b/roles/psacct/tasks/main.yml
index 444151e..fd09762 100644
--- a/roles/psacct/tasks/main.yml
+++ b/roles/psacct/tasks/main.yml
@@ -1,34 +1,35 @@
 ---
-- block:
-    - name: install psacct package
-      package:
-        name: psacct
-        state: installed
+- name: Install package
+  ansible.builtin.package:
+    name: psacct
+    state: installed
+  when: ansible_system != "OpenBSD"
 
-    - name: enable psacct service
-      service:
-        name: psacct
-        enabled: true
-        state: started
-  when: ansible_system == "Linux"
+- name: Enable service
+  ansible.builtin.service:
+    name: psacct
+    enabled: true
+    state: started
+  when: ansible_system != "OpenBSD"
 
-- block:
-    - name: create /var/account
-      file:
-        state: directory
-        path: /var/account
-        mode: 0750
-        owner: root
-        group: "{{ ansible_wheel }}"
-
-    - name: turn on accounting
-      shell: touch /var/account/acct && accton /var/account/acct
-      args:
-        creates: /var/account/acct
-        warn: false
-
-    - name: enable accounting service
-      service:
-        name: accounting
-        enabled: true
+- name: Create /var/account
+  ansible.builtin.file:
+    state: directory
+    path: /var/account
+    mode: 0750
+    owner: root
+    group: "{{ ansible_wheel }}"
+  when: ansible_system == "OpenBSD"
+
+- name: Turn on accounting
+  ansible.builtin.shell: touch /var/account/acct && accton /var/account/acct
+  args:
+    creates: /var/account/acct
+    warn: false
+  when: ansible_system == "OpenBSD"
+
+- name: Enable accounting service
+  ansible.builtin.service:
+    name: accounting
+    enabled: true
   when: ansible_system == "OpenBSD"