diff --git a/config/deploy.beta.yml b/config/deploy.beta.yml
index c6a817bcc..9720dd8db 100644
--- a/config/deploy.beta.yml
+++ b/config/deploy.beta.yml
@@ -27,10 +27,12 @@ accessories:
         - BASECAMP_REGISTRY_PASSWORD
     options:
       user: 1000 # Match the UID of the Rails app, for volume permissions
+      publish:
+        - 5001:5001
+        - 9000:9000
     volumes:
       - fizzy:/home/beamer
     cmd: beamer run --retention=1h --metrics-port=9000
-    port: 5001:5001
     hosts:
       - fizzy-beta-app-01
       - fizzy-beta-app-101
diff --git a/config/deploy.production.yml b/config/deploy.production.yml
index 186af0a2f..b7b755479 100644
--- a/config/deploy.production.yml
+++ b/config/deploy.production.yml
@@ -27,10 +27,12 @@ accessories:
         - BASECAMP_REGISTRY_PASSWORD
     options:
       user: 1000 # Match the UID of the Rails app, for volume permissions
+      publish:
+        - 5001:5001
+        - 9000:9000
     volumes:
       - fizzy:/home/beamer
     cmd: beamer run --retention=1h --metrics-port=9000
-    port: 5001:5001
     hosts:
       - fizzy-app-101
       - fizzy-app-102
diff --git a/config/deploy.staging.yml b/config/deploy.staging.yml
index 5f577d830..c0b6502e4 100644
--- a/config/deploy.staging.yml
+++ b/config/deploy.staging.yml
@@ -27,10 +27,12 @@ accessories:
         - BASECAMP_REGISTRY_PASSWORD
     options:
       user: 1000 # Match the UID of the Rails app, for volume permissions
+      publish:
+        - 5001:5001
+        - 9000:9000
     volumes:
       - fizzy:/home/beamer
     cmd: beamer run --retention=1h --metrics-port=9000
-    port: 5001:5001
     hosts:
       - fizzy-staging-app-01
       - fizzy-staging-app-101
diff --git a/config/otel_collector.yml b/config/otel_collector.yml
index 4e1ac5ead..38ad41224 100644
--- a/config/otel_collector.yml
+++ b/config/otel_collector.yml
@@ -8,12 +8,12 @@ receivers:
             - host: unix:///var/run/docker.sock
               refresh_interval: 10s
           relabel_configs:
-            # Limit scraping to labeled containers with port 9394 exposed
+            # Limit scraping to labeled containers with port 9394 or 9000 exposed
             - source_labels: [__address__]
-              regex: .*:9394
+              regex: .*:(9394|9000)
               action: keep
             - source_labels: [__meta_docker_container_name]
-              regex: (/fizzy-(web|jobs)-.*|/kamal-proxy)
+              regex: (/fizzy-(web|jobs)-.*|/fizzy-beamer|/kamal-proxy)
               action: keep
 
             # Pull service and role from Kamal Docker labels
@@ -23,14 +23,20 @@ receivers:
               target_label: role
 
             - source_labels: [__meta_docker_container_name]
-              regex: ^/kamal-proxy$
+              regex: ^/(kamal-proxy|fizzy-beamer)$
               target_label: service
-              replacement: kamal-proxy
+              replacement: $1
+
             - source_labels: [__meta_docker_container_name]
               regex: ^/kamal-proxy$
               target_label: role
               replacement: proxy
 
+            - source_labels: [__meta_docker_container_name]
+              regex: ^/fizzy-beamer$
+              target_label: role
+              replacement: beamer
+
 exporters:
   prometheus:
     endpoint: 0.0.0.0:9394