diff --git a/ansible/process_exporter_prometheus.yml b/ansible/process_exporter_prometheus.yml
index d9642063c8f2089a6e50beb7a78d8b78da840821..9df96900169e0883690aa7060f312bad5375452f 100644
--- a/ansible/process_exporter_prometheus.yml
+++ b/ansible/process_exporter_prometheus.yml
@@ -1,5 +1,17 @@
-- name: Creating prometheus-stateful configuration folder
+- name: labelling process exporter prometheus
+  hosts: swarm-dashboard
+  become: yes
+  vars_files:
+    - ['{{inventory_dir}}/secrets.yml']
+  tasks:
+    - name: Adding label for stateful prometheus
+      shell: "docker node update --label-add prometheus_stateful=1 {{ hostvars[groups['swarm-agent-for-prometheus-stateful'][0]]['ansible_hostname'] }}"
+  tags:
+    - process-exporter-prometheus
+
+- name: deploy process exporter prometheus
   hosts: swarm-agent-for-prometheus-stateful
+  gather_facts: no
   become: yes
   vars_files:
     - ['{{inventory_dir}}/secrets.yml']
@@ -8,7 +20,9 @@
   tags:
     - process-exporter-prometheus
 
-- hosts: process-exporter
+- name: deployer process exporter to vms
+  hosts: process-exporter
+  gather_facts: no
   become: yes
   vars_files:
     - ['{{inventory_dir}}/secrets.yml']
diff --git a/ansible/roles/process-exporter-all/files/config.yml b/ansible/roles/process-exporter-all/files/config.yml
index 6390e488b81a0484dd1f0ef44a11f1e153992267..49273df74910562d811c6d40a8578b99123726f8 100644
--- a/ansible/roles/process-exporter-all/files/config.yml
+++ b/ansible/roles/process-exporter-all/files/config.yml
@@ -1,5 +1,4 @@
 process_names:
-  - name: "{{.PID}} | {{.ExeFull}} | {{.Username}}"
+  - name: "{{.ExeFull}} | {{.Username}}"
     cmdline:
     - '.+'
-
diff --git a/ansible/roles/process-exporter-all/handlers/main.yml b/ansible/roles/process-exporter-all/handlers/main.yml
deleted file mode 100755
index f5356a5125082ba8344af43cf9dc328ad81fd95e..0000000000000000000000000000000000000000
--- a/ansible/roles/process-exporter-all/handlers/main.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-- name: enable process exporter all service
-  systemd:
-    enabled: yes
-    name: process-exporter-all.service
-
-- name: restart process exporter all
-  systemd:
-    name: process-exporter-all.service
-    state: restarted
diff --git a/ansible/roles/process-exporter-all/tasks/main.yml b/ansible/roles/process-exporter-all/tasks/main.yml
index 3e054db13edbb1a6ca8cde30cec41aa37d6723ef..b61717a991e3cadda74734fb2098c058de653a95 100755
--- a/ansible/roles/process-exporter-all/tasks/main.yml
+++ b/ansible/roles/process-exporter-all/tasks/main.yml
@@ -15,7 +15,7 @@
 
 - name: create prometheus directory
   file:
-    path: "{{ process_exporter_prometheus_common_root_dir }}"
+    path: "{{ process_exporter_prometheus_common_dist_dir }}"
     state: directory
     owner: "{{ process_exporter_prometheus_common_user }}"
     group: "{{ process_exporter_prometheus_common_group }}"
@@ -27,9 +27,6 @@
     dest: "{{ process_exporter_prometheus_common_dist_dir }}"
     creates: "{{ process_exporter_prometheus_common_dist_dir }}/{{ process_exporter_prometheus_release_name }}/process_exporter"
     remote_src: yes
-  register: process_exporter_prometheus_updated
-  notify:
-    - restart process exporter all
 
 - name: copy the custom configuration file
   copy:
@@ -43,7 +40,6 @@
     recurse: yes
     owner: "{{ process_exporter_prometheus_common_user }}"
     group: "{{ process_exporter_prometheus_common_group }}"
-  when: process_exporter_prometheus_updated | changed
 
 - name: create symlink to the current release
   file:
@@ -58,8 +54,13 @@
     owner: root
     group: root
     mode: 0644
-  notify:
-    - enable process exporter all service
-    - restart process exporter all
 
-- meta: flush_handlers
+- name: enable process exporter all service
+  systemd:
+    enabled: yes
+    name: process-exporter-all.service
+
+- name: restart process exporter all
+  systemd:
+    name: process-exporter-all.service
+    state: restarted
diff --git a/ansible/roles/process-exporter-prometheus/templates/process_exporter_prometheus_stack.yml b/ansible/roles/process-exporter-prometheus/templates/process_exporter_prometheus_stack.yml
index d18258a51789b9f87940d715cdfdb72af8cbd540..ff7542bf35207264ae7c69e2dba398eb95390e7c 100644
--- a/ansible/roles/process-exporter-prometheus/templates/process_exporter_prometheus_stack.yml
+++ b/ansible/roles/process-exporter-prometheus/templates/process_exporter_prometheus_stack.yml
@@ -9,7 +9,7 @@ services:
             - application_default
         volumes:
             - "{{ process_exporter_prometheus_mount_point }}:/prometheus"
-        command: "--config.file=/etc/prometheus/prometheus.yml --storage.tsdb.path=/prometheus --web.console.libraries=/etc/prometheus/console_libraries  --storage.tsdb.retention.time={{prometheus_storage_retention_time}} --web.console.templates=/etc/prometheus/consoles --web.route-prefix={{process_exporter_prometheus_route_prefix}} --web.external-url={{process_exporter_prometheus_web_external_url}} --web.enable-admin-api --storage.tsdb.wal-compression"
+        command: "--config.file=/etc/prometheus/prometheus.yml --storage.tsdb.path=/prometheus --web.console.libraries=/etc/prometheus/console_libraries  --storage.tsdb.retention.time={{prometheus_storage_retention_time}} --web.console.templates=/etc/prometheus/consoles --web.route-prefix={{process_exporter_prometheus_route_prefix}} --web.external-url={{process_exporter_prometheus_web_external_url}} --web.enable-admin-api"
         configs:
             - source: process_exporter_prometheus.yml
               target: /etc/prometheus/prometheus.yml
diff --git a/ansible/roles/stack-monitor/templates/prometheus.yml b/ansible/roles/stack-monitor/templates/prometheus.yml
index eecdfa59c2f2760ed79666b7d4a7ff75668d920d..8adcf18f53b0d14b06de8e13af02c8ec0a955dd1 100644
--- a/ansible/roles/stack-monitor/templates/prometheus.yml
+++ b/ansible/roles/stack-monitor/templates/prometheus.yml
@@ -37,7 +37,7 @@ scrape_configs:
       - source_labels: [name]
         regex: '^\s*$'
         action: drop
-  - job_name: 'vm-node-exporter'
+  - job_name: 'node-exporter'
     static_configs:
       - targets: ["{{ groups['node-exporter'] | difference(["localhost"]) | map('regex_replace', '^(.*)$', '\\1:9100') | list | join("\", \"") }}"]