diff --git a/group_vars/all/connect.yml b/group_vars/all/connect.yml
index 606d2d3..b7cdf8c 100644
--- a/group_vars/all/connect.yml
+++ b/group_vars/all/connect.yml
@@ -1,5 +1,6 @@
 ---
-shared_service_connect_data_hostname: "{{ shared_service_elastic_stack_01_hostname }}"
+# If elastic is served from k8s we need to reach elastic via load balancer port tcp/443
+shared_service_connect_data_hostname: "{{ stage }}-connect-data.{{ domain_env }}:443"
 shared_service_connect_data_username: "{{ elastic_connect_data_username_vault | default(elastic_admin_username) }}"
 shared_service_connect_data_password: "{{ elastic_connect_data_password_vault | default(elastic_admin_password) }}"
 
diff --git a/group_vars/all/services.yml b/group_vars/all/services.yml
index b5f9684..39d0606 100644
--- a/group_vars/all/services.yml
+++ b/group_vars/all/services.yml
@@ -21,6 +21,13 @@ shared_service_url_grafana: "https://{{ shared_service_hostname_grafana }}"
 shared_service_hostname_grafana: "{{ stage }}-prometheus-01-grafana.{{ domain_env }}"
 
 shared_service_hostname_logstash: "{{ stage }}-logstash.{{ domain_env }}"
+shared_service_hostname_connect_data: "{{ stage }}-connect-data.{{ domain_env }}"
+shared_service_hostname_logging_data: "{{ shared_service_elastic_stack_01_hostname }}"
+
+# TODO check if it is still needed
+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"
 
 # TODO the blackbox exporter shouldn't be DEV tagged at all
 shared_service_hostname_blackbox_exporter: "devnso-blackbox-01.smardigo.digital"
@@ -71,5 +78,7 @@ shared_service_default_additional_hosts:
     ip: "{{ shared_service_kube_loadbalancer_private_ip }}"
   - name: "{{ shared_service_hostname_logstash }}"
     ip: "{{ shared_service_loadbalancer_logstash_private_ip }}"
+  - name: "{{ shared_service_hostname_connect_data }}"
+    ip: "{{ shared_service_kube_loadbalancer_private_ip }}"
 
 shared_service_additional_hosts: "{{ shared_service_default_additional_hosts + (shared_service_custom_additional_hosts | default([])) }}"
diff --git a/group_vars/connect/plain.yml b/group_vars/connect/plain.yml
index 9a43665..e779285 100644
--- a/group_vars/connect/plain.yml
+++ b/group_vars/connect/plain.yml
@@ -1,5 +1,4 @@
 ---
-
 hetzner_server_type: cx21
 hetzner_server_labels: "stage={{ stage }} service=connect{% if tenant_id is defined %} tenant={{ tenant_id }}{% endif %}"
 
diff --git a/group_vars/stage_demompmx/plain.yml b/group_vars/stage_demompmx/plain.yml
index a287100..fb5ec78 100644
--- a/group_vars/stage_demompmx/plain.yml
+++ b/group_vars/stage_demompmx/plain.yml
@@ -35,5 +35,3 @@ shared_service_hostname_kibana: "{{ shared_service_kube_hostname_kibana }}"
 
 elastic_admin_username: "{{ elastic_admin_username_vault }}"
 elastic_admin_password: "{{ elastic_admin_password_vault }}"
-
-shared_service_elastic_stack_01_hostname: "demompmx-connect-data.smardigo.digital:443"
diff --git a/group_vars/stage_devnso/plain.yml b/group_vars/stage_devnso/plain.yml
index 1077eb1..77b97c1 100644
--- a/group_vars/stage_devnso/plain.yml
+++ b/group_vars/stage_devnso/plain.yml
@@ -5,10 +5,6 @@ stage_kube: "devnso"
 # TODO read configuration with hetzner rest api
 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_url_grafana: "{{ shared_service_kube_url_grafana }}"
 
 shared_service_iam_hostname: "{{ stage }}-iam-01.{{ domain_env }}"
diff --git a/group_vars/stage_prodnso/plain.yml b/group_vars/stage_prodnso/plain.yml
index b7c6518..85527a1 100644
--- a/group_vars/stage_prodnso/plain.yml
+++ b/group_vars/stage_prodnso/plain.yml
@@ -5,10 +5,6 @@ stage_kube: "{{ stage }}"
 # TODO read configuration with hetzner rest api
 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_url_grafana: "{{ shared_service_kube_url_grafana }}"
 
 shared_service_iam_hostname: "{{ stage }}-iam-01.{{ domain_env }}"
diff --git a/group_vars/stage_qanso/plain.yml b/group_vars/stage_qanso/plain.yml
index 5a13979..4338ccf 100644
--- a/group_vars/stage_qanso/plain.yml
+++ b/group_vars/stage_qanso/plain.yml
@@ -5,10 +5,6 @@ stage_kube: "{{ stage }}"
 # TODO read configuration with hetzner rest api
 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_url_grafana: "{{ shared_service_kube_url_grafana }}"
 
 shared_service_iam_hostname: "{{ stage }}-iam-01.{{ domain_env }}"
