diff --git a/deployment/docker/optional_reverse_proxy/configs/Caddyfile b/deployment/docker/optional-services/caddy/configs/Caddyfile
similarity index 100%
rename from deployment/docker/optional_reverse_proxy/configs/Caddyfile
rename to deployment/docker/optional-services/caddy/configs/Caddyfile
diff --git a/deployment/docker/optional_reverse_proxy/configs/snippets/cloudflare-replace-X-Forwarded-For b/deployment/docker/optional-services/caddy/configs/snippets/cloudflare-replace-X-Forwarded-For
similarity index 100%
rename from deployment/docker/optional_reverse_proxy/configs/snippets/cloudflare-replace-X-Forwarded-For
rename to deployment/docker/optional-services/caddy/configs/snippets/cloudflare-replace-X-Forwarded-For
diff --git a/deployment/docker/optional_reverse_proxy/docker-compose.yaml b/deployment/docker/optional-services/caddy/docker-compose.yaml
similarity index 100%
rename from deployment/docker/optional_reverse_proxy/docker-compose.yaml
rename to deployment/docker/optional-services/caddy/docker-compose.yaml
diff --git a/deployment/docker/example_cloudflare_tunnel/.env.example b/deployment/docker/optional-services/cloudflare-tunnel/.env.example
similarity index 100%
rename from deployment/docker/example_cloudflare_tunnel/.env.example
rename to deployment/docker/optional-services/cloudflare-tunnel/.env.example
diff --git a/deployment/docker/example_cloudflare_tunnel/docker-compose.yml b/deployment/docker/optional-services/cloudflare-tunnel/docker-compose.yml
similarity index 100%
rename from deployment/docker/example_cloudflare_tunnel/docker-compose.yml
rename to deployment/docker/optional-services/cloudflare-tunnel/docker-compose.yml
diff --git a/deployment/docker/optional_metrics/config/grafana/dashboards/dashboards.yml b/deployment/docker/optional-services/grafana-metrics/config/grafana/dashboards/dashboards.yml
similarity index 100%
rename from deployment/docker/optional_metrics/config/grafana/dashboards/dashboards.yml
rename to deployment/docker/optional-services/grafana-metrics/config/grafana/dashboards/dashboards.yml
diff --git a/deployment/docker/optional_metrics/config/grafana/dashboards/logs.json b/deployment/docker/optional-services/grafana-metrics/config/grafana/dashboards/logs.json
similarity index 100%
rename from deployment/docker/optional_metrics/config/grafana/dashboards/logs.json
rename to deployment/docker/optional-services/grafana-metrics/config/grafana/dashboards/logs.json
diff --git a/deployment/docker/optional_metrics/config/grafana/datasources/loki-datasource.yml b/deployment/docker/optional-services/grafana-metrics/config/grafana/datasources/loki-datasource.yml
similarity index 100%
rename from deployment/docker/optional_metrics/config/grafana/datasources/loki-datasource.yml
rename to deployment/docker/optional-services/grafana-metrics/config/grafana/datasources/loki-datasource.yml
diff --git a/deployment/docker/optional_metrics/config/grafana/datasources/prometheus-datasource.yml b/deployment/docker/optional-services/grafana-metrics/config/grafana/datasources/prometheus-datasource.yml
similarity index 100%
rename from deployment/docker/optional_metrics/config/grafana/datasources/prometheus-datasource.yml
rename to deployment/docker/optional-services/grafana-metrics/config/grafana/datasources/prometheus-datasource.yml
diff --git a/deployment/docker/optional_metrics/config/loki/config.yml b/deployment/docker/optional-services/grafana-metrics/config/loki/config.yml
similarity index 100%
rename from deployment/docker/optional_metrics/config/loki/config.yml
rename to deployment/docker/optional-services/grafana-metrics/config/loki/config.yml
diff --git a/deployment/docker/optional_metrics/config/prometheus/config.yml b/deployment/docker/optional-services/grafana-metrics/config/prometheus/config.yml
similarity index 100%
rename from deployment/docker/optional_metrics/config/prometheus/config.yml
rename to deployment/docker/optional-services/grafana-metrics/config/prometheus/config.yml
diff --git a/deployment/docker/optional_metrics/config/promtail/config.yml b/deployment/docker/optional-services/grafana-metrics/config/promtail/config.yml
similarity index 100%
rename from deployment/docker/optional_metrics/config/promtail/config.yml
rename to deployment/docker/optional-services/grafana-metrics/config/promtail/config.yml
diff --git a/deployment/docker/optional_metrics/docker-compose.yml b/deployment/docker/optional-services/grafana-metrics/docker-compose.yml
similarity index 100%
rename from deployment/docker/optional_metrics/docker-compose.yml
rename to deployment/docker/optional-services/grafana-metrics/docker-compose.yml
diff --git a/deployment/docker/optional_reverse_proxy/logs/.gitkeep b/deployment/docker/optional_reverse_proxy/logs/.gitkeep
deleted file mode 100644
index e69de29..0000000