diff --git a/group_vars/all/services.yml b/group_vars/all/services.yml
index 5c27641..52f42ad 100644
--- a/group_vars/all/services.yml
+++ b/group_vars/all/services.yml
@@ -16,19 +16,20 @@ shared_service_host_management: "{{ stage }}-management-01"
 shared_service_url_management: "https://{{ shared_service_hostname_management }}"
 shared_service_hostname_management: "{{ shared_service_host_management }}-connect.{{ domain_env }}"
 
+shared_service_hostname_logstash: "{{ stage }}-elastic-stack-logstash-01"
 
 # use private loadbalancer ip for all kubernetes services
 stage_kube: "{{ stage }}"
 shared_service_kube_url_argocd: "https://{{ shared_service_kube_hostname_argocd }}"
 shared_service_kube_hostname_argocd: "{{ stage_kube }}-argocd.{{ domain_env }}"
-shared_service_kube_url_gitea: "https://{{ shared_service_kube_hostname_gitea }}"
-shared_service_kube_hostname_gitea: "{{ stage_kube }}-gitea.{{ domain_env }}"
-shared_service_kube_url_kibana: "https://{{ shared_service_kube_hostname_kibana }}"
-shared_service_kube_hostname_kibana: "{{ stage_kube }}-kibana.{{ domain_env }}"
 shared_service_kube_url_awx: "https://{{ shared_service_kube_hostname_awx }}"
 shared_service_kube_hostname_awx: "{{ stage_kube }}-awx.{{ domain_env }}"
+shared_service_kube_url_gitea: "https://{{ shared_service_kube_hostname_gitea }}"
+shared_service_kube_hostname_gitea: "{{ stage_kube }}-gitea.{{ domain_env }}"
 shared_service_kube_url_harbor: "https://{{ shared_service_kube_hostname_harbor }}"
 shared_service_kube_hostname_harbor: "{{ stage }}-harbor.{{ domain_env }}"
+shared_service_kube_url_kibana: "https://{{ shared_service_kube_hostname_kibana }}"
+shared_service_kube_hostname_kibana: "{{ stage_kube }}-kibana.{{ domain_env }}"
 shared_service_kube_url_prometheus: "https://{{ shared_service_kube_hostname_prometheus }}"
 shared_service_kube_hostname_prometheus: "{{ stage_kube }}-prometheus.{{ domain_env }}"
 shared_service_kube_jaeger_collector_hostname: "{{ stage_kube }}-jaeger-collector.{{ domain_env }}"
@@ -48,13 +49,15 @@ shared_service_default_additional_hosts:
     ip: "{{ shared_service_kube_loadbalancer_private_ip }}"
   - name: "{{ shared_service_kube_hostname_awx }}"
     ip: "{{ shared_service_kube_loadbalancer_private_ip }}"
+  - name: "{{ shared_service_kube_hostname_gitea }}"
+    ip: "{{ shared_service_kube_loadbalancer_private_ip }}"
+  - name: "{{ shared_service_kube_hostname_harbor }}"
+    ip: "{{ shared_service_kube_loadbalancer_private_ip }}"
+  - name: "{{ shared_service_kube_hostname_kibana }}"
+    ip: "{{ shared_service_kube_loadbalancer_private_ip }}"
   - name: "{{ shared_service_kube_hostname_prometheus }}"
     ip: "{{ shared_service_kube_loadbalancer_private_ip }}"
   - name: "{{ shared_service_kube_jaeger_collector_hostname }}"
     ip: "{{ shared_service_kube_loadbalancer_private_ip }}"
-  - name: "{{ shared_service_kube_hostname_harbor }}"
-    ip: "{{ shared_service_kube_loadbalancer_private_ip }}"
-  - name: "{{ shared_service_logstash_hostname }}"
-    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/stage_demompmx/plain.yml b/group_vars/stage_demompmx/plain.yml
index 1295fa5..55455ac 100644
--- a/group_vars/stage_demompmx/plain.yml
+++ b/group_vars/stage_demompmx/plain.yml
@@ -26,7 +26,6 @@ shared_service_hostname_harbor: "{{ shared_service_kube_hostname_harbor }}"
 
 shared_service_iam_hostname: "{{ stage }}-iam-01.{{ domain_env }}"
 shared_service_mail_hostname: "{{ stage }}-mail-01.{{ domain_env }}"
-shared_service_logstash_hostname: "{{ stage }}-logstash.{{ domain_env }}"
 
 filebeat_image_name: "{{ shared_service_hostname_harbor }}/docker.elastic.co/beats/filebeat"
 metricbeat_image_name: "{{ shared_service_hostname_harbor }}/docker.elastic.co/beats/metricbeat"
