diff --git a/.github/workflows/test_full_stack.yml b/.github/workflows/test_full_stack.yml
index 5d553f4c..29259b4d 100644
--- a/.github/workflows/test_full_stack.yml
+++ b/.github/workflows/test_full_stack.yml
@@ -12,12 +12,8 @@ on:
           - info
           - warning
           - debug
-#  push:
-#    tags:
-#      - '*'
-#    branches:
-#      - main
-#  merge_group:
+  schedule:
+    - cron: "0 4 * * *"
 
 jobs:
 
@@ -52,13 +48,17 @@ jobs:
 
     strategy:
       fail-fast: false
-      max-parallel: 1
+      max-parallel: 6
       matrix:
         distro:
           - rockylinux8
+          - rockylinux9
           - ubuntu2004
           - ubuntu2204
           - debian10
+          - debian11
+          - centos7
+          - centos8
         scenario:
           - elasticstack_default
         release:
diff --git a/molecule/elasticstack_default/converge.yml b/molecule/elasticstack_default/converge.yml
index 3f2c4780..3c781f73 100644
--- a/molecule/elasticstack_default/converge.yml
+++ b/molecule/elasticstack_default/converge.yml
@@ -51,3 +51,6 @@
     - name: Include kibana
       include_role:
         name: kibana
+    - name: Include Beats
+      include_role:
+        name: beats
diff --git a/roles/elasticsearch/tasks/elasticsearch-security.yml b/roles/elasticsearch/tasks/elasticsearch-security.yml
index 731e3ab2..d415f578 100644
--- a/roles/elasticsearch/tasks/elasticsearch-security.yml
+++ b/roles/elasticsearch/tasks/elasticsearch-security.yml
@@ -245,7 +245,6 @@
     - Restart Elasticsearch
   ignore_errors: "{{ ansible_check_mode }}"
 
-
 - name: Get xpack.security.http.ssl.keystore.secure_password # noqa: risky-shell-pipe
   shell: >
     if test -n "$(ps -p $$ | grep bash)"; then set -o pipefail; fi;
@@ -273,7 +272,6 @@
   notify:
     - Restart Elasticsearch
 
-
 - name: Remove xpack.security.http.ssl.keystore.secure_password # noqa: risky-shell-pipe
   shell: >
     if test -n "$(ps -p $$ | grep bash)"; then set -o pipefail; fi;
@@ -287,7 +285,6 @@
   notify:
     - Restart Elasticsearch
 
-
 - name: Get xpack.security.http.ssl.truststore.secure_password # noqa: risky-shell-pipe
   shell: >
     if test -n "$(ps -p $$ | grep bash)"; then set -o pipefail; fi;
@@ -563,8 +560,9 @@
   register: elasticsearch_cluster_status_bootstrap
   changed_when: false
   no_log: true
-  ignore_errors: true
-  when: not elasticsearch_passwords_file.stat.exists | bool
+  when:
+    - not elasticsearch_passwords_file.stat.exists | bool
+    - groups['elasticsearch'] | length > 1
   until: elasticsearch_cluster_status_bootstrap.stdout == "green"
   retries: 5
   delay: 10
@@ -590,8 +588,9 @@
   register: elasticsearch_cluster_status
   changed_when: false
   no_log: true
-  ignore_errors: true
-  when: elasticsearch_passwords_file.stat.exists | bool
+  when:
+    - elasticsearch_passwords_file.stat.exists | bool
+    - groups['elasticsearch'] | length > 1
   until: elasticsearch_cluster_status.stdout == "green"
   retries: 20
   delay: 10