diff --git a/roles/node_exporter/handlers/main.yml b/roles/node_exporter/handlers/main.yml
index 5018dae..5bfbd16 100644
--- a/roles/node_exporter/handlers/main.yml
+++ b/roles/node_exporter/handlers/main.yml
@@ -1,5 +1,10 @@
 ---
 - name: Restart node_exporter
   ansible.builtin.service:
-    name: "{{ node_exporter_service }}"
+    name: >-
+      {% if ansible_distribution == "OpenBSD" -%}
+      {{ "node_exporter" -}}
+      {% else -%}
+      {{ "prometheus-node-exporter" -}}
+      {% endif -%}
     state: restarted
diff --git a/roles/node_exporter/tasks/main.yml b/roles/node_exporter/tasks/main.yml
index 395e624..a873906 100644
--- a/roles/node_exporter/tasks/main.yml
+++ b/roles/node_exporter/tasks/main.yml
@@ -1,15 +1,22 @@
 ---
-- name: Include OS-specific variables
-  ansible.builtin.include_vars: "{{ ansible_os_family }}.yml"
-
 - name: Install packages
   ansible.builtin.package:
-    name: "{{ node_exporter_package }}"
+    name: >-
+      {% if ansible_distribution in ["Fedora", "OpenBSD"] -%}
+      {{ "node_exporter" -}}
+      {% else -%}
+      {{ "golang-github-prometheus-node-exporter" -}}
+      {% endif -%}
     state: installed
 
 - name: Allow prometheus user to read private key
   ansible.builtin.user:
-    name: "{{ node_exporter_user }}"
+    name: >-
+      {% if ansible_distribution == "OpenBSD" -%}
+      {{ "_nodeexporter" -}}
+      {% else -%}
+      {{ "prometheus" -}}
+      {% endif -%}
     groups: hostkey
     append: true
   notify: Restart node_exporter
@@ -91,7 +98,7 @@
 
 - name: Enable service
   ansible.builtin.service:
-    name: "{{ node_exporter_service }}"
+    name: node_exporter
     state: started
     enabled: true
     arguments: >-
@@ -102,7 +109,7 @@
 
 - name: Enable service
   ansible.builtin.service:
-    name: "{{ node_exporter_service }}"
+    name: prometheus-node-exporter
     state: started
     enabled: true
   when: ansible_os_family == "RedHat"
diff --git a/roles/node_exporter/vars/OpenBSD.yml b/roles/node_exporter/vars/OpenBSD.yml
deleted file mode 100644
index 170fb93..0000000
--- a/roles/node_exporter/vars/OpenBSD.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-node_exporter_package: node_exporter
-node_exporter_service: node_exporter
-node_exporter_user: _nodeexporter
diff --git a/roles/node_exporter/vars/RedHat.yml b/roles/node_exporter/vars/RedHat.yml
deleted file mode 100644
index 0a6f1b2..0000000
--- a/roles/node_exporter/vars/RedHat.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-node_exporter_package: golang-github-prometheus-node-exporter
-node_exporter_service: prometheus-node-exporter
-node_exporter_user: prometheus