diff --git a/nginx/conf.d_templates/caddy.conf.conf b/nginx/conf.d_templates/caddy.conf.conf
index d3829d0be1..d15a4e2608 100644
--- a/nginx/conf.d_templates/caddy.conf.conf
+++ b/nginx/conf.d_templates/caddy.conf.conf
@@ -7,8 +7,8 @@ server {
     server_name ${METRICS_HOSTNAME};
     access_log /var/log/nginx/caddy-public.log;
 
-    ssl_certificate /etc/nginx/certs/${METRICS_HOSTNAME}.crt;
-    ssl_certificate_key /etc/nginx/certs/${METRICS_HOSTNAME}.key;
+    ssl_certificate /etc/nginx/certs/caddy/caddy.crt;
+    ssl_certificate_key /etc/nginx/certs/caddy/caddy.key;
     include ssl/ssl-params.conf;
 
     location / {
diff --git a/nginx/conf.d_templates/es.conf.conf.conf b/nginx/conf.d_templates/es.conf.conf.conf
index 44cb16f8b2..c2451b25d5 100644
--- a/nginx/conf.d_templates/es.conf.conf.conf
+++ b/nginx/conf.d_templates/es.conf.conf.conf
@@ -7,8 +7,8 @@ server {
     server_name ${METRICS_HOSTNAME};
     access_log /var/log/nginx/es-public.log;
 
-    ssl_certificate /etc/nginx/certs/${METRICS_HOSTNAME}.crt;
-    ssl_certificate_key /etc/nginx/certs/${METRICS_HOSTNAME}.key;
+    ssl_certificate /etc/nginx/certs/elasticsearch/elasticsearch.crt;
+    ssl_certificate_key /etc/nginx/certs/elasticsearch/elasticsearch.key;
     include ssl/ssl-params.conf;
 
 #    # Deny Nodes Shutdown API
diff --git a/nginx/conf.d_templates/kibana.conf.conf b/nginx/conf.d_templates/kibana.conf.conf
index f8c3c7559d..cd8556f678 100644
--- a/nginx/conf.d_templates/kibana.conf.conf
+++ b/nginx/conf.d_templates/kibana.conf.conf
@@ -7,8 +7,8 @@ server {
     server_name ${METRICS_HOSTNAME};
     access_log /var/log/nginx/kibana-public.log;
 
-    ssl_certificate /etc/nginx/certs/${METRICS_HOSTNAME}.crt;
-    ssl_certificate_key /etc/nginx/certs/${METRICS_HOSTNAME}.key;
+    ssl_certificate /etc/nginx/certs/kibana/kibana.crt;
+    ssl_certificate_key /etc/nginx/certs/kibana/kibana.key;
     include ssl/ssl-params.conf;
 
     location / {
diff --git a/nginx/conf.d_templates/logstash.conf.conf b/nginx/conf.d_templates/logstash.conf.conf
index eaba200aef..13792a4ffc 100644
--- a/nginx/conf.d_templates/logstash.conf.conf
+++ b/nginx/conf.d_templates/logstash.conf.conf
@@ -7,8 +7,8 @@ server {
     server_name ${METRICS_HOSTNAME};
     access_log /var/log/nginx/logstash-public.log;
 
-    ssl_certificate /etc/nginx/certs/${METRICS_HOSTNAME}.crt;
-    ssl_certificate_key /etc/nginx/certs/${METRICS_HOSTNAME}.key;
+    ssl_certificate /etc/nginx/certs/logstash/logstash.crt;
+    ssl_certificate_key /etc/nginx/certs/logstash/logstash.key;
     include ssl/ssl-params.conf;
 
     location / {
diff --git a/self-cert/.dockerignore b/self-cert/.dockerignore
deleted file mode 100644
index d39391a242..0000000000
--- a/self-cert/.dockerignore
+++ /dev/null
@@ -1,6 +0,0 @@
-# Ignore Docker build files
-Dockerfile
-.dockerignore
-
-# Ignore OS artifacts
-**/.DS_Store
\ No newline at end of file
diff --git a/self-cert/Dockerfile b/self-cert/Dockerfile
deleted file mode 100644
index 7a2f19f571..0000000000
--- a/self-cert/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM alpine:3.14
-
-RUN apk update && apk add --no-cache openssl
\ No newline at end of file
diff --git a/tls/instances.yml b/tls/instances.yml
index a7fdf21ad3..2d9f7cf398 100644
--- a/tls/instances.yml
+++ b/tls/instances.yml
@@ -21,6 +21,22 @@ instances:
   - 127.0.0.1
   - ::1
 
+- name: logstash
+  dns:
+  - logstash
+  - localhost
+  ip:
+  - 127.0.0.1
+  - ::1
+
+- name: caddy
+  dns:
+  - caddy
+  - localhost
+  ip:
+  - 127.0.0.1
+  - ::1
+
 - name: fleet-server
   dns:
   - fleet-server