diff --git a/group_vars/all/logging.yml b/group_vars/all/logging.yml
new file mode 100644
index 0000000..1ed78b9
--- /dev/null
+++ b/group_vars/all/logging.yml
@@ -0,0 +1,2 @@
+---
+logstash_ssl_enabled: false
\ No newline at end of file
diff --git a/group_vars/all/services.yml b/group_vars/all/services.yml
index b7c0cdd..9a47d3b 100644
--- a/group_vars/all/services.yml
+++ b/group_vars/all/services.yml
@@ -20,7 +20,7 @@ shared_service_hostname_pgadmin4: "{{ stage }}-pgadmin4-01-pgadmin4.{{ domain_en
 shared_service_url_grafana: "https://{{ shared_service_hostname_grafana }}"
 shared_service_hostname_grafana: "{{ stage }}-prometheus-01-grafana.{{ domain_env }}"
 
-shared_service_hostname_logstash: "{{ stage }}-elastic-stack-logstash-01"
+shared_service_hostname_logstash: "{{ stage }}-logstash.{{ domain_env }}"
 
 # TODO the blackbox exporter shouldn't be DEV tagged at all
 shared_service_hostname_blackbox_exporter: "devnso-blackbox-01.smardigo.digital"
@@ -69,5 +69,7 @@ shared_service_default_additional_hosts:
     ip: "{{ shared_service_kube_loadbalancer_private_ip }}"
   - name: "{{ shared_service_kube_jaeger_collector_hostname }}"
     ip: "{{ shared_service_kube_loadbalancer_private_ip }}"
+  - name: "{{ shared_service_hostname_logstash }}"
+    ip: "{{ shared_service_loadbalancer_logstash_private_ip }}"
 
 shared_service_additional_hosts: "{{ shared_service_default_additional_hosts + (shared_service_custom_additional_hosts | default([])) }}"
diff --git a/group_vars/all/versions.yml b/group_vars/all/versions.yml
index 4a81bdf..0893730 100644
--- a/group_vars/all/versions.yml
+++ b/group_vars/all/versions.yml
@@ -1,7 +1,7 @@
 ---
 elastic_elasticsearch_version: "7.16.3"
 elastic_elasticsearch_exporter_version: "v1.5.0"
-elastic_filebeat_version: "7.16.3"
+elastic_filebeat_version: "8.11.1"
 elastic_kibana_version: "7.16.3"
 elastic_logstash_version: "7.16.3"
 elastic_metricbeat_version: "7.16.3"
diff --git a/group_vars/stage_demompmx/services.yml b/group_vars/stage_demompmx/services.yml
index 247ecff..62aa2ea 100644
--- a/group_vars/stage_demompmx/services.yml
+++ b/group_vars/stage_demompmx/services.yml
@@ -1,6 +1,5 @@
 ---
 shared_service_url_harbor: "{{ shared_service_kube_url_harbor }}"
-shared_service_hostname_logstash: "{{ stage }}-logstash.{{ domain_env }}"
 
 shared_service_url_keycloak: "https://{{ shared_service_hostname_keycloak }}"
 shared_service_hostname_keycloak: "{{ stage }}-keycloak.{{ domain_env }}"
@@ -8,8 +7,6 @@ shared_service_hostname_keycloak: "{{ stage }}-keycloak.{{ domain_env }}"
 shared_service_custom_additional_hosts:
   - name: "demompmx-connect-data.smardigo.digital"
     ip: "{{ shared_service_kube_loadbalancer_private_ip }}"
-  - name: "{{ shared_service_hostname_logstash }}"
-    ip: "{{ shared_service_loadbalancer_logstash_private_ip }}"
 
 iam_image_name: '{{ shared_service_hostname_harbor }}/prodnso/smardigo/iam-app'
 connect_image_name: "{{ shared_service_hostname_harbor }}/prodnso/smardigo/connect-whitelabel-app"