diff --git a/handlers/main.yml b/handlers/main.yml
index c89ae71..885084d 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -13,9 +13,9 @@
     name: prometheus-blackbox-exporter
     state: restarted
 
-- name: restart grafana-promtail
+- name: restart promtail
   service:
-    name: grafana-promtail
+    name: promtail
     state: restarted
 
 - name: restart snmp exporter
diff --git a/tasks/main.yml b/tasks/main.yml
index df250c8..6a46a2e 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -180,20 +180,37 @@
     dest: /etc/prometheus/conf.d/rule_files/agent_{{ inventory_hostname }}.conf
     mode: 0644
 
-- name: handle grafana-promtail
+- name: handle promtail
   when: prometheus_agent.agents.promtail.enable
   block:
+  - name: setup grafana repo key for promtail
+    apt_key:
+      url: "https://apt.grafana.com/gpg.key"
+  - name: setup grafana repo for promtail
+    apt_repository:
+      repo: "deb https://apt.grafana.com stable main"
+  - name: create promtail group
+    group:
+      name: promtail
+      system: true
+  - name: create promtail user
+    user:
+      name: promtail
+      system: true
+      group: promtail
+      groups: adm
+      home: /var/lib/promtail
   - name: install promtail
     apt:
-      pkg: grafana-promtail
+      pkg: promtail
   - name: write promtail config
-    notify: restart grafana-promtail
+    notify: restart promtail
     template:
-      owner: grafana-promtail
-      group: grafana-promtail
+      owner: promtail
+      group: root
       mode: 0640
-      dest: /etc/grafana-promtail.yml
-      src: grafana-promtail.yml.j2
+      dest: /etc/promtail/config.yml
+      src: promtail.yml.j2
 
 - name: create node-exporter-textfile group
   ansible.builtin.group:
diff --git a/templates/grafana-promtail.yml.j2 b/templates/promtail.yml.j2
similarity index 95%
rename from templates/grafana-promtail.yml.j2
rename to templates/promtail.yml.j2
index 1c78ef3..16d8ebb 100644
--- a/templates/grafana-promtail.yml.j2
+++ b/templates/promtail.yml.j2
@@ -4,7 +4,7 @@ server:
   grpc_listen_port: 0
 
 positions:
-  filename: /var/lib/grafana-promtail/positions.yaml
+  filename: /var/lib/promtail/positions.yaml
 
 clients:
 {% for i in prometheus_agent.scrapers if prometheus_agent.scrapers[i].get("loki") %}