diff --git a/.env.gpg b/.env.gpg
index e086d1f30f39097f9d1b83fec37a517aaf0083b7..047bb18656ee1820b493391407c0a7b4256155c4 100644
Binary files a/.env.gpg and b/.env.gpg differ
diff --git a/.gitignore b/.gitignore
index 0505acedb5d7b7aa884f8de3d73f28da170171dc..c9f23279a178554e2bc180058a67b9f20fd0ac8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,3 +65,4 @@ grafana_data
 /nginx/vhost.d/prom.signalboost.info
 /splash/.env.dev
 /signald/jmx/jmxremote.password
+/nginx/vhost.d/signald.signalboost.info
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
index 4535b3d8989d3e389ab923480957bb1d72142538..c5faf3960bb8bb85ead98d7a62939b490f56b8c3 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@@ -43,9 +43,11 @@ services:
     image: signald
     container_name: signalboost_signald
     environment:
-      SIGNALD_VERBOSE_LOG: "${SIGNALD_VERBOSE_LOG:-0}"
+      SIGNALD_VERBOSE_LOG: ${SIGNALD_VERBOSE_LOG:-0}
     networks:
       - default
+    expose:
+      - ${SIGNALD_PORT}
     ports:
       - 9010:9010
     volumes:
@@ -64,12 +66,12 @@ services:
     entrypoint: /signalboost/bin/entrypoint/app
     env_file: .env.dev
     environment:
-      SIGNALBOOST_VERBOSE_LOG: "${SIGNALBOOST_VERBOSE_LOG:-0}"
-      PROJECT_ROOT: "$PWD"
-      NODE_ENV: "${NODE_ENV:-development}"
-      DEFAULT_LANGUAGE: "${DEFAULT_LANGUAGE:-EN}"
-    ports:
-      - 3000:3000
+      SIGNALBOOST_VERBOSE_LOG: ${SIGNALBOOST_VERBOSE_LOG:-0}
+      PROJECT_ROOT: ${PWD}
+      NODE_ENV: ${NODE_ENV:-development}
+      DEFAULT_LANGUAGE: ${DEFAULT_LANGUAGE:-EN}
+    expose:
+      - ${SIGNALBOOST_PORT}
     networks:
       - default
     volumes:
diff --git a/docker-compose.yml b/docker-compose.yml
index e082427930cd08a25c6a4a08e8a362efedfe47bf..69136bd8de02a0f4ce641678d653ad1c20ae20a8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -35,6 +35,9 @@ services:
     image: signald
     container_name: signalboost_signald
     environment:
+      VIRTUAL_HOST: ${SIGNALD_HOST_URL}
+      VIRTUAL_PORT: ${SIGNALD_PORT}
+      LETSENCRYPT_HOST: ${SIGNALD_HOST_URL}
       SIGNALBOOST_HOST_IP: ${SIGNALBOOST_HOST_IP}
       SIGNALD_VERBOSE_LOG: ${SIGNALD_VERBOSE_LOG:-0}
     ports:
@@ -59,12 +62,15 @@ services:
     entrypoint: /signalboost/bin/entrypoint/app
     env_file: .env
     environment:
-      SIGNALBOOST_VERBOSE_LOG: "${SIGNALBOOST_VERBOSE_LOG:-1}"
-      PROJECT_ROOT: "$PWD"
-      DEFAULT_LANGUAGE: "${DEFAULT_LANGUAGE:-EN}"
+      VIRTUAL_HOST: ${SIGNALBOOST_HOST_URL}
+      VIRTUAL_PORT: ${SIGNALBOOST_PORT}
+      LETSENCRYPT_HOST: ${SIGNALBOOST_HOST_URL}
+      SIGNALBOOST_VERBOSE_LOG: ${SIGNALBOOST_VERBOSE_LOG:-1}
+      PROJECT_ROOT: $PWD
+      DEFAULT_LANGUAGE: ${DEFAULT_LANGUAGE:-EN}
       NODE_ENV: production
-    ports:
-      - 3000:3000
+    expose:
+      - ${SIGNALBOOST_PORT}
     networks:
       - proxy-tier
       - default
diff --git a/docker/signald.dockerfile b/docker/signald.dockerfile
index 53c48bdd99dd16473b8c634b359fdd2cd18ea306..e4789be68a1024ca3c6505381831aa20560f5148 100644
--- a/docker/signald.dockerfile
+++ b/docker/signald.dockerfile
@@ -83,7 +83,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y sudo
 # fork currently running on prod ---v
 ENV REPO_URL "https://0xacab.org/team-friendo/signald-fork.git"
 ENV BRANCH "master"
-ENV COMMIT_HASH "02d1e75b0053dd9ec021759cc5e458bd5c1112e5"
+ENV COMMIT_HASH "0ece4970980a5f4d768339fbe067baa6cc6f62a0"
 
 # fetch repo at desired commit
 RUN git init && \
diff --git a/keyrings/live/blackbox-files.txt b/keyrings/live/blackbox-files.txt
index 3116f1c5a94cba0f53aa2b79a967753081ec5588..aad28f333730c5302684024d816cef145adff119 100644
--- a/keyrings/live/blackbox-files.txt
+++ b/keyrings/live/blackbox-files.txt
@@ -13,6 +13,7 @@ grafana/config/grafana.ini
 nginx/vhost.d/loki.signalboost.info
 nginx/vhost.d/metrics.signalboost.info
 nginx/vhost.d/prom.signalboost.info
+nginx/vhost.d/signald.signalboost.info
 prometheus/prometheus_dev.yml
 prometheus/prometheus_prod.yml
 signald/jmx/jmxremote.password
diff --git a/nginx/vhost.d/signald.signalboost.info.gpg b/nginx/vhost.d/signald.signalboost.info.gpg
new file mode 100644
index 0000000000000000000000000000000000000000..88f4e10ed7e8663b0c4f96dfad68486e874bb4d3
Binary files /dev/null and b/nginx/vhost.d/signald.signalboost.info.gpg differ
diff --git a/prometheus/prometheus_dev.yml.gpg b/prometheus/prometheus_dev.yml.gpg
index f9e09af7bf449bdc1f154b586c42d99388332c97..55f6ba19c2c6d817d8c386895562c0953d71d6be 100644
Binary files a/prometheus/prometheus_dev.yml.gpg and b/prometheus/prometheus_dev.yml.gpg differ
diff --git a/prometheus/prometheus_prod.yml.gpg b/prometheus/prometheus_prod.yml.gpg
index cebcba1915f7cccdbb5ef54eea6458aecd21fed2..1e68fa701c9d1e8bf6743968c31f0a03ac6ffe26 100644
Binary files a/prometheus/prometheus_prod.yml.gpg and b/prometheus/prometheus_prod.yml.gpg differ