diff --git a/roles/kibana/vars/main.yml b/roles/kibana/vars/main.yml
index 4efe178..37dfb3c 100644
--- a/roles/kibana/vars/main.yml
+++ b/roles/kibana/vars/main.yml
@@ -28,8 +28,8 @@ elastic_docker: {
       environment: [
         "SERVER_NAME: {{ kibana_id }}",
         "SERVER_PUBLICBASEURL: https://{{ kibana_id }}.{{ domain }}",
-        "ELASTICSEARCH_URL: https://{{ shared_service_elastic_stack_01_hostname }}:9200",
-        "ELASTICSEARCH_HOSTS: '[\"https://{{ shared_service_elastic_stack_01_hostname }}:9200\"]'",
+        "ELASTICSEARCH_URL: https://{{ shared_service_hostname_logging_data }}:9200",
+        "ELASTICSEARCH_HOSTS: '[\"https://{{ shared_service_hostname_logging_data }}:9200\"]'",
         "ELASTICSEARCH_SSL_CERTIFICATEAUTHORITIES: /usr/share/elasticsearch/config/certificates/ca/ca.crt",
         "ELASTICSEARCH_USERNAME: \"{{ elastic_admin_username }}\"",
         "ELASTICSEARCH_PASSWORD: \"{{ elastic_admin_password }}\"",
diff --git a/roles/logstash/vars/main.yml b/roles/logstash/vars/main.yml
index e38a80c..0f590f0 100644
--- a/roles/logstash/vars/main.yml
+++ b/roles/logstash/vars/main.yml
@@ -20,7 +20,7 @@ elastic_docker:
               'xpack.monitoring.enabled: "true"',
               'xpack.monitoring.elasticsearch.username: "{{ elastic_admin_username }}"',
               'xpack.monitoring.elasticsearch.password: "{{ elastic_admin_password }}"',
-              "xpack.monitoring.elasticsearch.hosts: https://{{ shared_service_elastic_stack_01_hostname }}:9200",
+              "xpack.monitoring.elasticsearch.hosts: https://{{ shared_service_hostname_logging_data }}:9200",
               "xpack.monitoring.elasticsearch.ssl.certificate_authority: /usr/share/logstash/config/certificates/ca/ca.crt",
             ],
           volumes:
diff --git a/stage-devnso b/stage-devnso
index 47e13c9..3dc7f53 100644
--- a/stage-devnso
+++ b/stage-devnso
@@ -5,9 +5,6 @@ devnso-backup-01
 devnso-management-01
 
 [elastic]
-devnso-elastic-stack-elastic-01
-devnso-elastic-stack-elastic-02
-devnso-elastic-stack-elastic-03
 
 [gitea]
 devnso-gitea-01
@@ -22,10 +19,8 @@ devnso-iam-01
 devnso-keycloak-01
 
 [kibana]
-devnso-elastic-stack-kibana-01
 
 [logstash]
-devnso-elastic-stack-logstash-01
 
 [management]
 devnso-management-01
diff --git a/templates/elastic-certs/devnso-certs/ca/ca.crt b/templates/elastic-certs/devnso-certs/ca/ca.crt
index e8dffa0..adb46c8 100644
--- a/templates/elastic-certs/devnso-certs/ca/ca.crt
+++ b/templates/elastic-certs/devnso-certs/ca/ca.crt
@@ -1,20 +1,31 @@
 -----BEGIN CERTIFICATE-----
-MIIDSTCCAjGgAwIBAgIUXSyo+Zoe0tzr2iKqunLGqybOu3IwDQYJKoZIhvcNAQEL
-BQAwNDEyMDAGA1UEAxMpRWxhc3RpYyBDZXJ0aWZpY2F0ZSBUb29sIEF1dG9nZW5l
-cmF0ZWQgQ0EwHhcNMjMwNjIzMTczMzE0WhcNMjYwNjIyMTczMzE0WjA0MTIwMAYD
-VQQDEylFbGFzdGljIENlcnRpZmljYXRlIFRvb2wgQXV0b2dlbmVyYXRlZCBDQTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKaMcc6BQcdUb4U2Gf90pveH
-HW2j/jSSm2a9al14P2Z+j9YvgsQIiIpBxoVUkO+Sdqhu9y/eMwpJLxLm0N1EL7Py
-i5CnAFVi0CCp20kElefd3KSPS7cLZSbSdXIUPQlL9gkgD1cfJUmF7E81+KXNhRuZ
-oN0wMFPY8P0Eu/uykG6i48cGLcedfHYi+F+yIDKu7Wf3QtRLAGHk9BLIAg+OMGNo
-MIY9sFU4fATcAUGOlHnmAHPWPWGRsftQw273SCOPwv9BjVEAaoHXXycIn6SeYjic
-MMBKiugMmkoSDFOo2MDivPu8c+WSaiZA/xbp69/hlkyPrx8yq9uY/zVM5M2xpxkC
-AwEAAaNTMFEwHQYDVR0OBBYEFNfbyeX0TLH1Lth71FiREKmfYqnIMB8GA1UdIwQY
-MBaAFNfbyeX0TLH1Lth71FiREKmfYqnIMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZI
-hvcNAQELBQADggEBADm0Dk1SeCtrLlckABcKntrq2v+Syu8Wa6x+ZReNNAQtdHRC
-OcmWnphihpoNTuf+CgWFLDXB/z0SXLvRow93RPVOGGtN5XAcI5fkSJMnn0m2NGoT
-23eEvi4QsdYQS//gnPR/HYdKgeOi67mEOQdktNGTaxi4v8BIk41G5UDad+oUmGJ5
-RLUS9coDtuhmhgwwDBwuKGU5nHRzpwG2/1bLUtVCjA64eMdcig7cbtFdVaE1b2tj
-VjTjDrCQbhFd120WN42XH2sj4zVsDDnZtK/rXqceAj+VH/PA+CfvlOBOmFsdyROB
-+4fLtrzEFKW36SgJfNQVa96uAJtDh/ThGn1ySdo=
------END CERTIFICATE-----
+MIIFYDCCBEigAwIBAgIQQAF3ITfU6UK47naqPGQKtzANBgkqhkiG9w0BAQsFADA/
+MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
+DkRTVCBSb290IENBIFgzMB4XDTIxMDEyMDE5MTQwM1oXDTI0MDkzMDE4MTQwM1ow
+TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
+cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwggIiMA0GCSqGSIb3DQEB
+AQUAA4ICDwAwggIKAoICAQCt6CRz9BQ385ueK1coHIe+3LffOJCMbjzmV6B493XC
+ov71am72AE8o295ohmxEk7axY/0UEmu/H9LqMZshftEzPLpI9d1537O4/xLxIZpL
+wYqGcWlKZmZsj348cL+tKSIG8+TA5oCu4kuPt5l+lAOf00eXfJlII1PoOK5PCm+D
+LtFJV4yAdLbaL9A4jXsDcCEbdfIwPPqPrt3aY6vrFk/CjhFLfs8L6P+1dy70sntK
+4EwSJQxwjQMpoOFTJOwT2e4ZvxCzSow/iaNhUd6shweU9GNx7C7ib1uYgeGJXDR5
+bHbvO5BieebbpJovJsXQEOEO3tkQjhb7t/eo98flAgeYjzYIlefiN5YNNnWe+w5y
+sR2bvAP5SQXYgd0FtCrWQemsAXaVCg/Y39W9Eh81LygXbNKYwagJZHduRze6zqxZ
+Xmidf3LWicUGQSk+WT7dJvUkyRGnWqNMQB9GoZm1pzpRboY7nn1ypxIFeFntPlF4
+FQsDj43QLwWyPntKHEtzBRL8xurgUBN8Q5N0s8p0544fAQjQMNRbcTa0B7rBMDBc
+SLeCO5imfWCKoqMpgsy6vYMEG6KDA0Gh1gXxG8K28Kh8hjtGqEgqiNx2mna/H2ql
+PRmP6zjzZN7IKw0KKP/32+IVQtQi0Cdd4Xn+GOdwiK1O5tmLOsbdJ1Fu/7xk9TND
+TwIDAQABo4IBRjCCAUIwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYw
+SwYIKwYBBQUHAQEEPzA9MDsGCCsGAQUFBzAChi9odHRwOi8vYXBwcy5pZGVudHJ1
+c3QuY29tL3Jvb3RzL2RzdHJvb3RjYXgzLnA3YzAfBgNVHSMEGDAWgBTEp7Gkeyxx
++tvhS5B1/8QVYIWJEDBUBgNVHSAETTBLMAgGBmeBDAECATA/BgsrBgEEAYLfEwEB
+ATAwMC4GCCsGAQUFBwIBFiJodHRwOi8vY3BzLnJvb3QteDEubGV0c2VuY3J5cHQu
+b3JnMDwGA1UdHwQ1MDMwMaAvoC2GK2h0dHA6Ly9jcmwuaWRlbnRydXN0LmNvbS9E
+U1RST09UQ0FYM0NSTC5jcmwwHQYDVR0OBBYEFHm0WeZ7tuXkAXOACIjIGlj26Ztu
+MA0GCSqGSIb3DQEBCwUAA4IBAQAKcwBslm7/DlLQrt2M51oGrS+o44+/yQoDFVDC
+5WxCu2+b9LRPwkSICHXM6webFGJueN7sJ7o5XPWioW5WlHAQU7G75K/QosMrAdSW
+9MUgNTP52GE24HGNtLi1qoJFlcDyqSMo59ahy2cI2qBDLKobkx/J3vWraV0T9VuG
+WCLKTVXkcGdtwlfFRjlBz4pYg1htmf5X6DYO8A4jqv2Il9DjXA6USbW1FzXSLr9O
+he8Y4IWS6wY7bCkjCWDcRQJMEhg76fsO3txE+FiYruq9RUWhiF1myv4Q6W+CyBFC
+Dfvp7OOGAN6dEOM4+qR9sdjoSYKEBpsr6GtPAQw4dy753ec5
+-----END CERTIFICATE-----
\ No newline at end of file
diff --git a/templates/elastic-certs/devnso-certs/devnso-elastic-stack-elastic-01/devnso-elastic-stack-elastic-01.crt b/templates/elastic-certs/devnso-certs/devnso-elastic-stack-elastic-01/devnso-elastic-stack-elastic-01.crt
deleted file mode 100644
index 072fb56..0000000
--- a/templates/elastic-certs/devnso-certs/devnso-elastic-stack-elastic-01/devnso-elastic-stack-elastic-01.crt
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDcjCCAlqgAwIBAgIULspIqqqNlnGn/5ME8eyBk1uN2nowDQYJKoZIhvcNAQEL
-BQAwNDEyMDAGA1UEAxMpRWxhc3RpYyBDZXJ0aWZpY2F0ZSBUb29sIEF1dG9nZW5l
-cmF0ZWQgQ0EwHhcNMjMwNjIzMTczMzE1WhcNMjYwNjIyMTczMzE1WjAqMSgwJgYD
-VQQDEx9kZXZuc28tZWxhc3RpYy1zdGFjay1lbGFzdGljLTAxMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhc2XfpMp5blKEDqx0U4eVIIS0423M9HgeJFR
-UW/pJNK+fD0F1iCcZBqXM54/i4Vemje/tIaUrQcnlAvOGiFe9ae6RZrsk7LG9G0R
-C+DGPtDpGVgnfoeMVvRzQ09rO7kba3n6HZUcEL/MXAAeeXnyDbalU3kaXv/tXBIJ
-xMRdZlfbvRBb868wtM5vULWMoGA4u5O5zpNZKFnfaUTvYjHr7ll9Qz8J9i4bGJWP
-8Gvtt+3Ltp5FpJbyZg8buVnbhTikH10XiPd58UmmO2MQD5o5mdnLuEGQ8QlDjg8+
-s4Ngm80ju24GnDhTtQa7vcIuJhW1wYMYMC4efyDJEFfxbcwq6QIDAQABo4GFMIGC
-MB0GA1UdDgQWBBQxLLm8YunCLT1vHkvsMHDgSExGyjAfBgNVHSMEGDAWgBTX28nl
-9Eyx9S7Ye9RYkRCpn2KpyDA1BgNVHREELjAsgglsb2NhbGhvc3SCH2Rldm5zby1l
-bGFzdGljLXN0YWNrLWVsYXN0aWMtMDEwCQYDVR0TBAIwADANBgkqhkiG9w0BAQsF
-AAOCAQEAXFXpPZDj0VpAC4zc+sM/YI2OeKY2dGsPpo7q3p6P+zRyVKfvIBAkstA0
-eTVkPVenESX5RL83U7RwXUkQEExQO9T1/PbOJoXsuXR9j3ZsPOcapVZzRO3Po8hQ
-q4WvsSkKVniYyKyF7EHlpgCZUn1tDkkZZlbFcreDLUqTFoFtgsHuLskdoylVtruc
-NQhBlIEwV3vAQo3YNLONeoqBwmwzrYBV13Sm4KgZeoGhQiySlPTAkT8k1MYFIxKv
-PWPzufhqq5884G4VkFbSTc6/V6uqMn8MSuFr1SLc6IvgGzNNV7cxxbivuxmjpixK
-+rNSCVJybyDKVADu1VuDCMdsiCIZVw==
------END CERTIFICATE-----
diff --git a/templates/elastic-certs/devnso-certs/devnso-elastic-stack-elastic-01/devnso-elastic-stack-elastic-01.key b/templates/elastic-certs/devnso-certs/devnso-elastic-stack-elastic-01/devnso-elastic-stack-elastic-01.key
deleted file mode 100644
index 0314f46..0000000
--- a/templates/elastic-certs/devnso-certs/devnso-elastic-stack-elastic-01/devnso-elastic-stack-elastic-01.key
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAhc2XfpMp5blKEDqx0U4eVIIS0423M9HgeJFRUW/pJNK+fD0F
-1iCcZBqXM54/i4Vemje/tIaUrQcnlAvOGiFe9ae6RZrsk7LG9G0RC+DGPtDpGVgn
-foeMVvRzQ09rO7kba3n6HZUcEL/MXAAeeXnyDbalU3kaXv/tXBIJxMRdZlfbvRBb
-868wtM5vULWMoGA4u5O5zpNZKFnfaUTvYjHr7ll9Qz8J9i4bGJWP8Gvtt+3Ltp5F
-pJbyZg8buVnbhTikH10XiPd58UmmO2MQD5o5mdnLuEGQ8QlDjg8+s4Ngm80ju24G
-nDhTtQa7vcIuJhW1wYMYMC4efyDJEFfxbcwq6QIDAQABAoIBAAN9kzJ/HlGwMr7C
-To86Qs+g5mLUc0S2eJeh8DAirj9YAWt2Sr0E9BonGMNaS9K/nkcsUHj3eyYZu1jr
-sesRQcvrczrg9Bj/n0cTF/sVAwxHy5JDWsxnNtcHNivkWiogWxcZAy2wYnS2vDBj
-jxKg3Bqq0Byhr87DTcA1duxw1EruKCn6Tm6nXUqwuN2DQV1s4RWf7Mgn1cLXBbAg
-16s1Tsq+SBDTl0M6PUwABIYwNvBhvHgzh9MRlZhWhWtQBZpA4ZIjYb5vx/TEi1JP
-LfVrjpHKr/qgan79HW2G18uYG7ugXSRUQ4PWcoFHoVeIUjhbwBBAtBxfk6Iyc9ix
-ZhvYTH0CgYEAvB+a57MEmSpKpzj/T6KZryuuTyaF5dN8ZY4o0QMMZcFmQYlXSrwB
-wgLNdcXG/LtYTBqf+pb9HEzwPKw8os7AMaB/tSKHfIn2NohXR+YirY30AC4i5d2S
-+Lwz4v8pfcrzgYkuNyHPhSFLSveJVRV9m1lb0LLSKfVPiGd5nYcdLvcCgYEAthSU
-MEcvd3B1X6QY1VJKVEe4u/OTxuImOAyLGp7jVyaM5FBK3AD/mRYvCumZCw0nUIBk
-T1sNruDzrwK3XQH3Gdk2i5rd1n1ctOZUqeARk+4pT49zgDDRnoa/jwx18AhJxW4u
-3RbKSMDVJu4ArwlpRa4qUcKVmlSyplvqvFS6nR8CgYBCwZRelBAVqgRDwt4WjESs
-/Hsmay0omRuTjha91K8ZjL+Ukf//7SdSiVwPZtdt5601lF0gt2OqH0NAxH3f6C4b
-bjDjPhWGBA7y2v7d7LRxkeX8CmMn3rDAw0hGTPWUReiTFvLnbYAOZfop6B07rBye
-e98w98PMT9ihNtbZJ5EbkQKBgCj3PlQSYAqWYcIP8IpmRlTqAhU/ezse/IxVviJS
-J0IfaUmhCwaurtMpm5Hv9r/2yKajDG6SROTYtdrlWI3zeD33kf8c69ZrRCVrQRcr
-U6kdx2ugEdOAqFjrZkPwAMTtiHOEE8UocICn6g0lNUAsdOP5iIn2pqQfdEZbndeb
-lJTvAoGBAKnfra3v3j9jsmZjLlMSo3wI/4fo0sNTO10yCtTd087Wo2NEG4WFEdOY
-Ne8eOLbahvMotrvCO7BDtZ1E7aaLCnKpaHzcEAoCywvmxrevQo3joK82ILEej6y/
-D4RB2SzxzDYvPSHyrXHboxHwewpnI1P4KhyrHaT9dQlOzIXi3lNG
------END RSA PRIVATE KEY-----
diff --git a/templates/elastic-certs/devnso-certs/devnso-elastic-stack-elastic-01/devnso-elastic-stack-elastic-01.pkcs8.key b/templates/elastic-certs/devnso-certs/devnso-elastic-stack-elastic-01/devnso-elastic-stack-elastic-01.pkcs8.key
deleted file mode 100644
index 7c4d2d9..0000000
--- a/templates/elastic-certs/devnso-certs/devnso-elastic-stack-elastic-01/devnso-elastic-stack-elastic-01.pkcs8.key
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCFzZd+kynluUoQ
-OrHRTh5UghLTjbcz0eB4kVFRb+kk0r58PQXWIJxkGpcznj+LhV6aN7+0hpStByeU
-C84aIV71p7pFmuyTssb0bREL4MY+0OkZWCd+h4xW9HNDT2s7uRtrefodlRwQv8xc
-AB55efINtqVTeRpe/+1cEgnExF1mV9u9EFvzrzC0zm9QtYygYDi7k7nOk1koWd9p
-RO9iMevuWX1DPwn2LhsYlY/wa+237cu2nkWklvJmDxu5WduFOKQfXReI93nxSaY7
-YxAPmjmZ2cu4QZDxCUOODz6zg2CbzSO7bgacOFO1Bru9wi4mFbXBgxgwLh5/IMkQ
-V/FtzCrpAgMBAAECggEAA32TMn8eUbAyvsJOjzpCz6DmYtRzRLZ4l6HwMCKuP1gB
-a3ZKvQT0GicYw1pL0r+eRyxQePd7Jhm7WOux6xFBy+tzOuD0GP+fRxMX+xUDDEfL
-kkNazGc21wc2K+RaKiBbFxkDLbBidLa8MGOPEqDcGqrQHKGvzsNNwDV27HDUSu4o
-KfpObqddSrC43YNBXWzhFZ/syCfVwtcFsCDXqzVOyr5IENOXQzo9TAAEhjA28GG8
-eDOH0xGVmFaFa1AFmkDhkiNhvm/H9MSLUk8t9WuOkcqv+qBqfv0dbYbXy5gbu6Bd
-JFRDg9ZygUehV4hSOFvAEEC0HF+TojJz2LFmG9hMfQKBgQC8H5rnswSZKkqnOP9P
-opmvK65PJoXl03xljijRAwxlwWZBiVdKvAHCAs11xcb8u1hMGp/6lv0cTPA8rDyi
-zsAxoH+1Iod8ifY2iFdH5iKtjfQALiLl3ZL4vDPi/yl9yvOBiS43Ic+FIUtK94lV
-FX2bWVvQstIp9U+IZ3mdhx0u9wKBgQC2FJQwRy93cHVfpBjVUkpUR7i785PG4iY4
-DIsanuNXJozkUErcAP+ZFi8K6ZkLDSdQgGRPWw2u4POvArddAfcZ2TaLmt3WfVy0
-5lSp4BGT7ilPj3OAMNGehr+PDHXwCEnFbi7dFspIwNUm7gCvCWlFripRwpWaVLKm
-W+q8VLqdHwKBgELBlF6UEBWqBEPC3haMRKz8eyZrLSiZG5OOFr3UrxmMv5SR///t
-J1KJXA9m123nrTWUXSC3Y6ofQ0DEfd/oLhtuMOM+FYYEDvLa/t3stHGR5fwKYyfe
-sMDDSEZM9ZRF6JMW8udtgA5l+inoHTusHJ573zD3w8xP2KE21tknkRuRAoGAKPc+
-VBJgCpZhwg/wimZGVOoCFT97Ox78jFW+IlInQh9pSaELBq6u0ymbke/2v/bIpqMM
-bpJE5Ni12uVYjfN4PfeR/xzr1mtEJWtBFytTqR3Ha6AR04CoWOtmQ/AAxO2Ic4QT
-xShwgKfqDSU1QCx04/mIifampB90Rlud15uUlO8CgYEAqd+tre/eP2OyZmMuUxKj
-fAj/h+jSw1M7XTIK1N3TztajY0QbhYUR05g17x44ttqG8yi2u8I7sEO1nUTtposK
-cqlofNwQCgLLC+bGt69CjeOgrzYgsR6PrL8PhEHZLPHMNi89IfKtcdujEfB7Cmcj
-U/gqHKsdpP11CU7MheLeU0Y=
------END PRIVATE KEY-----
diff --git a/templates/elastic-certs/devnso-certs/devnso-elastic-stack-elastic-02/devnso-elastic-stack-elastic-02.crt b/templates/elastic-certs/devnso-certs/devnso-elastic-stack-elastic-02/devnso-elastic-stack-elastic-02.crt
deleted file mode 100644
index 8078344..0000000
--- a/templates/elastic-certs/devnso-certs/devnso-elastic-stack-elastic-02/devnso-elastic-stack-elastic-02.crt
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDcjCCAlqgAwIBAgIUSYGzt7l8UnydDIcE3BiXb6Nd79kwDQYJKoZIhvcNAQEL
-BQAwNDEyMDAGA1UEAxMpRWxhc3RpYyBDZXJ0aWZpY2F0ZSBUb29sIEF1dG9nZW5l
-cmF0ZWQgQ0EwHhcNMjMwNjIzMTczMzE1WhcNMjYwNjIyMTczMzE1WjAqMSgwJgYD
-VQQDEx9kZXZuc28tZWxhc3RpYy1zdGFjay1lbGFzdGljLTAyMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEArTWsZuyyP265ecMSyoe4eklEm+YcEHcbfcGq
-Az6sFN8X9fLbWeGs/hdHJU9Mo5pWqHDS67mYFvyOdk9JgWB9H4pK/x7fBtiYUyxC
-w/AwOEjnxtffNb0S8W6jW3BW+uM+BkDM/14FONk2nN5TMTQKV8YVYrDYYL6y4NO4
-eIwNZAZyT3XWuaKBTc6vLdh4xCefN0eT0AQ+HyitbDVLkw2KFx2x3eMHGieetlc/
-NbY0MA45nLAqGf+wO2J8aU6iXQtJNpVt19T7b+1vgwBjh6Hg2hXxJZXOELhfiPvs
-JyL+U4VEjIf9NsluVWDz40qUta6wy/MlxGtwe6wnyEL3nHshfQIDAQABo4GFMIGC
-MB0GA1UdDgQWBBTfSwyuConUJ2WPB38y2wGYlKZJRjAfBgNVHSMEGDAWgBTX28nl
-9Eyx9S7Ye9RYkRCpn2KpyDA1BgNVHREELjAsgglsb2NhbGhvc3SCH2Rldm5zby1l
-bGFzdGljLXN0YWNrLWVsYXN0aWMtMDIwCQYDVR0TBAIwADANBgkqhkiG9w0BAQsF
-AAOCAQEAKdhsoFQQt9Vq3J9sDl1+RYAEZcOySQhd6YQ2NeA4tSI//taDEEkuq+5K
-Oi1uEekNvGacyrqdFsknCxdt81kZbqHe8guBTnMYmZTRav+DolMM9zIqkbUz9Gw9
-nmwTINquxKZRw5FsjmbokwCD7xWmsvWkItrxgQYbgjN5bTgznUubpgWFv2ZroJZX
-hhYSFCNVBM7qWWIrCA8haT70bnsrvHgB8QhGOarlFZIvEgMX8nFkAZHcVN9m0idT
-qpiExZZ3VoJzDJVePTBrPb+T0mNogHnLA/awTDMyLiOl2hFMfpMnKaFKo+gbE0d/
-hSC5hjhtK5/3ac6chw6CZBH0VY7Sjg==
------END CERTIFICATE-----
diff --git a/templates/elastic-certs/devnso-certs/devnso-elastic-stack-elastic-02/devnso-elastic-stack-elastic-02.key b/templates/elastic-certs/devnso-certs/devnso-elastic-stack-elastic-02/devnso-elastic-stack-elastic-02.key
deleted file mode 100644
index 9ab6cc4..0000000
--- a/templates/elastic-certs/devnso-certs/devnso-elastic-stack-elastic-02/devnso-elastic-stack-elastic-02.key
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEArTWsZuyyP265ecMSyoe4eklEm+YcEHcbfcGqAz6sFN8X9fLb
-WeGs/hdHJU9Mo5pWqHDS67mYFvyOdk9JgWB9H4pK/x7fBtiYUyxCw/AwOEjnxtff
-Nb0S8W6jW3BW+uM+BkDM/14FONk2nN5TMTQKV8YVYrDYYL6y4NO4eIwNZAZyT3XW
-uaKBTc6vLdh4xCefN0eT0AQ+HyitbDVLkw2KFx2x3eMHGieetlc/NbY0MA45nLAq
-Gf+wO2J8aU6iXQtJNpVt19T7b+1vgwBjh6Hg2hXxJZXOELhfiPvsJyL+U4VEjIf9
-NsluVWDz40qUta6wy/MlxGtwe6wnyEL3nHshfQIDAQABAoIBABSBb4ZFLK+zHWTQ
-4f9Kz12KzFiN3ByxknZHiye/L6144TlOJbHKXynlpO1B1MI5mgYZn/QlkLUynnBb
-NUnfxnBeyuombs48rivf6DeSI+NF85/oG+tyFYqyR8dM0Wn6T8l7D8nbs6U7Rz/j
-Ai5SXuHCovLVb4hkiytwD+gVjIWexl4dNGbX4GJnYl/TT7j2Dc8u7d/od9rJEd3w
-cAOBKS9Yzy09E1Gkh/R8mCHjDAUeUe0aHV5ZTsT1ySMgMnkdzgr/kesBvYSBVtLS
-DCYpxvfPt5oMTAmnW/+RszRNzaVxPfBkrix/f28wqLdkAslhT5t221C1lGRWE9k9
-voS6jvECgYEAwLAMdUCkqetDauGN3QN/gNg5gF3yrgURXEj+WPwspR6rkD55xYKR
-rIpvVIgPdomWjtUanZMCV2AgEa9p85l2F8hfL374ImoKX/WopQjChvWkl2ZpOOiL
-f/AodGYSyEeNRFiZ/zBEmrb7kpmEfB4l0HkNqC2NFGfGm6mWbr40oisCgYEA5h86
-T/YlELi8S1Gw6LBSBPIwnsSzHbLZ4UtCzjVZdW3udmtQbOFeSPtRkcXgAHiuQD7k
-4FH6Df3/CYOEU9RV02Ok5titDZwIFOoCTFMfgDPZ2vE+ET48b8zQj4hdtTa5MrKi
-JnX87pYT/pvBGM9cDtf8Av4uN1LbuwoqDpJk/vcCgYAYUV+RILJnW3CruYGc5gce
-bKt9Ht40xiD1w6SN+G1t/VvrnWbi3WKjIumAApfo/t5Icm6kelwuSMxjTv8RJkn4
-IGqa5OxN85IRoEBDa8KZI8E89kjLTNXmNJn2brdqHVWfzYrJ4P6XhAZl7wgAXhGp
-qM1nbzBB5gLzvEhm+4xK9wKBgQCRC8XZeLBMJeSpJMh5IgnQjEcRC7JKWdzzIFjv
-WLkWR0Ay69k5h6PCJIZ5d1uFcIuEeyAQNBuEjkAeYwMZQ5EFOJ1L0+7f0SVW6Vih
-exMz33rFgaE5hRza6yHaFn3aJq/8wJNr4pqWV4oqxUmkta60vHZf/I5s2JEfB30S
-yjtWaQKBgQCBp68NEmalfTeR+vNDNKAePniuh/LuiIlLESylEK6HGnE7rWVkvYFu
-/uOb6aJGgC+GMqRe/EbP23PQrARwB9SV6ADSgGrR4jNqAT5U8C43krDelnFc1b67
-W+m8hQViDT7Z0qrfwSwp+aNlMlW5lCwRHzpJGa5dWp2PvH5zHIhKFQ==
------END RSA PRIVATE KEY-----
diff --git a/templates/elastic-certs/devnso-certs/devnso-elastic-stack-elastic-02/devnso-elastic-stack-elastic-02.pkcs8.key b/templates/elastic-certs/devnso-certs/devnso-elastic-stack-elastic-02/devnso-elastic-stack-elastic-02.pkcs8.key
deleted file mode 100644
index 7a7b1ed..0000000
--- a/templates/elastic-certs/devnso-certs/devnso-elastic-stack-elastic-02/devnso-elastic-stack-elastic-02.pkcs8.key
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCtNaxm7LI/brl5
-wxLKh7h6SUSb5hwQdxt9waoDPqwU3xf18ttZ4az+F0clT0yjmlaocNLruZgW/I52
-T0mBYH0fikr/Ht8G2JhTLELD8DA4SOfG1981vRLxbqNbcFb64z4GQMz/XgU42Tac
-3lMxNApXxhVisNhgvrLg07h4jA1kBnJPdda5ooFNzq8t2HjEJ583R5PQBD4fKK1s
-NUuTDYoXHbHd4wcaJ562Vz81tjQwDjmcsCoZ/7A7YnxpTqJdC0k2lW3X1Ptv7W+D
-AGOHoeDaFfEllc4QuF+I++wnIv5ThUSMh/02yW5VYPPjSpS1rrDL8yXEa3B7rCfI
-QveceyF9AgMBAAECggEAFIFvhkUsr7MdZNDh/0rPXYrMWI3cHLGSdkeLJ78vrXjh
-OU4lscpfKeWk7UHUwjmaBhmf9CWQtTKecFs1Sd/GcF7K6iZuzjyuK9/oN5Ij40Xz
-n+gb63IVirJHx0zRafpPyXsPyduzpTtHP+MCLlJe4cKi8tVviGSLK3AP6BWMhZ7G
-Xh00ZtfgYmdiX9NPuPYNzy7t3+h32skR3fBwA4EpL1jPLT0TUaSH9HyYIeMMBR5R
-7RodXllOxPXJIyAyeR3OCv+R6wG9hIFW0tIMJinG98+3mgxMCadb/5GzNE3NpXE9
-8GSuLH9/bzCot2QCyWFPm3bbULWUZFYT2T2+hLqO8QKBgQDAsAx1QKSp60Nq4Y3d
-A3+A2DmAXfKuBRFcSP5Y/CylHquQPnnFgpGsim9UiA92iZaO1RqdkwJXYCARr2nz
-mXYXyF8vfvgiagpf9ailCMKG9aSXZmk46It/8Ch0ZhLIR41EWJn/MESatvuSmYR8
-HiXQeQ2oLY0UZ8abqZZuvjSiKwKBgQDmHzpP9iUQuLxLUbDosFIE8jCexLMdstnh
-S0LONVl1be52a1Bs4V5I+1GRxeAAeK5APuTgUfoN/f8Jg4RT1FXTY6Tm2K0NnAgU
-6gJMUx+AM9na8T4RPjxvzNCPiF21NrkysqImdfzulhP+m8EYz1wO1/wC/i43Utu7
-CioOkmT+9wKBgBhRX5EgsmdbcKu5gZzmBx5sq30e3jTGIPXDpI34bW39W+udZuLd
-YqMi6YACl+j+3khybqR6XC5IzGNO/xEmSfggaprk7E3zkhGgQENrwpkjwTz2SMtM
-1eY0mfZut2odVZ/Nisng/peEBmXvCABeEamozWdvMEHmAvO8SGb7jEr3AoGBAJEL
-xdl4sEwl5KkkyHkiCdCMRxELskpZ3PMgWO9YuRZHQDLr2TmHo8Ikhnl3W4Vwi4R7
-IBA0G4SOQB5jAxlDkQU4nUvT7t/RJVbpWKF7EzPfesWBoTmFHNrrIdoWfdomr/zA
-k2vimpZXiirFSaS1rrS8dl/8jmzYkR8HfRLKO1ZpAoGBAIGnrw0SZqV9N5H680M0
-oB4+eK6H8u6IiUsRLKUQrocacTutZWS9gW7+45vpokaAL4YypF78Rs/bc9CsBHAH
-1JXoANKAatHiM2oBPlTwLjeSsN6WcVzVvrtb6byFBWINPtnSqt/BLCn5o2UyVbmU
-LBEfOkkZrl1anY+8fnMciEoV
------END PRIVATE KEY-----
diff --git a/templates/elastic-certs/devnso-certs/devnso-elastic-stack-elastic-03/devnso-elastic-stack-elastic-03.crt b/templates/elastic-certs/devnso-certs/devnso-elastic-stack-elastic-03/devnso-elastic-stack-elastic-03.crt
deleted file mode 100644
index b011812..0000000
--- a/templates/elastic-certs/devnso-certs/devnso-elastic-stack-elastic-03/devnso-elastic-stack-elastic-03.crt
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDcjCCAlqgAwIBAgIUJPOegKuDPMqO7EkDnPXQAkTtzBUwDQYJKoZIhvcNAQEL
-BQAwNDEyMDAGA1UEAxMpRWxhc3RpYyBDZXJ0aWZpY2F0ZSBUb29sIEF1dG9nZW5l
-cmF0ZWQgQ0EwHhcNMjMwNjIzMTczMzE1WhcNMjYwNjIyMTczMzE1WjAqMSgwJgYD
-VQQDEx9kZXZuc28tZWxhc3RpYy1zdGFjay1lbGFzdGljLTAzMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtx/aZ2ljml6Cqvc4qjKjih8wzNpfSiKhygWO
-vfL4E6Ry+62tRRAI5Un1b9J0RMZp7qQZpFIyPiRByzI3x6uHWBhHHVJ4hSRWJ8mi
-jatnzeK6ZYyCIl7IG5tOK2XiY9EMzostLiec7hNgyVnHkWBb/mV3jZBmOl1KqWvh
-GQDxPoKJdD6Sb2lGfy1JsYZxgKCvTLIiFuLi/L4EasMK1A/nl100kFAdpwYIiUrE
-iuX0wp73vSG2aZZYx0o1SkiitQGP+MmsWFiSAbuWHqePRWA1teyRAXtnewx59gxZ
-vFBQ14ugch1D59HQmgfs2rFnOBC7BvSpTzw4yn5bJyPB3inQQwIDAQABo4GFMIGC
-MB0GA1UdDgQWBBQ2XAI20tOuXvJMKENhQKZjgj5tMjAfBgNVHSMEGDAWgBTX28nl
-9Eyx9S7Ye9RYkRCpn2KpyDA1BgNVHREELjAsgglsb2NhbGhvc3SCH2Rldm5zby1l
-bGFzdGljLXN0YWNrLWVsYXN0aWMtMDMwCQYDVR0TBAIwADANBgkqhkiG9w0BAQsF
-AAOCAQEAVaDEw/slpMyalqJQQyAAmpM2QjrE1koe7dFuBbZWGcSNaJCr66S3xTjC
-8Gl56MNAd71Rz2R66qKJZ4UAvchYhsezgZHkOSl89H/Cnom/P+lLL0IDfMytvuDh
-+tRuAK1wUqo86KkfOeig1/k9xrZADh5dM0N+mVcGYm10AGfkItYLzQGooujRf0pf
-+Pp3GMxm5F56vP2JemUJXSF8dQBZUjKt+L/z8qWV/XlViHGGjHhJ8GZCi6K+rNp5
-rtmotG5uKmJ8HGiJHx/CAhU9JrS0HHjoocCOKcLybeWtiVuiT8ia6Y/rZL7wnRzO
-u0DM22qc0ZarwuDr1AzmM+eD9Gvaog==
------END CERTIFICATE-----
diff --git a/templates/elastic-certs/devnso-certs/devnso-elastic-stack-elastic-03/devnso-elastic-stack-elastic-03.key b/templates/elastic-certs/devnso-certs/devnso-elastic-stack-elastic-03/devnso-elastic-stack-elastic-03.key
deleted file mode 100644
index 76d028c..0000000
--- a/templates/elastic-certs/devnso-certs/devnso-elastic-stack-elastic-03/devnso-elastic-stack-elastic-03.key
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEogIBAAKCAQEAtx/aZ2ljml6Cqvc4qjKjih8wzNpfSiKhygWOvfL4E6Ry+62t
-RRAI5Un1b9J0RMZp7qQZpFIyPiRByzI3x6uHWBhHHVJ4hSRWJ8mijatnzeK6ZYyC
-Il7IG5tOK2XiY9EMzostLiec7hNgyVnHkWBb/mV3jZBmOl1KqWvhGQDxPoKJdD6S
-b2lGfy1JsYZxgKCvTLIiFuLi/L4EasMK1A/nl100kFAdpwYIiUrEiuX0wp73vSG2
-aZZYx0o1SkiitQGP+MmsWFiSAbuWHqePRWA1teyRAXtnewx59gxZvFBQ14ugch1D
-59HQmgfs2rFnOBC7BvSpTzw4yn5bJyPB3inQQwIDAQABAoH/V0TW0HFpBigEHXWz
-i2iWhzxWBUoMH0hh0eTUIbGoh7PXGBmseT0rABo+3QtuXVgxI4kQrz58syCUOkG0
-U3NrDJCFU3P5+3lVlaCB1wHYdkWWjs5nNfn1YzKgDg5/1RHLCKNK5LP8FXkmps4i
-TSWesZ2pW8106luLOTIwE7pfPWonHu8M9OLKNpdRrM8QDbhkePa3kTM4PuYN1cNu
-jyx2hxJPaSab9MtIAkOrRfit42QuZV/w1scwF4Oy0xXnBo0g9C6V/oqwKzyLDeNq
-+L8hzEZmdEDV8u23X8VP4Q1Td0i1lFw4VuFHFMDvK/TNKm/quKuq/t7QmcaNaPAS
-VPyxAoGBALjCKqMuNLAWmwJC/HJQTEur05xlgd1WgWIBtjmgcS5dgUMWbgXWrH3k
-X1G5mZry4Pt5v/IuSUwkYlFxQFOM9hTiElBWWEFvbc63BCuAs/OKpWQ0VCRlH5GU
-i0x8O5B9IarV0lL7Js/1Zp6y2GsGB2pmIBbdjMl7+5Jq2KJY38X3AoGBAP28Y1AC
-Y0iPpAweiHLjJUoLI17O7g80rVEiFr+811Uhp9MWSvgdJJWMsV7N2yOMckxyej18
-8KpJTQ0aiOHO9ixjtCDiQge8bdvHQd/dghLcyNuIonUFohG2g88IwnweYTK/0agc
-uGVyNCiKs0VhzEoAH0vM4jF3PTePMwffZUUVAoGAM9pCjyOTo+vkOyFDqm2AzCgA
-Lr+KT+1MSI5Eby3pNeMGOSbdYAQcywRCADS/uG372HgV98knxxfbBBJtxEUmdzvv
-ed6RzGOShNZ2dCMd3fcGbfYFu2UqE/iFk8S2DtofjcuOyL016l1sHJQDCx5ZDHJ3
-BRPOxGlodHJKNF4PB4cCgYEAuiAZEbXOsol7otA681ugHOJyvbc5dboEcQF6goe5
-xV78xqERuVNXZMRhz9NdroP1zBIljTk7KQ7AEJ6oTkwM1J8GoSCXoykbxR4zOk44
-fjGqvS9LTGAndKrXoWUhlP6L+jgvSQxYT0Io9JxZyMlmm9nfGzFdsz9ujnTi0CGV
-HckCgYEAo/GA/FWMUFcVMQFPB5Wm2LsUAxyAdZlEyVcXCk/+d6fHu3qOWtp/2oSB
-gs6PZs8lZ5hYkza2CRZLhiqPuIg30JtSm+OGmRUjEqQf+Rwtsh7d0fpHTwJ1qGhh
-VYBezGvxQ2mD8881SyLX7apxT5uNbbuezmQDLarJLinPVTiCuWM=
------END RSA PRIVATE KEY-----
diff --git a/templates/elastic-certs/devnso-certs/devnso-elastic-stack-elastic-03/devnso-elastic-stack-elastic-03.pkcs8.key b/templates/elastic-certs/devnso-certs/devnso-elastic-stack-elastic-03/devnso-elastic-stack-elastic-03.pkcs8.key
deleted file mode 100644
index c958118..0000000
--- a/templates/elastic-certs/devnso-certs/devnso-elastic-stack-elastic-03/devnso-elastic-stack-elastic-03.pkcs8.key
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC3H9pnaWOaXoKq
-9ziqMqOKHzDM2l9KIqHKBY698vgTpHL7ra1FEAjlSfVv0nRExmnupBmkUjI+JEHL
-MjfHq4dYGEcdUniFJFYnyaKNq2fN4rpljIIiXsgbm04rZeJj0QzOiy0uJ5zuE2DJ
-WceRYFv+ZXeNkGY6XUqpa+EZAPE+gol0PpJvaUZ/LUmxhnGAoK9MsiIW4uL8vgRq
-wwrUD+eXXTSQUB2nBgiJSsSK5fTCnve9IbZplljHSjVKSKK1AY/4yaxYWJIBu5Ye
-p49FYDW17JEBe2d7DHn2DFm8UFDXi6ByHUPn0dCaB+zasWc4ELsG9KlPPDjKflsn
-I8HeKdBDAgMBAAECgf9XRNbQcWkGKAQddbOLaJaHPFYFSgwfSGHR5NQhsaiHs9cY
-Gax5PSsAGj7dC25dWDEjiRCvPnyzIJQ6QbRTc2sMkIVTc/n7eVWVoIHXAdh2RZaO
-zmc1+fVjMqAODn/VEcsIo0rks/wVeSamziJNJZ6xnalbzXTqW4s5MjATul89aice
-7wz04so2l1GszxANuGR49reRMzg+5g3Vw26PLHaHEk9pJpv0y0gCQ6tF+K3jZC5l
-X/DWxzAXg7LTFecGjSD0LpX+irArPIsN42r4vyHMRmZ0QNXy7bdfxU/hDVN3SLWU
-XDhW4UcUwO8r9M0qb+q4q6r+3tCZxo1o8BJU/LECgYEAuMIqoy40sBabAkL8clBM
-S6vTnGWB3VaBYgG2OaBxLl2BQxZuBdasfeRfUbmZmvLg+3m/8i5JTCRiUXFAU4z2
-FOISUFZYQW9tzrcEK4Cz84qlZDRUJGUfkZSLTHw7kH0hqtXSUvsmz/VmnrLYawYH
-amYgFt2MyXv7kmrYoljfxfcCgYEA/bxjUAJjSI+kDB6IcuMlSgsjXs7uDzStUSIW
-v7zXVSGn0xZK+B0klYyxXs3bI4xyTHJ6PXzwqklNDRqI4c72LGO0IOJCB7xt28dB
-392CEtzI24iidQWiEbaDzwjCfB5hMr/RqBy4ZXI0KIqzRWHMSgAfS8ziMXc9N48z
-B99lRRUCgYAz2kKPI5Oj6+Q7IUOqbYDMKAAuv4pP7UxIjkRvLek14wY5Jt1gBBzL
-BEIANL+4bfvYeBX3ySfHF9sEEm3ERSZ3O+953pHMY5KE1nZ0Ix3d9wZt9gW7ZSoT
-+IWTxLYO2h+Ny47IvTXqXWwclAMLHlkMcncFE87EaWh0cko0Xg8HhwKBgQC6IBkR
-tc6yiXui0DrzW6Ac4nK9tzl1ugRxAXqCh7nFXvzGoRG5U1dkxGHP012ug/XMEiWN
-OTspDsAQnqhOTAzUnwahIJejKRvFHjM6Tjh+Maq9L0tMYCd0qtehZSGU/ov6OC9J
-DFhPQij0nFnIyWab2d8bMV2zP26OdOLQIZUdyQKBgQCj8YD8VYxQVxUxAU8HlabY
-uxQDHIB1mUTJVxcKT/53p8e7eo5a2n/ahIGCzo9mzyVnmFiTNrYJFkuGKo+4iDfQ
-m1Kb44aZFSMSpB/5HC2yHt3R+kdPAnWoaGFVgF7Ma/FDaYPzzzVLItftqnFPm41t
-u57OZAMtqskuKc9VOIK5Yw==
------END PRIVATE KEY-----
diff --git a/templates/elastic-certs/devnso-certs/devnso-elastic-stack-filebeat/devnso-elastic-stack-filebeat.crt b/templates/elastic-certs/devnso-certs/devnso-elastic-stack-filebeat/devnso-elastic-stack-filebeat.crt
deleted file mode 100644
index 0cb5092..0000000
--- a/templates/elastic-certs/devnso-certs/devnso-elastic-stack-filebeat/devnso-elastic-stack-filebeat.crt
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDbzCCAlegAwIBAgIVAI9/b8OixmysEq5eDe9E9nndYCARMA0GCSqGSIb3DQEB
-CwUAMDQxMjAwBgNVBAMTKUVsYXN0aWMgQ2VydGlmaWNhdGUgVG9vbCBBdXRvZ2Vu
-ZXJhdGVkIENBMB4XDTIzMDYyMzE3MzMxNVoXDTI2MDYyMjE3MzMxNVowKDEmMCQG
-A1UEAxMdZGV2bnNvLWVsYXN0aWMtc3RhY2stZmlsZWJlYXQwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDOio+bOrWtnZEERJe3nDqTaV6xc+TwcbQLZv4f
-WZr+tETgbgM44qqflYDMjIcMIqc4f98L1eanYHe8nIu0P7Fn6tdUXHAe5mkYhtLQ
-OQrcaATaGy7A920pbJILP4ngrw+5tKJEr1PTxtvTkQ8BP/rmIlrFtcYfAuHof3SJ
-LTmf0kRSyEMmTNSGXwxdMkNJDAGjO/vSrCM+pK3rQPeFOW0U5+AJl7o5hMi5T6ij
-+AhudNNRoGeifG9i0OpvPt7DSEev1DQy24n2bLa4TZWB5Ru8KMJAMtxx3W+S+m0D
-mDNIQELSF3JCFKSkGHUT24cgh5uimkFYhgxCUZ5xGNch+SmNAgMBAAGjgYMwgYAw
-HQYDVR0OBBYEFHe+nGT1rmbvdc11enmUiof5lYxdMB8GA1UdIwQYMBaAFNfbyeX0
-TLH1Lth71FiREKmfYqnIMDMGA1UdEQQsMCqCCWxvY2FsaG9zdIIdZGV2bnNvLWVs
-YXN0aWMtc3RhY2stZmlsZWJlYXQwCQYDVR0TBAIwADANBgkqhkiG9w0BAQsFAAOC
-AQEAhrMYtflAzz5WYiKJ9BRStKkByl32F5jk/1mWwE0FaMhUkwmG9AOEt0+VBTAI
-LDqccqMnUh/LhQhrDMdpTwcuC4ef/cQhB5xjgPJd3rC/mqRCCtUZLoQYnxWtv05l
-tw8HqcThS+Q9+rMiFd254AQ9e3x+/UcqRyf8sOHS5MffYzwA1m0lE20XLjveNQx4
-x2q6H4rS2/WJoTEPOHhE+9+1y2PPYLzJuCx9y2Lzi/VOmNW/nS+5kPG+mbb51hMb
-0RdcyB5Vr0fpYFGovZU1E58Ojr/FFL4z6SUszHbQBt1Sn4yluS1jg1nrS1IHpCmP
-o0pRfHrMgbOG6trkMzk+aW0Nxg==
------END CERTIFICATE-----
diff --git a/templates/elastic-certs/devnso-certs/devnso-elastic-stack-filebeat/devnso-elastic-stack-filebeat.key b/templates/elastic-certs/devnso-certs/devnso-elastic-stack-filebeat/devnso-elastic-stack-filebeat.key
deleted file mode 100644
index d9662f4..0000000
--- a/templates/elastic-certs/devnso-certs/devnso-elastic-stack-filebeat/devnso-elastic-stack-filebeat.key
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEAzoqPmzq1rZ2RBESXt5w6k2lesXPk8HG0C2b+H1ma/rRE4G4D
-OOKqn5WAzIyHDCKnOH/fC9Xmp2B3vJyLtD+xZ+rXVFxwHuZpGIbS0DkK3GgE2hsu
-wPdtKWySCz+J4K8PubSiRK9T08bb05EPAT/65iJaxbXGHwLh6H90iS05n9JEUshD
-JkzUhl8MXTJDSQwBozv70qwjPqSt60D3hTltFOfgCZe6OYTIuU+oo/gIbnTTUaBn
-onxvYtDqbz7ew0hHr9Q0MtuJ9my2uE2VgeUbvCjCQDLccd1vkvptA5gzSEBC0hdy
-QhSkpBh1E9uHIIeboppBWIYMQlGecRjXIfkpjQIDAQABAoIBAGQjVO33gIc8+kbd
-9MsOQW4gK8uQe6LCFf9jP3k2qgmsoCpJ3GETsJLv2sMRrRZKpNWlVaB45DwpbtQw
-+CD7solGGIFr0eaBYtoD4CkZRvVGr3eJr1jafYAUhhhTBYe8iLzKYdQ4R0XJx+Hj
-FinOedhjNqxd7cEyVhIx3W/2z9X2reYvdExPA2QAeDo9S4Jinp6FUGZFeECSLBNh
-vvAfaO07NVF60wOzi27LamRgwsAGa1yIx3mb3xwlxP3Gtxq8awU8vDPay0BwxpZa
-37d8sC0oKwWYOH1b/vabPwzn3X+BrPkji2r+sTZbzyyFVzVWZQI6XTNY7btLqkgq
-m///r4cCgYEA0yo6/xdPB/SW7/jHSvqTKTLa4xNsdgyIA0s6kelKPeEO8n20gc7n
-1r9tqiw1HUAlzIcwo7DNo/4VUFqKns9i2CdjIbb2ljglaY2mCuMXFN2RTuCxHeGr
-VtHNv+QPUxusjDA00QvRzXCKwesG9u5bY3mHUFw7dvIcwkE8GQ3Y0ZsCgYEA+mUC
-05BP7aJkUFYtZN/Ic00YXWHNpAjtJX6YR0KjZd7iMVvaGJusoGw1q5C1PcO6cLvU
-GbJ/r02q0IEHoV4Zt9I2JDM45hnskui2zvmiNGhbDC8OMYVNlGzd4j6KtqFh+qYu
-9IPBGcg7ql3sopN6RD+ndNxzLkLlxCBzVqD2F/cCgYApn2tdmMSVNtsBljICT33u
-Yv3OQKfiZPnyXEPBOxDNPa1qkuifpZ8BL154appVl61bsVIfEdyW9KBS5GXqg8ph
-/PGHVb8pQQvu0GLoRnboP/xCZfvDfhX92QELT/LNWOkcAOyIQCIssoBHVQJcbgNJ
-ikznxCZcfcC5cY5dCeOw/QKBgQCFPd8lKXP+5h0vSsxZE2QdRvciKfs9wKpA+36Y
-3PMKMHJ5BYGm+p//tdVReG2Zcl/xwWF6Uyvy4wd0cFTZH7Pbx3acCM3MVBs5ibBN
-rzULYkSg1SFeZKsFwnDIBbPWv0XeFTSDVOEakRx+6gAT+xpi2uSHIRABnAOcPBBk
-Fr8dvQKBgQC34KTPRt45pKtowJIZFFJ3y0Vv9hYzPPm/WqZLwd9v66GXbjyEEz7L
-iHXkwzawJZOEuQAR5qJxKJeQNTy2YS3a7AURnDRw63zv1SvBL2FJIzthnBRXtV9G
-Q+AEu+OY19jKGFiQyCgIF0iOelVIlHYuDHjzafpzFpDN4SDvM93/ug==
------END RSA PRIVATE KEY-----
diff --git a/templates/elastic-certs/devnso-certs/devnso-elastic-stack-filebeat/devnso-elastic-stack-filebeat.pkcs8.key b/templates/elastic-certs/devnso-certs/devnso-elastic-stack-filebeat/devnso-elastic-stack-filebeat.pkcs8.key
deleted file mode 100644
index deee3dc..0000000
--- a/templates/elastic-certs/devnso-certs/devnso-elastic-stack-filebeat/devnso-elastic-stack-filebeat.pkcs8.key
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDOio+bOrWtnZEE
-RJe3nDqTaV6xc+TwcbQLZv4fWZr+tETgbgM44qqflYDMjIcMIqc4f98L1eanYHe8
-nIu0P7Fn6tdUXHAe5mkYhtLQOQrcaATaGy7A920pbJILP4ngrw+5tKJEr1PTxtvT
-kQ8BP/rmIlrFtcYfAuHof3SJLTmf0kRSyEMmTNSGXwxdMkNJDAGjO/vSrCM+pK3r
-QPeFOW0U5+AJl7o5hMi5T6ij+AhudNNRoGeifG9i0OpvPt7DSEev1DQy24n2bLa4
-TZWB5Ru8KMJAMtxx3W+S+m0DmDNIQELSF3JCFKSkGHUT24cgh5uimkFYhgxCUZ5x
-GNch+SmNAgMBAAECggEAZCNU7feAhzz6Rt30yw5BbiAry5B7osIV/2M/eTaqCayg
-KkncYROwku/awxGtFkqk1aVVoHjkPClu1DD4IPuyiUYYgWvR5oFi2gPgKRlG9Uav
-d4mvWNp9gBSGGFMFh7yIvMph1DhHRcnH4eMWKc552GM2rF3twTJWEjHdb/bP1fat
-5i90TE8DZAB4Oj1LgmKenoVQZkV4QJIsE2G+8B9o7Ts1UXrTA7OLbstqZGDCwAZr
-XIjHeZvfHCXE/ca3GrxrBTy8M9rLQHDGllrft3ywLSgrBZg4fVv+9ps/DOfdf4Gs
-+SOLav6xNlvPLIVXNVZlAjpdM1jtu0uqSCqb//+vhwKBgQDTKjr/F08H9Jbv+MdK
-+pMpMtrjE2x2DIgDSzqR6Uo94Q7yfbSBzufWv22qLDUdQCXMhzCjsM2j/hVQWoqe
-z2LYJ2MhtvaWOCVpjaYK4xcU3ZFO4LEd4atW0c2/5A9TG6yMMDTRC9HNcIrB6wb2
-7ltjeYdQXDt28hzCQTwZDdjRmwKBgQD6ZQLTkE/tomRQVi1k38hzTRhdYc2kCO0l
-fphHQqNl3uIxW9oYm6ygbDWrkLU9w7pwu9QZsn+vTarQgQehXhm30jYkMzjmGeyS
-6LbO+aI0aFsMLw4xhU2UbN3iPoq2oWH6pi70g8EZyDuqXeyik3pEP6d03HMuQuXE
-IHNWoPYX9wKBgCmfa12YxJU22wGWMgJPfe5i/c5Ap+Jk+fJcQ8E7EM09rWqS6J+l
-nwEvXnhqmlWXrVuxUh8R3Jb0oFLkZeqDymH88YdVvylBC+7QYuhGdug//EJl+8N+
-Ff3ZAQtP8s1Y6RwA7IhAIiyygEdVAlxuA0mKTOfEJlx9wLlxjl0J47D9AoGBAIU9
-3yUpc/7mHS9KzFkTZB1G9yIp+z3AqkD7fpjc8wowcnkFgab6n/+11VF4bZlyX/HB
-YXpTK/LjB3RwVNkfs9vHdpwIzcxUGzmJsE2vNQtiRKDVIV5kqwXCcMgFs9a/Rd4V
-NINU4RqRHH7qABP7GmLa5IchEAGcA5w8EGQWvx29AoGBALfgpM9G3jmkq2jAkhkU
-UnfLRW/2FjM8+b9apkvB32/roZduPIQTPsuIdeTDNrAlk4S5ABHmonEol5A1PLZh
-LdrsBRGcNHDrfO/VK8EvYUkjO2GcFFe1X0ZD4AS745jX2MoYWJDIKAgXSI56VUiU
-di4MePNp+nMWkM3hIO8z3f+6
------END PRIVATE KEY-----
diff --git a/templates/elastic-certs/devnso-certs/devnso-elastic-stack-logstash-01/devnso-elastic-stack-logstash-01.crt b/templates/elastic-certs/devnso-certs/devnso-elastic-stack-logstash-01/devnso-elastic-stack-logstash-01.crt
deleted file mode 100644
index 582b23d..0000000
--- a/templates/elastic-certs/devnso-certs/devnso-elastic-stack-logstash-01/devnso-elastic-stack-logstash-01.crt
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDdDCCAlygAwIBAgIUNkSt+rcOPg+OEWqWjUkU7rM4uY0wDQYJKoZIhvcNAQEL
-BQAwNDEyMDAGA1UEAxMpRWxhc3RpYyBDZXJ0aWZpY2F0ZSBUb29sIEF1dG9nZW5l
-cmF0ZWQgQ0EwHhcNMjMwNjIzMTczMzE1WhcNMjYwNjIyMTczMzE1WjArMSkwJwYD
-VQQDEyBkZXZuc28tZWxhc3RpYy1zdGFjay1sb2dzdGFzaC0wMTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAJMJOPWORrhCDL0GfCSKjKdeT06o2H9mlgg8
-YfozG5Nc/pr8UQIVelCWaKgyDHG44+OMmGg60nQghny5551Hb3l2SQ58ZyL2hG1W
-To75WxEPh48MDkiIqbUCwbb2LakeLf7ld3SK9qk2bxlNjmWQKgkYWLFcxYru7gjL
-WbauonbrMDX5AO0Hny/aMipkP1zpU7ISgu+3A3x0VPZWE+3p9BYmeuYQuQ5upVcW
-QxXd4m0q8TFPK0UOHi6IcJ5zoAutSGlsmmQ87AkHUDesblbyfwpeJR3HiGP/eO7s
-RVWpakrIe2QM/0YOXxksL/gf2VBIAUldKPHYvo2sqej9U3dJW0kCAwEAAaOBhjCB
-gzAdBgNVHQ4EFgQUVbDWRtL2o2Xc5VJnXAjgK1K5WAgwHwYDVR0jBBgwFoAU19vJ
-5fRMsfUu2HvUWJEQqZ9iqcgwNgYDVR0RBC8wLYIJbG9jYWxob3N0giBkZXZuc28t
-ZWxhc3RpYy1zdGFjay1sb2dzdGFzaC0wMTAJBgNVHRMEAjAAMA0GCSqGSIb3DQEB
-CwUAA4IBAQBY8yQZkb6Aa4MDKxkju5dwI+CYXzZ88nw9tEjrm3PTC1wh9Dx9WE71
-d66CilsN9EvGbLZOkkBGv1VH7S/C4bnYa5INxQ4NGyR2K8IohUuQ/ipDkSaroH6u
-M/Xc6Z5aw7DYa0EY/uQjACv77hvcT1SfYOjk/zZWtLO9IGGp3CRUE/s6liFJBstO
-js5I2eboMVQiM2Usb6SDrC7Tfilk1E+urUq7M9IIdkc3cJWMI9eSzB8me3O3TMqD
-ExlROdSdp8rDk5rR+qHYoIjyyje9a55rOAphoKRq99LIPyrXu5QGvOWcq9iNQJMV
-Wu62AfgjV99LMNyF3NPCzOfmv4EoXWl2
------END CERTIFICATE-----
diff --git a/templates/elastic-certs/devnso-certs/devnso-elastic-stack-logstash-01/devnso-elastic-stack-logstash-01.key b/templates/elastic-certs/devnso-certs/devnso-elastic-stack-logstash-01/devnso-elastic-stack-logstash-01.key
deleted file mode 100644
index 9e2ed77..0000000
--- a/templates/elastic-certs/devnso-certs/devnso-elastic-stack-logstash-01/devnso-elastic-stack-logstash-01.key
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEogIBAAKCAQEAkwk49Y5GuEIMvQZ8JIqMp15PTqjYf2aWCDxh+jMbk1z+mvxR
-AhV6UJZoqDIMcbjj44yYaDrSdCCGfLnnnUdveXZJDnxnIvaEbVZOjvlbEQ+HjwwO
-SIiptQLBtvYtqR4t/uV3dIr2qTZvGU2OZZAqCRhYsVzFiu7uCMtZtq6iduswNfkA
-7QefL9oyKmQ/XOlTshKC77cDfHRU9lYT7en0FiZ65hC5Dm6lVxZDFd3ibSrxMU8r
-RQ4eLohwnnOgC61IaWyaZDzsCQdQN6xuVvJ/Cl4lHceIY/947uxFValqSsh7ZAz/
-Rg5fGSwv+B/ZUEgBSV0o8di+jayp6P1Td0lbSQIDAQABAoIBAAHa4q54+pU3K9MK
-07lXApJXRpReXZtxlRB8v/axzXFwZjvGZ+9f5xCukj87jrLZT/uS142Kg5Vq1lir
-IjCbP+9k93Y0JV/2J5cN+PJleC4MPlvm1Dbf1s0iEnLwcISIqJ5BCBW+7cnxqGaq
-gBKomH6ZGEkTsoS/vXCOdspTezQrpJmlBM7yTElcdJwTcJF4cws303AH8hDQYPT3
-dpnhPgSkaU5LJ5EqaWke6kLmGoIpztD1UbwgZUfML+JrNGXxVAx1C1jEdKkNHOO0
-SsEa7mb2wdRRi1Gjt98g8dVZmI1mG7IWhITup33QgyjlMI5y2dTDOE5NXFPl8hkr
-BOLLEmECgYEAtiB1bt5cyqjgtFwnZBcvVpIvDZhoERDCn5eHsItYNEbAwAdKgeEw
-Hzk/MonNgXZQQWKJLuSgODgHQ1P3u4wea0DAghV7vLruALugCnMvMgl5YZIlP50Q
-ve4rH+idI5/P5e9Cmb7SyxsToIbc4zT+/fI9l+2SgozDJTl8oE3Z3lECgYEAzq0J
-LMGSghjaHkoR+UzR+AIbGPEakbeI9DGMj+LYMnixTeMWieDwztKlPcl85VrDbWlU
-v8NpbTIa9972jvyS/bw+VEb8ocjjk6KmgUqIQr25I2pjk7QRQrrhsKna0o0WWCg8
-zQuNaFiMQWFt280oN6RV31fz5tgq+IDYtu92F3kCgYBMbNB6hqrvi/BHHwiUkroV
-nOBL1zGMP7k72Q1igwavYSVPL4APglx8LbycS4FGG0zQMzYXzG6DSNebZCfntoOp
-RBHERJmY9+QZwKIG4JDkcV9TF020JQe6e6/zAty170EBXuZWt+Giwyj4Sr90RG/g
-Rn+cOmApkkHtY/MtHZ4YEQKBgHd4VyFkFEjYDN4Ney5dVdLDhN56IR2ytpxSOCrE
-uq0ST4vyhYjWWt1zrsl0u5npSabpiHABiePxXt2CKYymPGIoeu9EyazL76HcF9wN
-NY8/FNKAIWe0Y3XriaMRzMiBfjUfrWXqE6gJ56mzpEm24lSnzmv476i1tMFJ2fyF
-mAIhAoGAMmPeRRQwXN8nfRYFlc3MPCpxTbYdtyHWbhn6Bg+LdSSamrWCByHALOTO
-ZzXcAcq14VkNKrcZuGlYz043zpb/kISs56qN1bpUEurcf5jNUGpLLZIkAoTsrtRO
-gBjq4bxcLKN3yBmriA6VJxqn6zdLtHFqqpifRrGewnHb0qciiy0=
------END RSA PRIVATE KEY-----
diff --git a/templates/elastic-certs/devnso-certs/devnso-elastic-stack-logstash-01/devnso-elastic-stack-logstash-01.pkcs8.key b/templates/elastic-certs/devnso-certs/devnso-elastic-stack-logstash-01/devnso-elastic-stack-logstash-01.pkcs8.key
deleted file mode 100644
index dd98000..0000000
--- a/templates/elastic-certs/devnso-certs/devnso-elastic-stack-logstash-01/devnso-elastic-stack-logstash-01.pkcs8.key
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCTCTj1jka4Qgy9
-BnwkioynXk9OqNh/ZpYIPGH6MxuTXP6a/FECFXpQlmioMgxxuOPjjJhoOtJ0IIZ8
-ueedR295dkkOfGci9oRtVk6O+VsRD4ePDA5IiKm1AsG29i2pHi3+5Xd0ivapNm8Z
-TY5lkCoJGFixXMWK7u4Iy1m2rqJ26zA1+QDtB58v2jIqZD9c6VOyEoLvtwN8dFT2
-VhPt6fQWJnrmELkObqVXFkMV3eJtKvExTytFDh4uiHCec6ALrUhpbJpkPOwJB1A3
-rG5W8n8KXiUdx4hj/3ju7EVVqWpKyHtkDP9GDl8ZLC/4H9lQSAFJXSjx2L6NrKno
-/VN3SVtJAgMBAAECggEAAdrirnj6lTcr0wrTuVcCkldGlF5dm3GVEHy/9rHNcXBm
-O8Zn71/nEK6SPzuOstlP+5LXjYqDlWrWWKsiMJs/72T3djQlX/Ynlw348mV4Lgw+
-W+bUNt/WzSIScvBwhIionkEIFb7tyfGoZqqAEqiYfpkYSROyhL+9cI52ylN7NCuk
-maUEzvJMSVx0nBNwkXhzCzfTcAfyENBg9Pd2meE+BKRpTksnkSppaR7qQuYaginO
-0PVRvCBlR8wv4ms0ZfFUDHULWMR0qQ0c47RKwRruZvbB1FGLUaO33yDx1VmYjWYb
-shaEhO6nfdCDKOUwjnLZ1MM4Tk1cU+XyGSsE4ssSYQKBgQC2IHVu3lzKqOC0XCdk
-Fy9Wki8NmGgREMKfl4ewi1g0RsDAB0qB4TAfOT8yic2BdlBBYoku5KA4OAdDU/e7
-jB5rQMCCFXu8uu4Au6AKcy8yCXlhkiU/nRC97isf6J0jn8/l70KZvtLLGxOghtzj
-NP798j2X7ZKCjMMlOXygTdneUQKBgQDOrQkswZKCGNoeShH5TNH4AhsY8RqRt4j0
-MYyP4tgyeLFN4xaJ4PDO0qU9yXzlWsNtaVS/w2ltMhr33vaO/JL9vD5URvyhyOOT
-oqaBSohCvbkjamOTtBFCuuGwqdrSjRZYKDzNC41oWIxBYW3bzSg3pFXfV/Pm2Cr4
-gNi273YXeQKBgExs0HqGqu+L8EcfCJSSuhWc4EvXMYw/uTvZDWKDBq9hJU8vgA+C
-XHwtvJxLgUYbTNAzNhfMboNI15tkJ+e2g6lEEcREmZj35BnAogbgkORxX1MXTbQl
-B7p7r/MC3LXvQQFe5la34aLDKPhKv3REb+BGf5w6YCmSQe1j8y0dnhgRAoGAd3hX
-IWQUSNgM3g17Ll1V0sOE3nohHbK2nFI4KsS6rRJPi/KFiNZa3XOuyXS7melJpumI
-cAGJ4/Fe3YIpjKY8Yih670TJrMvvodwX3A01jz8U0oAhZ7RjdeuJoxHMyIF+NR+t
-ZeoTqAnnqbOkSbbiVKfOa/jvqLW0wUnZ/IWYAiECgYAyY95FFDBc3yd9FgWVzcw8
-KnFNth23IdZuGfoGD4t1JJqatYIHIcAs5M5nNdwByrXhWQ0qtxm4aVjPTjfOlv+Q
-hKznqo3VulQS6tx/mM1QakstkiQChOyu1E6AGOrhvFwso3fIGauIDpUnGqfrN0u0
-cWqqmJ9GsZ7CcdvSpyKLLQ==
------END PRIVATE KEY-----
diff --git a/templates/logstash/config/logstash/pipeline/filebeat.conf.j2 b/templates/logstash/config/logstash/pipeline/filebeat.conf.j2
index 99a0ce7..7dad5c2 100644
--- a/templates/logstash/config/logstash/pipeline/filebeat.conf.j2
+++ b/templates/logstash/config/logstash/pipeline/filebeat.conf.j2
@@ -57,7 +57,7 @@ filter {
 output {
     if [fields][hostname] and [event][dataset] == "system.auth" {
         elasticsearch {
-            hosts => ["https://{{ shared_service_elastic_stack_01_hostname }}:{{ service_port_elasticsearch }}"]
+            hosts => ["https://{{ shared_service_hostname_logging_data }}:{{ service_port_elasticsearch }}"]
             cacert => "/usr/share/logstash/config/certificates/ca/ca.crt"
             user => "{{ elastic_admin_username }}"
             password => "{{ elastic_admin_password }}"
@@ -69,7 +69,7 @@ output {
     }
     else if [event][dataset] == "system.auth" {
         elasticsearch {
-            hosts => ["https://{{ shared_service_elastic_stack_01_hostname }}:{{ service_port_elasticsearch }}"]
+            hosts => ["https://{{ shared_service_hostname_logging_data }}:{{ service_port_elasticsearch }}"]
             cacert => "/usr/share/logstash/config/certificates/ca/ca.crt"
             user => "{{ elastic_admin_username }}"
             password => "{{ elastic_admin_password }}"
@@ -81,7 +81,7 @@ output {
     }
     else if [fields][hostname] and [event][dataset] == "system.syslog" {
         elasticsearch {
-            hosts => ["https://{{ shared_service_elastic_stack_01_hostname }}:{{ service_port_elasticsearch }}"]
+            hosts => ["https://{{ shared_service_hostname_logging_data }}:{{ service_port_elasticsearch }}"]
             cacert => "/usr/share/logstash/config/certificates/ca/ca.crt"
             user => "{{ elastic_admin_username }}"
             password => "{{ elastic_admin_password }}"
@@ -93,7 +93,7 @@ output {
     }
     else if [event][dataset] == "system.syslog" {
         elasticsearch {
-            hosts => ["https://{{ shared_service_elastic_stack_01_hostname }}:{{ service_port_elasticsearch }}"]
+            hosts => ["https://{{ shared_service_hostname_logging_data }}:{{ service_port_elasticsearch }}"]
             cacert => "/usr/share/logstash/config/certificates/ca/ca.crt"
             user => "{{ elastic_admin_username }}"
             password => "{{ elastic_admin_password }}"
@@ -105,7 +105,7 @@ output {
     }
     else if [fields][hostname] and [event][dataset] == "postgresql.log" {
         elasticsearch {
-            hosts => ["https://{{ shared_service_elastic_stack_01_hostname }}:{{ service_port_elasticsearch }}"]
+            hosts => ["https://{{ shared_service_hostname_logging_data }}:{{ service_port_elasticsearch }}"]
             cacert => "/usr/share/logstash/config/certificates/ca/ca.crt"
             user => "{{ elastic_admin_username }}"
             password => "{{ elastic_admin_password }}"
@@ -117,7 +117,7 @@ output {
     }
     else if [fields][hostname] and (([event][dataset] == "mysql.error") or ([event][dataset] == "mysql.slowlog")){
         elasticsearch {
-            hosts => ["https://{{ shared_service_elastic_stack_01_hostname }}:{{ service_port_elasticsearch }}"]
+            hosts => ["https://{{ shared_service_hostname_logging_data }}:{{ service_port_elasticsearch }}"]
             cacert => "/usr/share/logstash/config/certificates/ca/ca.crt"
             user => "{{ elastic_admin_username }}"
             password => "{{ elastic_admin_password }}"
@@ -129,7 +129,7 @@ output {
     }
     else if [fields][harbor] {
         elasticsearch {
-            hosts => ["https://{{ shared_service_elastic_stack_01_hostname }}:{{ service_port_elasticsearch }}"]
+            hosts => ["https://{{ shared_service_hostname_logging_data }}:{{ service_port_elasticsearch }}"]
             cacert => "/usr/share/logstash/config/certificates/ca/ca.crt"
             user => "{{ elastic_admin_username }}"
             password => "{{ elastic_admin_password }}"
@@ -142,7 +142,7 @@ output {
     else if [kubernetes][namespace] {
   	    if [kubernetes][deployment][name] {
             elasticsearch {
-                hosts => ["https://{{ shared_service_elastic_stack_01_hostname }}:{{ service_port_elasticsearch }}"]
+                hosts => ["https://{{ shared_service_hostname_logging_data }}:{{ service_port_elasticsearch }}"]
                 cacert => "/usr/share/logstash/config/certificates/ca/ca.crt"
                 user => "{{ elastic_admin_username }}"
                 password => "{{ elastic_admin_password }}"
@@ -154,7 +154,7 @@ output {
         }
         else if [kubernetes][daemonset][name] {
             elasticsearch {
-                hosts => ["https://{{ shared_service_elastic_stack_01_hostname }}:{{ service_port_elasticsearch }}"]
+                hosts => ["https://{{ shared_service_hostname_logging_data }}:{{ service_port_elasticsearch }}"]
                 cacert => "/usr/share/logstash/config/certificates/ca/ca.crt"
                 user => "{{ elastic_admin_username }}"
                 password => "{{ elastic_admin_password }}"
@@ -166,7 +166,7 @@ output {
         }
         else if [kubernetes][statefulset][name] {
             elasticsearch {
-                hosts => ["https://{{ shared_service_elastic_stack_01_hostname }}:{{ service_port_elasticsearch }}"]
+                hosts => ["https://{{ shared_service_hostname_logging_data }}:{{ service_port_elasticsearch }}"]
                 cacert => "/usr/share/logstash/config/certificates/ca/ca.crt"
                 user => "{{ elastic_admin_username }}"
                 password => "{{ elastic_admin_password }}"
@@ -178,7 +178,7 @@ output {
         }
         else if [kubernetes][container][name] {
             elasticsearch {
-                hosts => ["https://{{ shared_service_elastic_stack_01_hostname }}:{{ service_port_elasticsearch }}"]
+                hosts => ["https://{{ shared_service_hostname_logging_data }}:{{ service_port_elasticsearch }}"]
                 cacert => "/usr/share/logstash/config/certificates/ca/ca.crt"
                 user => "{{ elastic_admin_username }}"
                 password => "{{ elastic_admin_password }}"
@@ -190,7 +190,7 @@ output {
         }
         else {
             elasticsearch {
-                hosts => ["https://{{ shared_service_elastic_stack_01_hostname }}:{{ service_port_elasticsearch }}"]
+                hosts => ["https://{{ shared_service_hostname_logging_data }}:{{ service_port_elasticsearch }}"]
                 cacert => "/usr/share/logstash/config/certificates/ca/ca.crt"
                 user => "{{ elastic_admin_username }}"
                 password => "{{ elastic_admin_password }}"
@@ -203,7 +203,7 @@ output {
     }
     else if [fields][pass_tenant_id] and [container][name] and [@metadata][beat] {
         elasticsearch {
-            hosts => ["https://{{ shared_service_elastic_stack_01_hostname }}:{{ service_port_elasticsearch }}"]
+            hosts => ["https://{{ shared_service_hostname_logging_data }}:{{ service_port_elasticsearch }}"]
             cacert => "/usr/share/logstash/config/certificates/ca/ca.crt"
             user => "{{ elastic_admin_username }}"
             password => "{{ elastic_admin_password }}"
@@ -215,7 +215,7 @@ output {
     }
     else if [container][name] and [@metadata][beat] {
         elasticsearch {
-            hosts => ["https://{{ shared_service_elastic_stack_01_hostname }}:{{ service_port_elasticsearch }}"]
+            hosts => ["https://{{ shared_service_hostname_logging_data }}:{{ service_port_elasticsearch }}"]
             cacert => "/usr/share/logstash/config/certificates/ca/ca.crt"
             user => "{{ elastic_admin_username }}"
             password => "{{ elastic_admin_password }}"
@@ -227,7 +227,7 @@ output {
     }
     else if [@metadata][beat] {
         elasticsearch {
-            hosts => ["https://{{ shared_service_elastic_stack_01_hostname }}:{{ service_port_elasticsearch }}"]
+            hosts => ["https://{{ shared_service_hostname_logging_data }}:{{ service_port_elasticsearch }}"]
             cacert => "/usr/share/logstash/config/certificates/ca/ca.crt"
             user => "{{ elastic_admin_username }}"
             password => "{{ elastic_admin_password }}"
@@ -239,7 +239,7 @@ output {
     }
     else {
         elasticsearch {
-            hosts => ["https://{{ shared_service_elastic_stack_01_hostname }}:{{ service_port_elasticsearch }}"]
+            hosts => ["https://{{ shared_service_hostname_logging_data }}:{{ service_port_elasticsearch }}"]
             cacert => "/usr/share/logstash/config/certificates/ca/ca.crt"
             user => "{{ elastic_admin_username }}"
             password => "{{ elastic_admin_password }}"