diff --git a/group_vars/stage_demompmx/services.yml b/group_vars/stage_demompmx/services.yml
index d318f38..1c99f9b 100644
--- a/group_vars/stage_demompmx/services.yml
+++ b/group_vars/stage_demompmx/services.yml
@@ -1,9 +1,12 @@
 ---
 shared_service_url_harbor: "{{ shared_service_kube_harbor_url }}"
+shared_service_hostname_logstash: "{{ stage }}-logstash.{{ domain_env }}"
 
 shared_service_custom_additional_hosts:
   - name: "{{ shared_service_connect_data_hostname }}"
     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"
diff --git a/group_vars/stage_dev/plain.yml b/group_vars/stage_dev/plain.yml
index 243f16a..9fc4f82 100644
--- a/group_vars/stage_dev/plain.yml
+++ b/group_vars/stage_dev/plain.yml
@@ -8,7 +8,6 @@ shared_service_network: "10.0.0.0/16"
 shared_service_elastic_stack_01_hostname: "{{ stage }}-elastic-stack-elastic-01"
 shared_service_elastic_stack_02_hostname: "{{ stage }}-elastic-stack-elastic-02"
 shared_service_elastic_stack_03_hostname: "{{ stage }}-elastic-stack-elastic-03"
-shared_service_logstash_hostname: "{{ stage }}-elastic-stack-logstash-01"
 
 shared_service_iam_hostname: "{{ stage }}-iam-01.{{ domain_env }}"
 shared_service_mail_hostname: "{{ stage }}-mail-01.{{ domain_env }}"
diff --git a/group_vars/stage_prodnso/plain.yml b/group_vars/stage_prodnso/plain.yml
index 9f4b4e6..ce46117 100644
--- a/group_vars/stage_prodnso/plain.yml
+++ b/group_vars/stage_prodnso/plain.yml
@@ -8,7 +8,6 @@ shared_service_network: "10.0.0.0/16"
 shared_service_elastic_stack_01_hostname: "{{ stage }}-elastic-stack-elastic-01"
 shared_service_elastic_stack_02_hostname: "{{ stage }}-elastic-stack-elastic-02"
 shared_service_elastic_stack_03_hostname: "{{ stage }}-elastic-stack-elastic-03"
-shared_service_logstash_hostname: "{{ stage }}-elastic-stack-logstash-01"
 shared_service_iam_hostname: "{{ stage }}-iam-01.{{ domain_env }}"
 shared_service_mail_hostname: "{{ stage }}-mail-01.{{ domain_env }}"
 shared_service_pdns_hostname: "{{ stage }}-pdns-01.{{ domain_env }}"
diff --git a/group_vars/stage_qa/plain.yml b/group_vars/stage_qa/plain.yml
index d602ede..8a26985 100644
--- a/group_vars/stage_qa/plain.yml
+++ b/group_vars/stage_qa/plain.yml
@@ -8,7 +8,6 @@ shared_service_network: "10.1.0.0/16"
 shared_service_elastic_stack_01_hostname: "{{ stage }}-elastic-stack-elastic-01"
 shared_service_elastic_stack_02_hostname: "{{ stage }}-elastic-stack-elastic-02"
 shared_service_elastic_stack_03_hostname: "{{ stage }}-elastic-stack-elastic-03"
-shared_service_logstash_hostname: "{{ stage }}-elastic-stack-logstash-01"
 
 shared_service_iam_hostname: "{{ stage }}-iam-01.{{ domain_env }}"
 shared_service_mail_hostname: "{{ stage }}-mail-01.{{ domain_env }}"
diff --git a/templates/filebeat/config/filebeat.yml.j2 b/templates/filebeat/config/filebeat.yml.j2
index e7faff5..830175e 100644
--- a/templates/filebeat/config/filebeat.yml.j2
+++ b/templates/filebeat/config/filebeat.yml.j2
@@ -79,7 +79,7 @@ processors:
       ignore_missing: yes
 
 output.logstash:
-  hosts: ["{{ shared_service_logstash_hostname }}:{{ service_port_logstash }}"]
+  hosts: ["{{ shared_service_hostname_logstash }}:{{ service_port_logstash }}"]
 {% if logstash_ssl_enabled | default(true) %}
   ssl:
     certificate_authorities:
diff --git a/templates/metricbeat/config/metricbeat.yml.j2 b/templates/metricbeat/config/metricbeat.yml.j2
index 15b193c..f63f102 100644
--- a/templates/metricbeat/config/metricbeat.yml.j2
+++ b/templates/metricbeat/config/metricbeat.yml.j2
@@ -51,7 +51,7 @@ fields:
   hostname: {{ inventory_hostname }}
 
 output.logstash:
-  hosts: ["{{ shared_service_logstash_hostname }}:{{ service_port_logstash }}"]
+  hosts: ["{{ shared_service_hostname_logstash }}:{{ service_port_logstash }}"]
 {% if logstash_ssl_enabled | default(true) %}
   ssl:
     certificate_authorities: