diff --git a/hosts/endurance/default.nix b/hosts/endurance/default.nix
index cbb7aca..74abadf 100644
--- a/hosts/endurance/default.nix
+++ b/hosts/endurance/default.nix
@@ -9,7 +9,6 @@
     inputs.flatpak.nixosModules.nix-flatpak
     ./hardware.nix
     ./disko.nix
-    ./metrics.nix
   ];
 
   bosun = {
@@ -92,24 +91,8 @@
     '';
     udev.packages = [pkgs.platformio-core.udev];
 
-    beszel-agent.enable = true;
-    beszel-agent.key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMkUPOw28Cu2LMuzfmvjT/L2ToNHcADwGyGvSpJ4wH2T";
     elements.ollama.enable = true;
 
-    # waka-victoriametrics = {
-    #   enable = true;
-    #   listenAddress = "127.0.0.1:8080";
-    #   victoriametrics.url = "http://localhost:8428/api/v1/write";
-    #   metrics.labels = [
-    #     "project"
-    #     "language"
-    #     "editor"
-    #     "branch"
-    #     "category"
-    #     "operating_system"
-    #   ];
-    # };
-
     usbmuxd = {
       enable = true;
       package = pkgs.usbmuxd2;
diff --git a/hosts/endurance/metrics.nix b/hosts/endurance/metrics.nix
deleted file mode 100644
index 36c3bb7..0000000
--- a/hosts/endurance/metrics.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  inputs,
-  config,
-  pkgs,
-  ...
-}: {
-  bosun.secrets.victoriametricsEnvFile = "victoria.env.age";
-
-  services = {
-    telegraf = {
-      enable = true;
-      environmentFiles = [
-        # This defines the VICTORIAMETRICS_PASSWORD environment variable
-        config.age.secrets.victoriametricsEnvFile.path
-      ];
-      extraConfig = {
-        inputs = {
-          http_response = [
-            {
-              urls = ["https://toph.so" "https://aleph.garden" "https://aph.gdn" "https://radicle.toph.so"];
-            }
-          ];
-          internet_speed = [
-            {
-              interval = "60m";
-            }
-          ];
-        };
-        outputs.influxdb = [
-          {
-            urls = ["https://vm.toph.so"];
-            database = "toph";
-            username = "victoria-with-the-secrets";
-            password = "\${VICTORIAMETRICS_PASSWORD}";
-            skip_database_creation = false;
-            exclude_retention_policy_tag = true;
-            content_encoding = "gzip";
-          }
-        ];
-      };
-    };
-  };
-}
diff --git a/modules/nixos/services/metrics.nix b/modules/nixos/services/metrics.nix
index 52a087c..80d5a86 100644
--- a/modules/nixos/services/metrics.nix
+++ b/modules/nixos/services/metrics.nix
@@ -8,6 +8,11 @@
       node = {
         enable = true;
         port = 9000;
+
+        enabledCollectors = [
+          "systemd"
+          "swap"
+        ];
       };
       # tailscale = {
       #   enable = true;
diff --git a/secrets/rekeyed/endurance/744ad1a7e324b40d0805e2ef82d8fc5a-victoriametricsEnvFile.age b/secrets/rekeyed/endurance/744ad1a7e324b40d0805e2ef82d8fc5a-victoriametricsEnvFile.age
deleted file mode 100644
index f682732..0000000
--- a/secrets/rekeyed/endurance/744ad1a7e324b40d0805e2ef82d8fc5a-victoriametricsEnvFile.age
+++ /dev/null
@@ -1,7 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 /u/eYA BvO3LN0SaFuuw7V5V+qRkAKFtW+ASCtMEo+HBOnccRk
-2tdN2DqV/NKLX00LBp012xqimkBCdbZBFPXoQOWDqKc
--> ig7-grease 0X s
-I8yjO2SGIHc0WeWWDQ51XA
---- ADjzRKqqYst1LvYy8n4DsZnHLiBFv+r+H+NdiHJ8V64
-?¬´~<cô¨ÄmUP”æå³Ñ(ÊnÉq�?“×p°ï�RµVÒJt?Ù%Å´Ëhg,žó�‘À±éCÓ-
wÓÄšnÊšNa¹‰9�“¹|Fz_ß'jíÂ’�`�lœâî*Z1åBP¾"búá‘ò/ñôÒΓWærßa¥ïÓÞ¾"Œy?Ö$¸‰„,jÞn#¯ŒÎ;îw…óí[ŽËɳœ
\ No newline at end of file
diff --git a/secrets/rekeyed/toph.aepplet/36cddc7069dace3a45c54e3c41272528-config.age b/secrets/rekeyed/toph.aepplet/36cddc7069dace3a45c54e3c41272528-config.age
deleted file mode 100644
index 43f6050..0000000
Binary files a/secrets/rekeyed/toph.aepplet/36cddc7069dace3a45c54e3c41272528-config.age and /dev/null differ
diff --git a/secrets/rekeyed/toph.aepplet/8557eb9e3b4043fdf9b0d1dc975f29d7-config.age b/secrets/rekeyed/toph.aepplet/8557eb9e3b4043fdf9b0d1dc975f29d7-config.age
new file mode 100644
index 0000000..d8e1392
Binary files /dev/null and b/secrets/rekeyed/toph.aepplet/8557eb9e3b4043fdf9b0d1dc975f29d7-config.age differ
diff --git a/secrets/rekeyed/toph.endurance/36cddc7069dace3a45c54e3c41272528-config.age b/secrets/rekeyed/toph.endurance/36cddc7069dace3a45c54e3c41272528-config.age
deleted file mode 100644
index 4a681bf..0000000
Binary files a/secrets/rekeyed/toph.endurance/36cddc7069dace3a45c54e3c41272528-config.age and /dev/null differ
diff --git a/secrets/rekeyed/toph.endurance/8557eb9e3b4043fdf9b0d1dc975f29d7-config.age b/secrets/rekeyed/toph.endurance/8557eb9e3b4043fdf9b0d1dc975f29d7-config.age
new file mode 100644
index 0000000..b4dcaed
Binary files /dev/null and b/secrets/rekeyed/toph.endurance/8557eb9e3b4043fdf9b0d1dc975f29d7-config.age differ
diff --git a/secrets/ssh/config.age b/secrets/ssh/config.age
index 3fa5b7e..3ca7691 100644
Binary files a/secrets/ssh/config.age and b/secrets/ssh/config.age differ
diff --git a/secrets/victoria-password.age b/secrets/victoria-password.age
deleted file mode 100644
index 60d7d55..0000000
Binary files a/secrets/victoria-password.age and /dev/null differ
diff --git a/secrets/victoria.env.age b/secrets/victoria.env.age
deleted file mode 100644
index c963a05..0000000
Binary files a/secrets/victoria.env.age and /dev/null differ