diff --git a/roles/beats/tasks/auditbeat.yml b/roles/beats/tasks/auditbeat.yml
index 5a42f385..773382ff 100644
--- a/roles/beats/tasks/auditbeat.yml
+++ b/roles/beats/tasks/auditbeat.yml
@@ -2,7 +2,7 @@
 
 - name: Construct exact name of Auditbeat package
   ansible.builtin.set_fact:
-    beats_auditbeat_package: >
+    beats_auditbeat_package: >-
       {{
       'auditbeat' +
       (elasticstack_versionseparator +
diff --git a/roles/beats/tasks/filebeat.yml b/roles/beats/tasks/filebeat.yml
index 4c90c9ed..6240b09a 100644
--- a/roles/beats/tasks/filebeat.yml
+++ b/roles/beats/tasks/filebeat.yml
@@ -2,7 +2,7 @@
 
 - name: Construct exact name of Filebeat package
   ansible.builtin.set_fact:
-    beats_filebeat_package: >
+    beats_filebeat_package: >-
       {{
       'filebeat' +
       (elasticstack_versionseparator +
diff --git a/roles/beats/tasks/metricbeat.yml b/roles/beats/tasks/metricbeat.yml
index c261a962..d89cb760 100644
--- a/roles/beats/tasks/metricbeat.yml
+++ b/roles/beats/tasks/metricbeat.yml
@@ -2,7 +2,7 @@
 
 - name: Construct exact name of Metricbeat package
   ansible.builtin.set_fact:
-    beats_metricbeat_package: >
+    beats_metricbeat_package: >-
       {{
       'metricbeat' +
       (elasticstack_versionseparator +
diff --git a/roles/kibana/tasks/main.yml b/roles/kibana/tasks/main.yml
index f33f3deb..774db05e 100644
--- a/roles/kibana/tasks/main.yml
+++ b/roles/kibana/tasks/main.yml
@@ -41,7 +41,7 @@
 
 - name: Construct exact name of Kibana package
   ansible.builtin.set_fact:
-    kibana_package: >
+    kibana_package: >-
       {{
       'kibana' +
       ('-oss' if elasticstack_variant == 'oss' else '') +
diff --git a/roles/logstash/tasks/main.yml b/roles/logstash/tasks/main.yml
index 00e4a70a..2efcca09 100644
--- a/roles/logstash/tasks/main.yml
+++ b/roles/logstash/tasks/main.yml
@@ -58,7 +58,7 @@
 
 - name: Construct exact name of Logstash package
   ansible.builtin.set_fact:
-    logstash_package: >
+    logstash_package: >-
       {{
       'logstash' +
       ('-oss' if elasticstack_variant == 'oss' else '') +
@@ -72,7 +72,7 @@
 
 - name: Construct exact name of Logstash package
   ansible.builtin.set_fact:
-    logstash_package: >
+    logstash_package: >-
       {{
       'logstash' +
       ('-oss' if elasticstack_variant == 'oss' else '') +