diff --git a/.gitignore b/.gitignore
index cb63146..d74ec72 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,4 @@
-**/node_modules
-.now
-.DS_Store
-.idea
-**/.env
-
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-##
-## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore
+# Visual Studio
 
 # User-specific files
 *.rsuser
@@ -37,16 +28,8 @@ bld/
 [Oo]bj/
 [Ll]og/
 [Ll]ogs/
-
-# Visual Studio 2015/2017 cache/options directory
 .vs/
-# Uncomment if you have tasks that create the project's static files in wwwroot
-#wwwroot/
-
-# Visual Studio 2017 auto generated files
 Generated\ Files/
-
-# MSTest test Results
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*
 
@@ -246,14 +229,6 @@ ClientBin/
 *.publishsettings
 orleans.codegen.cs
 
-# Including strong name files can present a security risk
-# (https://github.com/github/gitignore/pull/2483#issue-259490424)
-#*.snk
-
-# Since there are multiple workflows, uncomment next line to ignore bower_components
-# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
-#bower_components/
-
 # RIA/Silverlight projects
 Generated_Code/
 
@@ -308,8 +283,6 @@ node_modules/
 *.dsp
 
 # Visual Studio 6 technical files
-*.ncb
-*.aps
 
 # Visual Studio LightSwitch build output
 **/*.HTMLClient/GeneratedArtifacts
@@ -403,11 +376,234 @@ FodyWeavers.xsd
 # JetBrains Rider
 *.sln.iml
 
-dist/
-deployment/docker/docker-compose-dev.yaml
+### Python ###
+# Byte-compiled / optimized / DLL files
+*.py[cod]
+*$py.class
 
-src/producer/.run/
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# poetry
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+#poetry.lock
+
+# pdm
+#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
+#pdm.lock
+#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
+#   in version control.
+#   https://pdm.fming.dev/#use-with-ide
+.pdm.toml
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# PyCharm
+#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+#.idea/
+
+### Python Patch ###
+# Poetry local configuration file - https://python-poetry.org/docs/configuration/#local-configuration
+poetry.toml
+
+# ruff
+.ruff_cache/
+
+# LSP config files
+pyrightconfig.json
+
+### Rider ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+**/.idea/
+**/.run/
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+### VisualStudioCode ###
+!.vscode/*.code-snippets
+
+# Local History for Visual Studio Code
+
+# Built Visual Studio Code Extensions
+*.vsix
+
+### VisualStudioCode Patch ###
+# Ignore all local history of files
+.history
+.ionide
 
 # Caddy logs
-deployment/docker/optional_reverse_proxy/logs/**
-!deployment/docker/optional_reverse_proxy/logs/.gitkeep
+!**/caddy/logs/.gitkeep
+**/caddy/logs/**
diff --git a/deployment/docker/docker-compose.yaml b/deployment/docker/docker-compose.yaml
index 228792b..968e22d 100644
--- a/deployment/docker/docker-compose.yaml
+++ b/deployment/docker/docker-compose.yaml
@@ -1,4 +1,3 @@
-version: "3.8"
 name: knightcrawler
 
 x-restart: &restart-policy "unless-stopped"
@@ -34,8 +33,7 @@ x-apps: &knightcrawler-app
 services:
   postgres:
     image: postgres:latest
-    env_file:
-      - .env
+    env_file: .env
     environment:
       PGUSER: postgres # needed for healthcheck.
     # # If you need the database to be accessible from outside, please open the below port.
@@ -52,8 +50,7 @@ services:
 
   mongodb:
     image: mongo:latest
-    env_file:
-      - .env
+    env_file: .env
     environment:
       MONGO_INITDB_ROOT_USERNAME: ${MONGODB_USER:?Variable MONGODB_USER not set}
       MONGO_INITDB_ROOT_PASSWORD: ${MONGODB_PASSWORD:?Variable MONGODB_PASSWORD not set}
@@ -88,16 +85,14 @@ services:
     image: gabisonfire/knightcrawler-producer:latest
     labels:
       logging: "promtail"
-    env_file:
-      - .env
+    env_file: .env
     <<: *knightcrawler-app
     networks:
       - knightcrawler-network
 
   consumer:
     image: gabisonfire/knightcrawler-consumer:latest
-    env_file:
-      - .env
+    env_file: .env
     labels:
       logging: "promtail"
     deploy:
@@ -108,8 +103,7 @@ services:
 
   metadata:
     image: gabisonfire/knightcrawler-metadata:latest
-    env_file:
-      - .env
+    env_file: .env
     labels:
       logging: "promtail"
     restart: no
@@ -118,8 +112,7 @@ services:
 
   addon:
     <<: *knightcrawler-app
-    env_file:
-      - .env
+    env_file: .env
     hostname: knightcrawler-addon
     image: gabisonfire/knightcrawler-addon:latest
     labels:
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/optional-services/caddy/logs/.gitkeep b/deployment/docker/optional-services/caddy/logs/.gitkeep
new file mode 100644
index 0000000..6f38ea3
--- /dev/null
+++ b/deployment/docker/optional-services/caddy/logs/.gitkeep
@@ -0,0 +1 @@
+# Placeholder to ensure directory is created on git clones
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.yaml
similarity index 100%
rename from deployment/docker/example_cloudflare_tunnel/docker-compose.yml
rename to deployment/docker/optional-services/cloudflare-tunnel/docker-compose.yaml
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.yaml
similarity index 98%
rename from deployment/docker/optional_metrics/docker-compose.yml
rename to deployment/docker/optional-services/grafana-metrics/docker-compose.yaml
index d209a55..f2ff8c6 100644
--- a/deployment/docker/optional_metrics/docker-compose.yml
+++ b/deployment/docker/optional-services/grafana-metrics/docker-compose.yaml
@@ -39,8 +39,7 @@ services:
       - grafana-data:/var/lib/grafana
 
   postgres-exporter:
-    env_file:
-      - ../.env
+    env_file: ${PWD}/../../env
     environment:
       DATA_SOURCE_NAME: "postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}?sslmode=disable"
     image: prometheuscommunity/postgres-exporter
@@ -48,18 +47,18 @@ services:
       - knightcrawler-network
 
   promtail:
-    image: grafana/promtail:2.9.4
-    volumes:
-      - ./config/promtail/config.yml:/etc/promtail/config.yml
-      - /var/lib/docker/containers:/var/lib/docker/containers:ro
-      - /var/run/docker.sock:/var/run/docker.sock
     command:
       - '-config.file=/etc/promtail/config.yml'
     depends_on:
       - prometheus
       - loki
+    image: grafana/promtail:2.9.4
     networks:
       - knightcrawler-network
+    volumes:
+      - ./config/promtail/config.yml:/etc/promtail/config.yml
+      - /var/lib/docker/containers:/var/lib/docker/containers:ro
+      - /var/run/docker.sock:/var/run/docker.sock
 
 
   loki:
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