diff --git a/k8s/matrix/config-janky.bot/homeserver.yaml b/k8s/matrix/config-janky.bot/homeserver.yaml
index 249f3ef..b5d7a59 100644
--- a/k8s/matrix/config-janky.bot/homeserver.yaml
+++ b/k8s/matrix/config-janky.bot/homeserver.yaml
@@ -9,10 +9,8 @@ listeners:
       - names: [client, federation]
         compress: false
   - port: 8000
-    type: http
-    bind_addresses: ['0.0.0.0']
-    resources:
-      - names: [metrics]
+    type: metrics
+enable_metrics: true
 database:
   name: sqlite3
   args:
diff --git a/k8s/matrix/config-janky.solutions/homeserver.yaml b/k8s/matrix/config-janky.solutions/homeserver.yaml
index 13e630e..5db5058 100644
--- a/k8s/matrix/config-janky.solutions/homeserver.yaml
+++ b/k8s/matrix/config-janky.solutions/homeserver.yaml
@@ -9,10 +9,8 @@ listeners:
       - names: [client, federation]
         compress: false
   - port: 8000
-    type: http
-    bind_addresses: ['0.0.0.0']
-    resources:
-      - names: [metrics]
+    type: metrics
+enable_metrics: true
 database:
   name: psycopg2
   args:
@@ -22,7 +20,6 @@ log_config: "/config/log.yaml"
 media_store_path: /data/media_store
 registration_shared_secret: "SECRET_registration_shared_secret"
 report_stats: false
-macaroon_secret_key: "SECRET_macaroon_secret_key"
 form_secret: "SECRET_form_secret"
 signing_key_path: "/secrets/janky.solutions.signing.key"
 trusted_key_servers:
diff --git a/k8s/monitoring/prom-scrape-configs/scrape-configs.yaml b/k8s/monitoring/prom-scrape-configs/scrape-configs.yaml
index 6f69cc8..2b91785 100644
--- a/k8s/monitoring/prom-scrape-configs/scrape-configs.yaml
+++ b/k8s/monitoring/prom-scrape-configs/scrape-configs.yaml
@@ -61,7 +61,6 @@
       - hypervisor-d:9080
       - http:9080
       - media-ingest:9080
-      - matrix:9080
       - minio:9080
       - signald:9080
       - forgejo-runner-0:9080
@@ -90,7 +89,6 @@
       - http:9100
       - ubnt:9100
       - mx1.janky.email:9100
-      - matrix:9100
       - dns:9100
       - hypervisor-d:9100
       - livingroom-tv:9100
@@ -171,7 +169,4 @@
   static_configs:
     - targets:
       - docker:9798
-- job_name: synapse
-  metrics_path: /_synapse/metrics
-  static_configs:
-    - targets: [matrix:8009]
+