diff --git a/molecule/kibana_default/prepare.yml b/molecule/kibana_default/prepare.yml
index 2c0fd094..ed1547d8 100644
--- a/molecule/kibana_default/prepare.yml
+++ b/molecule/kibana_default/prepare.yml
@@ -8,6 +8,7 @@
           - gpg
           - curl
           - procps
+          - gpg-agent
         update_cache: yes
       when: ansible_os_family == "Debian"
     - name: Install git
diff --git a/roles/beats/defaults/main.yml b/roles/beats/defaults/main.yml
index 5885f814..276bda68 100644
--- a/roles/beats/defaults/main.yml
+++ b/roles/beats/defaults/main.yml
@@ -66,3 +66,7 @@ elastic_security: true
 elastic_ca_dir: /opt/es-ca
 elastic_ca_pass: PleaseChangeMe
 elastic_initial_passwords: /usr/share/elasticsearch/initial_passwords
+
+# Variables for debugging and development
+
+elastic_override_beats_tls: false
diff --git a/roles/beats/tasks/main.yml b/roles/beats/tasks/main.yml
index aff46378..7947dbcd 100644
--- a/roles/beats/tasks/main.yml
+++ b/roles/beats/tasks/main.yml
@@ -11,6 +11,7 @@
     when:
     - elastic_security | bool
     - elastic_variant != "oss"
+    - not elastic_override_beats_tls | bool
 
   - name: Set elasticsearch_ca variable if not already done by user
     set_fact:
diff --git a/roles/logstash/defaults/main.yml b/roles/logstash/defaults/main.yml
index 7ea605e0..f28e8927 100644
--- a/roles/logstash/defaults/main.yml
+++ b/roles/logstash/defaults/main.yml
@@ -68,3 +68,7 @@ elastic_ca_pass: PleaseChangeMe
 elastic_release: 7
 elastic_variant: elastic
 elastic_security: true
+
+# Variables for debugging and development
+
+elastic_override_beats_tls: false
diff --git a/roles/logstash/tasks/main.yml b/roles/logstash/tasks/main.yml
index 7669004c..e93e2137 100644
--- a/roles/logstash/tasks/main.yml
+++ b/roles/logstash/tasks/main.yml
@@ -18,7 +18,9 @@
   - name: Activate TLS for Beats for full stack
     set_fact:
       logstash_beats_tls: true
-    when: logstash_beats_tls is undefined
+    when:
+      - logstash_beats_tls is undefined
+      - not elastic_override_beats_tls | bool
 
 - name: Set Elasticsearch hosts to localhost if no other information available
   set_fact: