diff --git a/elk_metrics_6x/installJournalbeat.yml b/elk_metrics_6x/installJournalbeat.yml
index 58440329..f3a63793 100644
--- a/elk_metrics_6x/installJournalbeat.yml
+++ b/elk_metrics_6x/installJournalbeat.yml
@@ -53,16 +53,19 @@
       stat:
         path: /var/log/journal
       register: journal_dir
-
-    - name: exit playbook
-      meta: end_play
-      when:
-        - not (journal_dir.stat.exists | bool) or
-          ansible_service_mgr != 'systemd'
+      tags:
+        - always
 
   roles:
     - role: elastic_journalbeat
+      when:
+        - journal_dir.stat.exists | bool
+        - ansible_service_mgr == 'systemd'
+
     - role: elastic_rollup
+      when:
+        - journal_dir.stat.exists | bool
+        - ansible_service_mgr == 'systemd'
       index_name: journalbeat
 
   tags:
diff --git a/elk_metrics_6x/roles/elastic_journalbeat/tasks/main.yml b/elk_metrics_6x/roles/elastic_journalbeat/tasks/main.yml
index b19ebbc6..bc7241e8 100644
--- a/elk_metrics_6x/roles/elastic_journalbeat/tasks/main.yml
+++ b/elk_metrics_6x/roles/elastic_journalbeat/tasks/main.yml
@@ -25,17 +25,6 @@
   tags:
     - always
 
-- name: Check for journal directory
-  stat:
-    path: /var/log/journal
-  register: journal_dir
-
-- name: exit playbook after uninstall
-  meta: end_play
-  when:
-    - not (journal_dir.stat.exists | bool) or
-      ansible_service_mgr != 'systemd'
-
 - name: Ensure beat is installed
   package:
     name: "{{ journalbeat_distro_packages }}"