diff --git a/prometheus/handlers/main.yml b/prometheus/handlers/main.yml
index 0be95fde5cf43a7cc63ad41056e53e48512d5446..a937da88cc798de02364a645474178b8d07df912 100644
--- a/prometheus/handlers/main.yml
+++ b/prometheus/handlers/main.yml
@@ -1,5 +1,9 @@
 ---
 
+- name: Reload systemd
+  systemd:
+    daemon_reload: true
+
 - name: Restart prometheus
   systemd:
     name: prometheus.service
diff --git a/prometheus/tasks/main.yml b/prometheus/tasks/main.yml
index a5f55c2e2caf06ea9b1c17dffddaa1ac54362292..c995d15527a47b48b10a11d5355cdefda6fbe890 100644
--- a/prometheus/tasks/main.yml
+++ b/prometheus/tasks/main.yml
@@ -29,11 +29,24 @@
     - prometheus
     - config
 
+- name: Create systemd unit override directory
+  file:
+    path: /etc/systemd/system/prometheus.service.d
+    state: directory
+    owner: root
+    group: root
+    mode: "0755"
+  when: ansible_distribution == "Gentoo"
+  tags:
+    - promtheus
+    - config
+
 - name: Configure prometheus command arguments
   template:
-    src: confd-prometheus.j2
-    dest: /etc/conf.d/prometheus
+    src: override.conf.j2
+    dest: /etc/systemd/system/prometheus.service.d/override.conf
   notify:
+    - Reload systemd
     - Restart prometheus
   when: ansible_distribution == "Gentoo"
   tags:
diff --git a/prometheus/templates/confd-prometheus.j2 b/prometheus/templates/confd-prometheus.j2
deleted file mode 100644
index b233503c67f0eb2185aa5260cc3d8d27e41e8f41..0000000000000000000000000000000000000000
--- a/prometheus/templates/confd-prometheus.j2
+++ /dev/null
@@ -1,3 +0,0 @@
-# arguments for Prometheus
-command_args="{{ prometheus_args }}"
-supervisor="supervise-daemon"
diff --git a/prometheus/templates/override.conf.j2 b/prometheus/templates/override.conf.j2
new file mode 100644
index 0000000000000000000000000000000000000000..3752bbb095c59988804906040c59daf2ca5bfa3a
--- /dev/null
+++ b/prometheus/templates/override.conf.j2
@@ -0,0 +1,3 @@
+[Service]
+ExecStart=
+ExecStart=/usr/bin/prometheus {{ prometheus_args }}