S.M.A.R.T support (#614 )

* add agent smart support * refactor(system): update JSON tags in SmartData struct * refactor(agent): use serial number as the key of SmartDataMap Updated the SmartManager's methods to use the device's serial number as the key in the SmartDataMap instead of the device name. * refactor: use raw values in smart attributes for nvme devices * feat: add S.M.A.R.T. data display in web ui Introduced a new Disks tab in the SystemDetail component to display disk information and S.M.A.R.T. data. The tab includes a table for visualizing disk attributes and their statuses. Also added SmartData and SmartAttribute interfaces to support the new functionality.
2026-03-22 05:36:15 +01:00 · 2025-10-24 09:49:04 -04:00
134 changed files with 5818 additions and 13698 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,19 +1,8 @@
 name: 🐛 Bug report
 description: Report a new bug or issue.
 title: '[Bug]: '
-labels: ['bug', "needs confirmation"]
+labels: ['bug']
 body:
-  - type: dropdown
-    id: component
-    attributes:
-      label: Component
-      description: Which part of Beszel is this about?
-      options:
-        - Hub
-        - Agent
-        - Hub & Agent
-    validations:
-      required: true
  - type: markdown
    attributes:
      value: |
@@ -54,39 +43,6 @@ body:
        3. Pour it into a cup.
    validations:
      required: true
-  - type: dropdown
-    id: category
-    attributes:
-      label: Category
-      description: Which category does this relate to most?
-      options:
-        - Metrics
-        - Charts & Visualization
-        - Settings & Configuration
-        - Notifications & Alerts
-        - Authentication
-        - Installation
-        - Performance
-        - UI / UX
-        - Other
-    validations:
-      required: true
-  - type: dropdown
-    id: metrics
-    attributes:
-      label: Affected Metrics
-      description: If applicable, which specific metric does this relate to most?
-      options:
-        - CPU
-        - Memory
-        - Storage
-        - Network
-        - Containers
-        - GPU
-        - Sensors
-        - Other
-    validations:
-      required: true
  - type: input
    id: system
    attributes:
@@ -105,6 +61,7 @@ body:
    id: install-method
    attributes:
      label: Installation method
+      default: 0
      options:
        - Docker
        - Binary
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,19 +1,8 @@
 name: 🚀 Feature request
 description: Request a new feature or change.
 title: "[Feature]: "
-labels: ["enhancement", "needs review"]
+labels: ["enhancement"]
 body:
-  - type: dropdown
-    id: component
-    attributes:
-      label: Component
-      description: Which part of Beszel is this about?
-      options:
-        - Hub
-        - Agent
-        - Hub & Agent
-    validations:
-      required: true
  - type: markdown
    attributes:
      value: Before submitting, please search existing [issues](https://github.com/henrygd/beszel/issues) and [discussions](https://github.com/henrygd/beszel/discussions) (including closed).
@@ -22,55 +11,8 @@ body:
      label: Describe the feature you would like to see
    validations:
      required: true
-  - type: textarea
-    id: motivation
-    attributes:
-      label: Motivation / Use Case
-      description: Why do you want this feature? What problem does it solve?
-    validations:
-      required: true
  - type: textarea
    attributes:
      label: Describe how you would like to see this feature implemented
    validations:
      required: true
-  - type: textarea
-    id: logs
-    attributes:
-      label: Screenshots
-      description: Please attach any relevant screenshots, such as images from your current solution or similar implementations.
-    validations:
-      required: false
-  - type: dropdown
-    id: category
-    attributes:
-      label: Category
-      description: Which category does this relate to most?
-      options:
-        - Metrics
-        - Charts & Visualization
-        - Settings & Configuration
-        - Notifications & Alerts
-        - Authentication
-        - Installation
-        - Performance
-        - UI / UX
-        - Other
-    validations:
-      required: true
-  - type: dropdown
-    id: metrics
-    attributes:
-      label: Affected Metrics
-      description: If applicable, which specific metric does this relate to most?
-      options:
-        - CPU
-        - Memory
-        - Storage
-        - Network
-        - Containers
-        - GPU
-        - Sensors
-        - Other
-    validations:
-      required: true
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,33 +0,0 @@
-## 📃 Description
-
-A short description of the pull request changes should go here and the sections below should list in detail all changes. You can remove the sections you don't need.
-
-## 📖 Documentation
-
-Add a link to the PR for [documentation](https://github.com/henrygd/beszel-docs) changes.
-
-## 🪵 Changelog
-
-### ➕ Added
-
- one
- two
-
-### ✏️ Changed
-
- one
- two
-
-### 🔧 Fixed
-
- one
- two
-
-### 🗑️ Removed
-
- one
- two
-
-## 📷 Screenshots
-
-If this PR has any UI/UX changes it's strongly suggested you add screenshots here.
--- a/.github/workflows/docker-images.yml
+++ b/.github/workflows/docker-images.yml
@@ -3,7 +3,7 @@ name: Make docker images
 on:
  push:
    tags:
-      - "v*"
+      - 'v*'

 jobs:
  build:
@@ -65,7 +65,6 @@ jobs:
        with:
          images: ${{ matrix.image }}
          tags: |
-            type=raw,value=edge
            type=semver,pattern={{version}}
            type=semver,pattern={{major}}.{{minor}}
            type=semver,pattern={{major}}
@@ -85,7 +84,7 @@ jobs:
      - name: Build and push Docker image
        uses: docker/build-push-action@v5
        with:
-          context: "${{ matrix.context }}"
+          context: '${{ matrix.context }}'
          file: ${{ matrix.dockerfile }}
          platforms: linux/amd64,linux/arm64,linux/arm/v7
          push: ${{ github.ref_type == 'tag' }}
--- a/.github/workflows/inactivity-actions.yml
+++ b/.github/workflows/inactivity-actions.yml
@@ -1,43 +0,0 @@
-name: 'Issue and PR Maintenance'
-
-on:
-  schedule:
-    - cron: '0 0 * * *'   # runs at midnight UTC
-  workflow_dispatch:
-
-permissions:
-  issues: write
-  pull-requests: write
-
-jobs:
-  close-stale:
-    name: Close Stale Issues
-    runs-on: ubuntu-24.04
-    steps:
-      - name: Close Stale Issues
-        uses: actions/stale@v9
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-
-          # Messaging
-          stale-issue-message: >
-            👋 This issue has been automatically marked as stale due to inactivity.
-            If this issue is still relevant, please comment to keep it open.
-            Without activity, it will be closed in 7 days.
-
-          close-issue-message: >
-            🔒 This issue has been automatically closed due to prolonged inactivity.
-            Feel free to open a new issue if you have further questions or concerns.
-
-          # Timing
-          days-before-issue-stale: 14
-          days-before-issue-close: 7
-
-          # Labels
-          stale-issue-label: 'stale'
-          remove-stale-when-updated: true
-          only-issue-labels: 'awaiting-requester'
-
-          # Exemptions
-          exempt-assignees: true
-          exempt-milestones: true
--- a/.github/workflows/label-from-dropdown.yml
+++ b/.github/workflows/label-from-dropdown.yml
@@ -1,82 +0,0 @@
-name: Label issues from dropdowns
-
-on:
-  issues:
-    types: [opened]
-
-jobs:
-  label_from_dropdown:
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write
-    steps:
-      - name: Apply labels based on dropdown choices
-        uses: actions/github-script@v7
-        with:
-          script: |
-
-            const issueNumber = context.issue.number;
-            const owner = context.repo.owner;
-            const repo = context.repo.repo;
-
-            // Get the issue body
-            const body = context.payload.issue.body;
-
-            // Helper to find dropdown value in the body (assuming markdown format)
-            function extractSectionValue(heading) {
-              const regex = new RegExp(`### ${heading}\\s+([\\s\\S]*?)(?:\\n###|$)`, 'i');
-              const match = body.match(regex);
-              if (match) {
-                // Get the first non-empty line after the heading
-                const lines = match[1].split('\n').map(l => l.trim()).filter(Boolean);
-                return lines[0] || null;
-              }
-              return null;
-            }
-
-            // Extract dropdown selections
-            const category = extractSectionValue('Category');
-            const metrics = extractSectionValue('Affected Metrics');
-            const component = extractSectionValue('Component');
-
-            // Build labels to add
-            let labelsToAdd = [];
-            if (category) labelsToAdd.push(category);
-            if (metrics) labelsToAdd.push(metrics);
-            if (component) labelsToAdd.push(component);
-
-            // Get existing labels in the repo
-            const { data: existingLabels } = await github.rest.issues.listLabelsForRepo({
-              owner,
-              repo,
-              per_page: 100
-            });
-            const existingLabelNames = existingLabels.map(l => l.name);
-
-            // Find labels that need to be created
-            const labelsToCreate = labelsToAdd.filter(label => !existingLabelNames.includes(label));
-
-            // Create missing labels (with a default color)
-            for (const label of labelsToCreate) {
-              try {
-                await github.rest.issues.createLabel({
-                  owner,
-                  repo,
-                  name: label,
-                  color: 'ededed' // light gray, you can pick any hex color
-                });
-              } catch (e) {
-                // Ignore if label already exists (race condition), otherwise rethrow
-                if (!e || e.status !== 422) throw e;
-              }
-            }
-
-            // Now apply all labels (they all exist now)
-            if (labelsToAdd.length > 0) {
-              await github.rest.issues.addLabels({
-                owner,
-                repo,
-                issue_number: issueNumber,
-                labels: labelsToAdd
-              });
-            } 
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -39,4 +39,4 @@ jobs:
          version: latest
          args: release --clean
        env:
-          GITHUB_TOKEN: ${{ secrets.TOKEN || secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.TOKEN }}
--- a/.github/workflows/vulncheck.yml
+++ b/.github/workflows/vulncheck.yml
@@ -1,33 +0,0 @@
-# https://github.com/minio/minio/blob/master/.github/workflows/vulncheck.yml
-
-name: VulnCheck
-on:
-  pull_request:
-    branches:
-      - main
-
-  push:
-    branches:
-      - main
-
-permissions:
-  contents: read # to fetch code (actions/checkout)
-
-jobs:
-  vulncheck:
-    name: Analysis
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v4
-      - name: Set up Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: 1.24.x
-          cached: false
-      - name: Get official govulncheck
-        run: go install golang.org/x/vuln/cmd/govulncheck@latest
-        shell: bash
-      - name: Run govulncheck
-        run: govulncheck -C ./beszel -show verbose ./...
-        shell: bash
--- a/beszel/.goreleaser.yml
+++ b/beszel/.goreleaser.yml
@@ -119,8 +119,8 @@ scoops:
    repository:
      owner: henrygd
      name: beszel-scoops
-    homepage: "https://beszel.dev"
-    description: "Agent for Beszel, a lightweight server monitoring platform."
+    homepage: 'https://beszel.dev'
+    description: 'Agent for Beszel, a lightweight server monitoring platform.'
    license: MIT

 # # Needs choco installed, so doesn't build on linux / default gh workflow :(
@@ -152,10 +152,9 @@ brews:
    repository:
      owner: henrygd
      name: homebrew-beszel
-    homepage: "https://beszel.dev"
-    description: "Agent for Beszel, a lightweight server monitoring platform."
+    homepage: 'https://beszel.dev'
+    description: 'Agent for Beszel, a lightweight server monitoring platform.'
    license: MIT
-    skip_upload: auto
    extra_install: |
      (bin/"beszel-agent-launcher").write <<~EOS
        #!/bin/bash
@@ -182,12 +181,12 @@ winget:
    package_identifier: henrygd.beszel-agent
    publisher: henrygd
    license: MIT
-    license_url: "https://github.com/henrygd/beszel/blob/main/LICENSE"
-    copyright: "2025 henrygd"
-    homepage: "https://beszel.dev"
-    release_notes_url: "https://github.com/henrygd/beszel/releases/tag/v{{ .Version }}"
-    publisher_support_url: "https://github.com/henrygd/beszel/issues"
-    short_description: "Agent for Beszel, a lightweight server monitoring platform."
+    license_url: 'https://github.com/henrygd/beszel/blob/main/LICENSE'
+    copyright: '2025 henrygd'
+    homepage: 'https://beszel.dev'
+    release_notes_url: 'https://github.com/henrygd/beszel/releases/tag/v{{ .Version }}'
+    publisher_support_url: 'https://github.com/henrygd/beszel/issues'
+    short_description: 'Agent for Beszel, a lightweight server monitoring platform.'
    skip_upload: auto
    description: |
      Beszel is a lightweight server monitoring platform that includes Docker
@@ -219,5 +218,5 @@ changelog:
  sort: asc
  filters:
    exclude:
-      - "^docs:"
-      - "^test:"
+      - '^docs:'
+      - '^test:'
--- a/beszel/Makefile
+++ b/beszel/Makefile
@@ -47,18 +47,18 @@ generate-locales:
 dev-server: generate-locales
 	cd ./site
 	@if command -v bun >/dev/null 2>&1; then \
-		cd ./site && bun run dev --host 0.0.0.0; \
+		cd ./site && bun run dev; \
 	else \
-		cd ./site && npm run dev --host 0.0.0.0; \
+		cd ./site && npm run dev; \
 	fi

 dev-hub: export ENV=dev
 dev-hub:
 	mkdir -p ./site/dist && touch ./site/dist/index.html
 	@if command -v entr >/dev/null 2>&1; then \
-		find ./cmd/hub/*.go ./internal/{alerts,hub,records,users}/*.go | entr -r -s "cd ./cmd/hub && go run . serve --http 0.0.0.0:8090"; \
+		find ./cmd/hub/*.go ./internal/{alerts,hub,records,users}/*.go | entr -r -s "cd ./cmd/hub && go run . serve"; \
 	else \
-		cd ./cmd/hub && go run . serve --http 0.0.0.0:8090; \
+		cd ./cmd/hub && go run . serve; \
 	fi

 dev-agent:
--- a/beszel/cmd/agent/agent.go
+++ b/beszel/cmd/agent/agent.go
@@ -3,7 +3,6 @@ package main
 import (
 	"beszel"
 	"beszel/internal/agent"
-	"beszel/internal/agent/health"
 	"flag"
 	"fmt"
 	"log"
@@ -51,7 +50,12 @@ func (opts *cmdOptions) parse() bool {
 		agent.Update()
 		return true
 	case "health":
-		err := health.Check()
+		// for health, we need to parse flags first to get the listen address
+		args := append(os.Args[2:], subcommand)
+		flag.CommandLine.Parse(args)
+		addr := opts.getAddress()
+		network := agent.GetNetwork(addr)
+		err := agent.Health(addr, network)
 		if err != nil {
 			log.Fatal(err)
 		}
@@ -111,12 +115,8 @@ func main() {
 	serverConfig.Addr = addr
 	serverConfig.Network = agent.GetNetwork(addr)

-	agent, err := agent.NewAgent("")
-	if err != nil {
-		log.Fatal("Failed to create agent: ", err)
-	}
-
-	if err := agent.Start(serverConfig); err != nil {
-		log.Fatal("Failed to start server: ", err)
+	agent := agent.NewAgent()
+	if err := agent.StartServer(serverConfig); err != nil {
+		log.Fatal("Failed to start server:", err)
 	}
 }
--- a/beszel/dockerfile_Agent
+++ b/beszel/dockerfile_Agent
@@ -12,15 +12,9 @@ COPY internal ./internal
 ARG TARGETOS TARGETARCH
 RUN CGO_ENABLED=0 GOGC=75 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -ldflags "-w -s" -o /agent ./cmd/agent

-RUN rm -rf /tmp/*
-
 # ? -------------------------
 FROM scratch

 COPY --from=builder /agent /agent

-# this is so we don't need to create the 
-# /tmp directory in the scratch container
-COPY --from=builder /tmp /tmp
-
-ENTRYPOINT ["/agent"]
+ENTRYPOINT ["/agent"]
--- a/beszel/go.mod
+++ b/beszel/go.mod
@@ -1,26 +1,24 @@
 module beszel

-go 1.24.4
+go 1.24.2

 // lock shoutrrr to specific version to allow review before updating
 replace github.com/nicholas-fedor/shoutrrr => github.com/nicholas-fedor/shoutrrr v0.8.8

 require (
 	github.com/blang/semver v3.5.1+incompatible
-	github.com/fxamacker/cbor/v2 v2.8.0
 	github.com/gliderlabs/ssh v0.3.8
-	github.com/google/uuid v1.6.0
-	github.com/lxzan/gws v1.8.9
-	github.com/nicholas-fedor/shoutrrr v0.8.15
+	github.com/goccy/go-json v0.10.5
+	github.com/nicholas-fedor/shoutrrr v0.8.8
 	github.com/pocketbase/dbx v1.11.0
-	github.com/pocketbase/pocketbase v0.28.4
+	github.com/pocketbase/pocketbase v0.27.1
 	github.com/rhysd/go-github-selfupdate v1.2.3
-	github.com/shirou/gopsutil/v4 v4.25.6
-	github.com/spf13/cast v1.9.2
+	github.com/shirou/gopsutil/v4 v4.25.3
+	github.com/spf13/cast v1.7.1
 	github.com/spf13/cobra v1.9.1
 	github.com/stretchr/testify v1.10.0
-	golang.org/x/crypto v0.39.0
-	golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b
+	golang.org/x/crypto v0.37.0
+	golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0
 	gopkg.in/yaml.v3 v3.0.1
 )

@@ -29,10 +27,9 @@ require (
 	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/disintegration/imaging v1.6.2 // indirect
-	github.com/dolthub/maphash v0.1.0 // indirect
 	github.com/domodwyer/mailyak/v3 v3.6.2 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/ebitengine/purego v0.8.4 // indirect
+	github.com/ebitengine/purego v0.8.2 // indirect
 	github.com/fatih/color v1.18.0 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.9 // indirect
 	github.com/ganigeorgiev/fexpr v0.5.0 // indirect
@@ -42,9 +39,9 @@ require (
 	github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
 	github.com/google/go-github/v30 v30.1.0 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/klauspost/compress v1.18.0 // indirect
 	github.com/lufia/plan9stats v0.0.0-20250317134145-8bc96cf8fc35 // indirect
 	github.com/mattn/go-colorable v0.1.14 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
@@ -57,16 +54,15 @@ require (
 	github.com/tklauser/go-sysconf v0.3.15 // indirect
 	github.com/tklauser/numcpus v0.10.0 // indirect
 	github.com/ulikunitz/xz v0.5.12 // indirect
-	github.com/x448/float16 v0.8.4 // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
-	golang.org/x/image v0.28.0 // indirect
-	golang.org/x/net v0.41.0 // indirect
-	golang.org/x/oauth2 v0.30.0 // indirect
-	golang.org/x/sync v0.15.0 // indirect
-	golang.org/x/sys v0.33.0 // indirect
-	golang.org/x/text v0.26.0 // indirect
-	modernc.org/libc v1.65.10 // indirect
+	golang.org/x/image v0.26.0 // indirect
+	golang.org/x/net v0.39.0 // indirect
+	golang.org/x/oauth2 v0.29.0 // indirect
+	golang.org/x/sync v0.13.0 // indirect
+	golang.org/x/sys v0.32.0 // indirect
+	golang.org/x/text v0.24.0 // indirect
+	modernc.org/libc v1.64.0 // indirect
 	modernc.org/mathutil v1.7.1 // indirect
-	modernc.org/memory v1.11.0 // indirect
-	modernc.org/sqlite v1.38.0 // indirect
+	modernc.org/memory v1.10.0 // indirect
+	modernc.org/sqlite v1.37.0 // indirect
 )
--- a/beszel/go.sum
+++ b/beszel/go.sum
@@ -13,21 +13,17 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c=
 github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4=
-github.com/dolthub/maphash v0.1.0 h1:bsQ7JsF4FkkWyrP3oCnFJgrCUAFbFf3kOl4L/QxPDyQ=
-github.com/dolthub/maphash v0.1.0/go.mod h1:gkg4Ch4CdCDu5h6PMriVLawB7koZ+5ijb9puGMV50a4=
 github.com/domodwyer/mailyak/v3 v3.6.2 h1:x3tGMsyFhTCaxp6ycgR0FE/bu5QiNp+hetUuCOBXMn8=
 github.com/domodwyer/mailyak/v3 v3.6.2/go.mod h1:lOm/u9CyCVWHeaAmHIdF4RiKVxKUT/H5XX10lIKAL6c=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
-github.com/ebitengine/purego v0.8.4 h1:CF7LEKg5FFOsASUj0+QwaXf8Ht6TlFxg09+S9wz0omw=
-github.com/ebitengine/purego v0.8.4/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
+github.com/ebitengine/purego v0.8.2 h1:jPPGWs2sZ1UgOSgD2bClL0MJIqu58nOmIcBuXr62z1I=
+github.com/ebitengine/purego v0.8.2/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
 github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
 github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
 github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
 github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/fxamacker/cbor/v2 v2.8.0 h1:fFtUGXUzXPHTIUdne5+zzMPTfffl3RD5qYnkY40vtxU=
-github.com/fxamacker/cbor/v2 v2.8.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
 github.com/gabriel-vasile/mimetype v1.4.9 h1:5k+WDwEsD9eTLL8Tz3L0VnmVh9QxGjRmjBvAG7U/oYY=
 github.com/gabriel-vasile/mimetype v1.4.9/go.mod h1:WnSQhFKJuBlRyLiKohA/2DtIlPFAbguNaG7QCHcyGok=
 github.com/ganigeorgiev/fexpr v0.5.0 h1:XA9JxtTE/Xm+g/JFI6RfZEHSiQlk+1glLvRK1Lpv/Tk=
@@ -46,6 +42,8 @@ github.com/go-sql-driver/mysql v1.9.1 h1:FrjNGn/BsJQjVRuSa8CBrM5BWA9BWoXXat3KrtS
 github.com/go-sql-driver/mysql v1.9.1/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI64Gl8i5p1WMU=
 github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
 github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
+github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4=
+github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
 github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8=
 github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -70,8 +68,6 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/jarcoal/httpmock v1.4.0 h1:BvhqnH0JAYbNudL2GMJKgOHe2CtKlzJ/5rWKyp+hc2k=
 github.com/jarcoal/httpmock v1.4.0/go.mod h1:ftW1xULwo+j0R0JJkJIIi7UKigZUXCLLanykgjwBXL0=
-github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
-github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
@@ -81,8 +77,6 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/lufia/plan9stats v0.0.0-20250317134145-8bc96cf8fc35 h1:PpXWgLPs+Fqr325bN2FD2ISlRRztXibcX6e8f5FR5Dc=
 github.com/lufia/plan9stats v0.0.0-20250317134145-8bc96cf8fc35/go.mod h1:autxFIvghDt3jPTLoqZ9OZ7s9qTGNAWmYCjVFWPX/zg=
-github.com/lxzan/gws v1.8.9 h1:VU3SGUeWlQrEwfUSfokcZep8mdg/BrUF+y73YYshdBM=
-github.com/lxzan/gws v1.8.9/go.mod h1:d9yHaR1eDTBHagQC6KY7ycUOaz5KWeqQtP3xu7aMK8Y=
 github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
 github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
@@ -103,8 +97,8 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pocketbase/dbx v1.11.0 h1:LpZezioMfT3K4tLrqA55wWFw1EtH1pM4tzSVa7kgszU=
 github.com/pocketbase/dbx v1.11.0/go.mod h1:xXRCIAKTHMgUCyCKZm55pUOdvFziJjQfXaWKhu2vhMs=
-github.com/pocketbase/pocketbase v0.28.4 h1:RmhWXDcfKrFM9/W0G0Zrlv4eKBM8/s/v4SQKytjgD20=
-github.com/pocketbase/pocketbase v0.28.4/go.mod h1:jSuN93vE/oeJVOz2D2ZxcYyr2bYNmDOMCUkM+JhyJQ0=
+github.com/pocketbase/pocketbase v0.27.1 h1:KGCsS8idUVTC5QHxTj91qHDhIXOb5Yb50wwHhNvJRTQ=
+github.com/pocketbase/pocketbase v0.27.1/go.mod h1:aTpwwloVJzeJ7MlwTRrbI/x62QNR2/kkCrovmyrXpqs=
 github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 h1:o4JXh1EVt9k/+g42oCprj/FisM4qX9L3sZB3upGN2ZU=
 github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
@@ -114,10 +108,10 @@ github.com/rhysd/go-github-selfupdate v1.2.3/go.mod h1:mp/N8zj6jFfBQy/XMYoWsmfzx
 github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/shirou/gopsutil/v4 v4.25.6 h1:kLysI2JsKorfaFPcYmcJqbzROzsBWEOAtw6A7dIfqXs=
-github.com/shirou/gopsutil/v4 v4.25.6/go.mod h1:PfybzyydfZcN+JMMjkF6Zb8Mq1A/VcogFFg7hj50W9c=
-github.com/spf13/cast v1.9.2 h1:SsGfm7M8QOFtEzumm7UZrZdLLquNdzFYfIbEXntcFbE=
-github.com/spf13/cast v1.9.2/go.mod h1:jNfB8QC9IA6ZuY2ZjDp0KtFO2LZZlg4S/7bzP6qqeHo=
+github.com/shirou/gopsutil/v4 v4.25.3 h1:SeA68lsu8gLggyMbmCn8cmp97V1TI9ld9sVzAUcKcKE=
+github.com/shirou/gopsutil/v4 v4.25.3/go.mod h1:xbuxyoZj+UsgnZrENu3lQivsngRR5BdjbJwf2fv4szA=
+github.com/spf13/cast v1.7.1 h1:cuNEagBQEHWN1FnbGEjCXL2szYEXqfJPbP2HNUaca9Y=
+github.com/spf13/cast v1.7.1/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
 github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
 github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
 github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
@@ -135,37 +129,35 @@ github.com/tklauser/numcpus v0.10.0/go.mod h1:BiTKazU708GQTYF4mB+cmlpT2Is1gLk7XV
 github.com/ulikunitz/xz v0.5.9/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 github.com/ulikunitz/xz v0.5.12 h1:37Nm15o69RwBkXM0J6A5OlE67RZTfzUxTj8fB3dfcsc=
 github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
-github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
-github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
 github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
 github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
 go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
 go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
-golang.org/x/crypto v0.39.0 h1:SHs+kF4LP+f+p14esP5jAoDpHU8Gu/v9lFRK6IT5imM=
-golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U=
-golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b h1:M2rDM6z3Fhozi9O7NWsxAkg/yqS/lQJ6PmkyIV3YP+o=
-golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b/go.mod h1:3//PLf8L/X+8b4vuAfHzxeRUl04Adcb341+IGKfnqS8=
+golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE=
+golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc=
+golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 h1:R84qjqJb5nVJMxqWYb3np9L5ZsaDtB+a39EqjV0JSUM=
+golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0/go.mod h1:S9Xr4PYopiDyqSyp5NjCrhFrqg6A5zA2E/iPHPhqnS8=
 golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.28.0 h1:gdem5JW1OLS4FbkWgLO+7ZeFzYtL3xClb97GaUzYMFE=
-golang.org/x/image v0.28.0/go.mod h1:GUJYXtnGKEUgggyzh+Vxt+AviiCcyiwpsl8iQ8MvwGY=
-golang.org/x/mod v0.25.0 h1:n7a+ZbQKQA/Ysbyb0/6IbB1H/X41mKgbhfv7AfG/44w=
-golang.org/x/mod v0.25.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
+golang.org/x/image v0.26.0 h1:4XjIFEZWQmCZi6Wv8BoxsDhRU3RVnLX04dToTDAEPlY=
+golang.org/x/image v0.26.0/go.mod h1:lcxbMFAovzpnJxzXS3nyL83K27tmqtKzIJpctK8YO5c=
+golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
+golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
-golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw=
-golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA=
+golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
+golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
-golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
+golang.org/x/oauth2 v0.29.0 h1:WdYw2tdTK1S8olAzWHdgeqfy+Mtm9XNhv/xJsY65d98=
+golang.org/x/oauth2 v0.29.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.15.0 h1:KWH3jNZsfyT6xfAfKiz6MRNmd46ByHDYaZ7KSkCtdW8=
-golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610=
+golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -173,19 +165,19 @@ golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
-golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
+golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
-golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg=
-golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ=
+golang.org/x/term v0.31.0 h1:erwDkOK1Msy6offm1mOgvspSkslFnIGsFnxOKoufg3o=
+golang.org/x/term v0.31.0/go.mod h1:R4BeIy7D95HzImkxGkTW1UQTtP54tio2RyHz7PwK0aw=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M=
-golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA=
+golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
+golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.34.0 h1:qIpSLOxeCYGg9TrcJokLBG4KFA6d795g0xkBkiESGlo=
-golang.org/x/tools v0.34.0/go.mod h1:pAP9OwEaY1CAW3HOmg3hLZC5Z0CCmzjAF2UQMSqNARg=
+golang.org/x/tools v0.32.0 h1:Q7N1vhpkQv7ybVzLFtTjvQya2ewbwNDZzUgfXGqtMWU=
+golang.org/x/tools v0.32.0/go.mod h1:ZxrU41P/wAbZD8EDa6dDCa6XfpkhJ7HFMjHJXfBDu8s=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -201,26 +193,26 @@ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-modernc.org/cc/v4 v4.26.1 h1:+X5NtzVBn0KgsBCBe+xkDC7twLb/jNVj9FPgiwSQO3s=
-modernc.org/cc/v4 v4.26.1/go.mod h1:uVtb5OGqUKpoLWhqwNQo/8LwvoiEBLvZXIQ/SmO6mL0=
-modernc.org/ccgo/v4 v4.28.0 h1:rjznn6WWehKq7dG4JtLRKxb52Ecv8OUGah8+Z/SfpNU=
-modernc.org/ccgo/v4 v4.28.0/go.mod h1:JygV3+9AV6SmPhDasu4JgquwU81XAKLd3OKTUDNOiKE=
-modernc.org/fileutil v1.3.3 h1:3qaU+7f7xxTUmvU1pJTZiDLAIoJVdUSSauJNHg9yXoA=
-modernc.org/fileutil v1.3.3/go.mod h1:HxmghZSZVAz/LXcMNwZPA/DRrQZEVP9VX0V4LQGQFOc=
+modernc.org/cc/v4 v4.26.0 h1:QMYvbVduUGH0rrO+5mqF/PSPPRZNpRtg2CLELy7vUpA=
+modernc.org/cc/v4 v4.26.0/go.mod h1:uVtb5OGqUKpoLWhqwNQo/8LwvoiEBLvZXIQ/SmO6mL0=
+modernc.org/ccgo/v4 v4.26.0 h1:gVzXaDzGeBYJ2uXTOpR8FR7OlksDOe9jxnjhIKCsiTc=
+modernc.org/ccgo/v4 v4.26.0/go.mod h1:Sem8f7TFUtVXkG2fiaChQtyyfkqhJBg/zjEJBkmuAVY=
+modernc.org/fileutil v1.3.1 h1:8vq5fe7jdtEvoCf3Zf9Nm0Q05sH6kGx0Op2CPx1wTC8=
+modernc.org/fileutil v1.3.1/go.mod h1:HxmghZSZVAz/LXcMNwZPA/DRrQZEVP9VX0V4LQGQFOc=
 modernc.org/gc/v2 v2.6.5 h1:nyqdV8q46KvTpZlsw66kWqwXRHdjIlJOhG6kxiV/9xI=
 modernc.org/gc/v2 v2.6.5/go.mod h1:YgIahr1ypgfe7chRuJi2gD7DBQiKSLMPgBQe9oIiito=
-modernc.org/libc v1.65.10 h1:ZwEk8+jhW7qBjHIT+wd0d9VjitRyQef9BnzlzGwMODc=
-modernc.org/libc v1.65.10/go.mod h1:StFvYpx7i/mXtBAfVOjaU0PWZOvIRoZSgXhrwXzr8Po=
+modernc.org/libc v1.64.0 h1:U0k8BD2d3cD3e9I8RLcZgJBHAcsJzbXx5mKGSb5pyJA=
+modernc.org/libc v1.64.0/go.mod h1:7m9VzGq7APssBTydds2zBcxGREwvIGpuUBaKTXdm2Qs=
 modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU=
 modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg=
-modernc.org/memory v1.11.0 h1:o4QC8aMQzmcwCK3t3Ux/ZHmwFPzE6hf2Y5LbkRs+hbI=
-modernc.org/memory v1.11.0/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw=
+modernc.org/memory v1.10.0 h1:fzumd51yQ1DxcOxSO+S6X7+QTuVU+n8/Aj7swYjFfC4=
+modernc.org/memory v1.10.0/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw=
 modernc.org/opt v0.1.4 h1:2kNGMRiUjrp4LcaPuLY2PzUfqM/w9N23quVwhKt5Qm8=
 modernc.org/opt v0.1.4/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns=
 modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w=
 modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE=
-modernc.org/sqlite v1.38.0 h1:+4OrfPQ8pxHKuWG4md1JpR/EYAh3Md7TdejuuzE7EUI=
-modernc.org/sqlite v1.38.0/go.mod h1:1Bj+yES4SVvBZ4cBOpVZ6QgesMCKpJZDq0nxYzOpmNE=
+modernc.org/sqlite v1.37.0 h1:s1TMe7T3Q3ovQiK2Ouz4Jwh7dw4ZDqbebSDTlSJdfjI=
+modernc.org/sqlite v1.37.0/go.mod h1:5YiWv+YviqGMuGw4V+PNplcyaJ5v+vQd7TQOgkACoJM=
 modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0=
 modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A=
 modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=
--- a/beszel/internal/agent/agent.go
+++ b/beszel/internal/agent/agent.go
@@ -4,55 +4,35 @@ package agent
 import (
 	"beszel"
 	"beszel/internal/entities/system"
-	"crypto/sha256"
-	"encoding/hex"
 	"log/slog"
 	"os"
-	"path/filepath"
 	"strings"
 	"sync"
 	"time"
-
-	"github.com/gliderlabs/ssh"
-	"github.com/shirou/gopsutil/v4/host"
-	gossh "golang.org/x/crypto/ssh"
 )

 type Agent struct {
-	sync.Mutex                                   // Used to lock agent while collecting data
-	debug             bool                       // true if LOG_LEVEL is set to debug
-	zfs               bool                       // true if system has arcstats
-	memCalc           string                     // Memory calculation formula
-	fsNames           []string                   // List of filesystem device names being monitored
-	fsStats           map[string]*system.FsStats // Keeps track of disk stats for each filesystem
-	netInterfaces     map[string]struct{}        // Stores all valid network interfaces
-	netIoStats        system.NetIoStats          // Keeps track of bandwidth usage
-	dockerManager     *dockerManager             // Manages Docker API requests
-	sensorConfig      *SensorConfig              // Sensors config
-	systemInfo        system.Info                // Host system info
-	gpuManager        *GPUManager                // Manages GPU data
-	cache             *SessionCache              // Cache for system stats based on primary session ID
-	connectionManager *ConnectionManager         // Channel to signal connection events
-	server            *ssh.Server                // SSH server
-	dataDir           string                     // Directory for persisting data
-	keys              []gossh.PublicKey          // SSH public keys
+	sync.Mutex                               // Used to lock agent while collecting data
+	debug         bool                       // true if LOG_LEVEL is set to debug
+	zfs           bool                       // true if system has arcstats
+	memCalc       string                     // Memory calculation formula
+	fsNames       []string                   // List of filesystem device names being monitored
+	fsStats       map[string]*system.FsStats // Keeps track of disk stats for each filesystem
+	netInterfaces map[string]struct{}        // Stores all valid network interfaces
+	netIoStats    system.NetIoStats          // Keeps track of bandwidth usage
+	dockerManager *dockerManager             // Manages Docker API requests
+	sensorConfig  *SensorConfig              // Sensors config
+	systemInfo    system.Info                // Host system info
+	gpuManager    *GPUManager                // Manages GPU data
+	cache         *SessionCache              // Cache for system stats based on primary session ID
+	smartManager     *SmartManager              // Manages SMART data
 }

-// NewAgent creates a new agent with the given data directory for persisting data.
-// If the data directory is not set, it will attempt to find the optimal directory.
-func NewAgent(dataDir string) (agent *Agent, err error) {
-	agent = &Agent{
+func NewAgent() *Agent {
+	agent := &Agent{
 		fsStats: make(map[string]*system.FsStats),
 		cache:   NewSessionCache(69 * time.Second),
 	}
-
-	agent.dataDir, err = getDataDir(dataDir)
-	if err != nil {
-		slog.Warn("Data directory not found")
-	} else {
-		slog.Info("Data directory", "path", agent.dataDir)
-	}
-
 	agent.memCalc, _ = GetEnv("MEM_CALC")
 	agent.sensorConfig = agent.newSensorConfig()
 	// Set up slog with a log level determined by the LOG_LEVEL env var
@@ -70,19 +50,10 @@ func NewAgent(dataDir string) (agent *Agent, err error) {

 	slog.Debug(beszel.Version)

-	// initialize system info
+	// initialize system info / docker manager
 	agent.initializeSystemInfo()
-
-	// initialize connection manager
-	agent.connectionManager = newConnectionManager(agent)
-
-	// initialize disk info
 	agent.initializeDiskInfo()
-
-	// initialize net io stats
 	agent.initializeNetIoStats()
-
-	// initialize docker manager
 	agent.dockerManager = newDockerManager(agent)

 	// initialize GPU manager
@@ -92,12 +63,18 @@ func NewAgent(dataDir string) (agent *Agent, err error) {
 		agent.gpuManager = gm
 	}

+	if sm, err := NewSmartManager(); err != nil {
+		slog.Debug("SMART", "err", err)
+	} else {
+		agent.smartManager = sm
+	}
+
 	// if debugging, print stats
 	if agent.debug {
 		slog.Debug("Stats", "data", agent.gatherStats(""))
 	}

-	return agent, nil
+	return agent
 }

 // GetEnv retrieves an environment variable with a "BESZEL_AGENT_" prefix, or falls back to the unprefixed key.
@@ -145,38 +122,3 @@ func (a *Agent) gatherStats(sessionID string) *system.CombinedData {
 	a.cache.Set(sessionID, cachedData)
 	return cachedData
 }
-
-// StartAgent initializes and starts the agent with optional WebSocket connection
-func (a *Agent) Start(serverOptions ServerOptions) error {
-	a.keys = serverOptions.Keys
-	return a.connectionManager.Start(serverOptions)
-}
-
-func (a *Agent) getFingerprint() string {
-	// first look for a fingerprint in the data directory
-	if a.dataDir != "" {
-		if fp, err := os.ReadFile(filepath.Join(a.dataDir, "fingerprint")); err == nil {
-			return string(fp)
-		}
-	}
-
-	// if no fingerprint is found, generate one
-	fingerprint, err := host.HostID()
-	if err != nil || fingerprint == "" {
-		fingerprint = a.systemInfo.Hostname + a.systemInfo.CpuModel
-	}
-
-	// hash fingerprint
-	sum := sha256.Sum256([]byte(fingerprint))
-	fingerprint = hex.EncodeToString(sum[:24])
-
-	// save fingerprint to data directory
-	if a.dataDir != "" {
-		err = os.WriteFile(filepath.Join(a.dataDir, "fingerprint"), []byte(fingerprint), 0644)
-		if err != nil {
-			slog.Warn("Failed to save fingerprint", "err", err)
-		}
-	}
-
-	return fingerprint
-}
--- a/beszel/internal/agent/agent_cache_test.go
+++ b/beszel/internal/agent/agent_cache_test.go
@@ -1,6 +1,3 @@
-//go:build testing
-// +build testing
-
 package agent

 import (
--- a/beszel/internal/agent/agent_test_helpers.go
+++ b/beszel/internal/agent/agent_test_helpers.go
@@ -1,9 +0,0 @@
-//go:build testing
-// +build testing
-
-package agent
-
-// TESTING ONLY: GetConnectionManager is a helper function to get the connection manager for testing.
-func (a *Agent) GetConnectionManager() *ConnectionManager {
-	return a.connectionManager
-}
--- a/beszel/internal/agent/client.go
+++ b/beszel/internal/agent/client.go
@@ -1,243 +0,0 @@
-package agent
-
-import (
-	"beszel"
-	"beszel/internal/common"
-	"crypto/tls"
-	"errors"
-	"fmt"
-	"log/slog"
-	"net"
-	"net/http"
-	"net/url"
-	"path"
-	"strings"
-	"time"
-
-	"github.com/fxamacker/cbor/v2"
-	"github.com/lxzan/gws"
-	"golang.org/x/crypto/ssh"
-)
-
-const (
-	wsDeadline = 70 * time.Second
-)
-
-// WebSocketClient manages the WebSocket connection between the agent and hub.
-// It handles authentication, message routing, and connection lifecycle management.
-type WebSocketClient struct {
-	gws.BuiltinEventHandler
-	options            *gws.ClientOption                   // WebSocket client configuration options
-	agent              *Agent                              // Reference to the parent agent
-	Conn               *gws.Conn                           // Active WebSocket connection
-	hubURL             *url.URL                            // Parsed hub URL for connection
-	token              string                              // Authentication token for hub registration
-	fingerprint        string                              // System fingerprint for identification
-	hubRequest         *common.HubRequest[cbor.RawMessage] // Reusable request structure for message parsing
-	lastConnectAttempt time.Time                           // Timestamp of last connection attempt
-	hubVerified        bool                                // Whether the hub has been cryptographically verified
-}
-
-// newWebSocketClient creates a new WebSocket client for the given agent.
-// It reads configuration from environment variables and validates the hub URL.
-func newWebSocketClient(agent *Agent) (client *WebSocketClient, err error) {
-	hubURLStr, exists := GetEnv("HUB_URL")
-	if !exists {
-		return nil, errors.New("HUB_URL environment variable not set")
-	}
-
-	client = &WebSocketClient{}
-
-	client.hubURL, err = url.Parse(hubURLStr)
-	if err != nil {
-		return nil, errors.New("invalid hub URL")
-	}
-	// get registration token
-	client.token, _ = GetEnv("TOKEN")
-	if client.token == "" {
-		return nil, errors.New("TOKEN environment variable not set")
-	}
-
-	client.agent = agent
-	client.hubRequest = &common.HubRequest[cbor.RawMessage]{}
-	client.fingerprint = agent.getFingerprint()
-
-	return client, nil
-}
-
-// getOptions returns the WebSocket client options, creating them if necessary.
-// It configures the connection URL, TLS settings, and authentication headers.
-func (client *WebSocketClient) getOptions() *gws.ClientOption {
-	if client.options != nil {
-		return client.options
-	}
-
-	// update the hub url to use websocket scheme and api path
-	if client.hubURL.Scheme == "https" {
-		client.hubURL.Scheme = "wss"
-	} else {
-		client.hubURL.Scheme = "ws"
-	}
-	client.hubURL.Path = path.Join(client.hubURL.Path, "api/beszel/agent-connect")
-
-	client.options = &gws.ClientOption{
-		Addr:      client.hubURL.String(),
-		TlsConfig: &tls.Config{InsecureSkipVerify: true},
-		RequestHeader: http.Header{
-			"User-Agent": []string{getUserAgent()},
-			"X-Token":    []string{client.token},
-			"X-Beszel":   []string{beszel.Version},
-		},
-	}
-	return client.options
-}
-
-// Connect establishes a WebSocket connection to the hub.
-// It closes any existing connection before attempting to reconnect.
-func (client *WebSocketClient) Connect() (err error) {
-	client.lastConnectAttempt = time.Now()
-
-	// make sure previous connection is closed
-	client.Close()
-
-	client.Conn, _, err = gws.NewClient(client, client.getOptions())
-	if err != nil {
-		return err
-	}
-
-	go client.Conn.ReadLoop()
-
-	return nil
-}
-
-// OnOpen handles WebSocket connection establishment.
-// It sets a deadline for the connection to prevent hanging.
-func (client *WebSocketClient) OnOpen(conn *gws.Conn) {
-	conn.SetDeadline(time.Now().Add(wsDeadline))
-}
-
-// OnClose handles WebSocket connection closure.
-// It logs the closure reason and notifies the connection manager.
-func (client *WebSocketClient) OnClose(conn *gws.Conn, err error) {
-	slog.Warn("Connection closed", "err", strings.TrimPrefix(err.Error(), "gws: "))
-	client.agent.connectionManager.eventChan <- WebSocketDisconnect
-}
-
-// OnMessage handles incoming WebSocket messages from the hub.
-// It decodes CBOR messages and routes them to appropriate handlers.
-func (client *WebSocketClient) OnMessage(conn *gws.Conn, message *gws.Message) {
-	defer message.Close()
-	conn.SetDeadline(time.Now().Add(wsDeadline))
-
-	if message.Opcode != gws.OpcodeBinary {
-		return
-	}
-
-	if err := cbor.NewDecoder(message.Data).Decode(client.hubRequest); err != nil {
-		slog.Error("Error parsing message", "err", err)
-		return
-	}
-	if err := client.handleHubRequest(client.hubRequest); err != nil {
-		slog.Error("Error handling message", "err", err)
-	}
-}
-
-// OnPing handles WebSocket ping frames.
-// It responds with a pong and updates the connection deadline.
-func (client *WebSocketClient) OnPing(conn *gws.Conn, message []byte) {
-	conn.SetDeadline(time.Now().Add(wsDeadline))
-	conn.WritePong(message)
-}
-
-// handleAuthChallenge verifies the authenticity of the hub and returns the system's fingerprint.
-func (client *WebSocketClient) handleAuthChallenge(msg *common.HubRequest[cbor.RawMessage]) (err error) {
-	var authRequest common.FingerprintRequest
-	if err := cbor.Unmarshal(msg.Data, &authRequest); err != nil {
-		return err
-	}
-
-	if err := client.verifySignature(authRequest.Signature); err != nil {
-		return err
-	}
-
-	client.hubVerified = true
-	client.agent.connectionManager.eventChan <- WebSocketConnect
-
-	response := &common.FingerprintResponse{
-		Fingerprint: client.fingerprint,
-	}
-
-	if authRequest.NeedSysInfo {
-		response.Hostname = client.agent.systemInfo.Hostname
-		serverAddr := client.agent.connectionManager.serverOptions.Addr
-		_, response.Port, _ = net.SplitHostPort(serverAddr)
-	}
-
-	return client.sendMessage(response)
-}
-
-// verifySignature verifies the signature of the token using the public keys.
-func (client *WebSocketClient) verifySignature(signature []byte) (err error) {
-	for _, pubKey := range client.agent.keys {
-		sig := ssh.Signature{
-			Format: pubKey.Type(),
-			Blob:   signature,
-		}
-		if err = pubKey.Verify([]byte(client.token), &sig); err == nil {
-			return nil
-		}
-	}
-	return errors.New("invalid signature - check KEY value")
-}
-
-// Close closes the WebSocket connection gracefully.
-// This method is safe to call multiple times.
-func (client *WebSocketClient) Close() {
-	if client.Conn != nil {
-		_ = client.Conn.WriteClose(1000, nil)
-	}
-}
-
-// handleHubRequest routes the request to the appropriate handler.
-// It ensures the hub is verified before processing most requests.
-func (client *WebSocketClient) handleHubRequest(msg *common.HubRequest[cbor.RawMessage]) error {
-	if !client.hubVerified && msg.Action != common.CheckFingerprint {
-		return errors.New("hub not verified")
-	}
-	switch msg.Action {
-	case common.GetData:
-		return client.sendSystemData()
-	case common.CheckFingerprint:
-		return client.handleAuthChallenge(msg)
-	}
-	return nil
-}
-
-// sendSystemData gathers and sends current system statistics to the hub.
-func (client *WebSocketClient) sendSystemData() error {
-	sysStats := client.agent.gatherStats(client.token)
-	return client.sendMessage(sysStats)
-}
-
-// sendMessage encodes the given data to CBOR and sends it as a binary message over the WebSocket connection to the hub.
-func (client *WebSocketClient) sendMessage(data any) error {
-	bytes, err := cbor.Marshal(data)
-	if err != nil {
-		return err
-	}
-	return client.Conn.WriteMessage(gws.OpcodeBinary, bytes)
-}
-
-// getUserAgent returns one of two User-Agent strings based on current time.
-// This is used to avoid being blocked by Cloudflare or other anti-bot measures.
-func getUserAgent() string {
-	const (
-		uaBase    = "Mozilla/5.0 (%s) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36"
-		uaWindows = "Windows NT 11.0; Win64; x64"
-		uaMac     = "Macintosh; Intel Mac OS X 14_0_0"
-	)
-	if time.Now().UnixNano()%2 == 0 {
-		return fmt.Sprintf(uaBase, uaWindows)
-	}
-	return fmt.Sprintf(uaBase, uaMac)
-}
--- a/beszel/internal/agent/connection_manager.go
+++ b/beszel/internal/agent/connection_manager.go
@@ -1,220 +0,0 @@
-package agent
-
-import (
-	"beszel/internal/agent/health"
-	"errors"
-	"log/slog"
-	"os"
-	"os/signal"
-	"syscall"
-	"time"
-)
-
-// ConnectionManager manages the connection state and events for the agent.
-// It handles both WebSocket and SSH connections, automatically switching between
-// them based on availability and managing reconnection attempts.
-type ConnectionManager struct {
-	agent         *Agent               // Reference to the parent agent
-	State         ConnectionState      // Current connection state
-	eventChan     chan ConnectionEvent // Channel for connection events
-	wsClient      *WebSocketClient     // WebSocket client for hub communication
-	serverOptions ServerOptions        // Configuration for SSH server
-	wsTicker      *time.Ticker         // Ticker for WebSocket connection attempts
-	isConnecting  bool                 // Prevents multiple simultaneous reconnection attempts
-}
-
-// ConnectionState represents the current connection state of the agent.
-type ConnectionState uint8
-
-// ConnectionEvent represents connection-related events that can occur.
-type ConnectionEvent uint8
-
-// Connection states
-const (
-	Disconnected       ConnectionState = iota // No active connection
-	WebSocketConnected                        // Connected via WebSocket
-	SSHConnected                              // Connected via SSH
-)
-
-// Connection events
-const (
-	WebSocketConnect    ConnectionEvent = iota // WebSocket connection established
-	WebSocketDisconnect                        // WebSocket connection lost
-	SSHConnect                                 // SSH connection established
-	SSHDisconnect                              // SSH connection lost
-)
-
-const wsTickerInterval = 10 * time.Second
-
-// newConnectionManager creates a new connection manager for the given agent.
-func newConnectionManager(agent *Agent) *ConnectionManager {
-	cm := &ConnectionManager{
-		agent: agent,
-		State: Disconnected,
-	}
-	return cm
-}
-
-// startWsTicker starts or resets the WebSocket connection attempt ticker.
-func (c *ConnectionManager) startWsTicker() {
-	if c.wsTicker == nil {
-		c.wsTicker = time.NewTicker(wsTickerInterval)
-	} else {
-		c.wsTicker.Reset(wsTickerInterval)
-	}
-}
-
-// stopWsTicker stops the WebSocket connection attempt ticker.
-func (c *ConnectionManager) stopWsTicker() {
-	if c.wsTicker != nil {
-		c.wsTicker.Stop()
-	}
-}
-
-// Start begins connection attempts and enters the main event loop.
-// It handles connection events, periodic health updates, and graceful shutdown.
-func (c *ConnectionManager) Start(serverOptions ServerOptions) error {
-	if c.eventChan != nil {
-		return errors.New("already started")
-	}
-
-	wsClient, err := newWebSocketClient(c.agent)
-	if err != nil {
-		slog.Warn("Error creating WebSocket client", "err", err)
-	}
-	c.wsClient = wsClient
-
-	c.serverOptions = serverOptions
-	c.eventChan = make(chan ConnectionEvent, 1)
-
-	// signal handling for shutdown
-	sigChan := make(chan os.Signal, 1)
-	signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM)
-
-	c.startWsTicker()
-	c.connect()
-
-	// update health status immediately and every 90 seconds
-	_ = health.Update()
-	healthTicker := time.Tick(90 * time.Second)
-
-	for {
-		select {
-		case connectionEvent := <-c.eventChan:
-			c.handleEvent(connectionEvent)
-		case <-c.wsTicker.C:
-			_ = c.startWebSocketConnection()
-		case <-healthTicker:
-			_ = health.Update()
-		case <-sigChan:
-			slog.Info("Shutting down")
-			_ = c.agent.StopServer()
-			c.closeWebSocket()
-			return health.CleanUp()
-		}
-	}
-}
-
-// handleEvent processes connection events and updates the connection state accordingly.
-func (c *ConnectionManager) handleEvent(event ConnectionEvent) {
-	switch event {
-	case WebSocketConnect:
-		c.handleStateChange(WebSocketConnected)
-	case SSHConnect:
-		c.handleStateChange(SSHConnected)
-	case WebSocketDisconnect:
-		if c.State == WebSocketConnected {
-			c.handleStateChange(Disconnected)
-		}
-	case SSHDisconnect:
-		if c.State == SSHConnected {
-			c.handleStateChange(Disconnected)
-		}
-	}
-}
-
-// handleStateChange updates the connection state and performs necessary actions
-// based on the new state, including stopping services and initiating reconnections.
-func (c *ConnectionManager) handleStateChange(newState ConnectionState) {
-	if c.State == newState {
-		return
-	}
-	c.State = newState
-	switch newState {
-	case WebSocketConnected:
-		slog.Info("WebSocket connected", "host", c.wsClient.hubURL.Host)
-		c.stopWsTicker()
-		_ = c.agent.StopServer()
-		c.isConnecting = false
-	case SSHConnected:
-		// stop new ws connection attempts
-		slog.Info("SSH connection established")
-		c.stopWsTicker()
-		c.isConnecting = false
-	case Disconnected:
-		if c.isConnecting {
-			// Already handling reconnection, avoid duplicate attempts
-			return
-		}
-		c.isConnecting = true
-		slog.Warn("Disconnected from hub")
-		// make sure old ws connection is closed
-		c.closeWebSocket()
-		// reconnect
-		go c.connect()
-	}
-}
-
-// connect handles the connection logic with proper delays and priority.
-// It attempts WebSocket connection first, falling back to SSH server if needed.
-func (c *ConnectionManager) connect() {
-	c.isConnecting = true
-	defer func() {
-		c.isConnecting = false
-	}()
-
-	if c.wsClient != nil && time.Since(c.wsClient.lastConnectAttempt) < 5*time.Second {
-		time.Sleep(5 * time.Second)
-	}
-
-	// Try WebSocket first, if it fails, start SSH server
-	err := c.startWebSocketConnection()
-	if err != nil && c.State == Disconnected {
-		c.startSSHServer()
-		c.startWsTicker()
-	}
-}
-
-// startWebSocketConnection attempts to establish a WebSocket connection to the hub.
-func (c *ConnectionManager) startWebSocketConnection() error {
-	if c.State != Disconnected {
-		return errors.New("already connected")
-	}
-	if c.wsClient == nil {
-		return errors.New("WebSocket client not initialized")
-	}
-	if time.Since(c.wsClient.lastConnectAttempt) < 5*time.Second {
-		return errors.New("already connecting")
-	}
-
-	err := c.wsClient.Connect()
-	if err != nil {
-		slog.Warn("WebSocket connection failed", "err", err)
-		c.closeWebSocket()
-	}
-	return err
-}
-
-// startSSHServer starts the SSH server if the agent is currently disconnected.
-func (c *ConnectionManager) startSSHServer() {
-	if c.State == Disconnected {
-		go c.agent.StartServer(c.serverOptions)
-	}
-}
-
-// closeWebSocket closes the WebSocket connection if it exists.
-func (c *ConnectionManager) closeWebSocket() {
-	if c.wsClient != nil {
-		c.wsClient.Close()
-	}
-}
--- a/beszel/internal/agent/connection_manager_test.go
+++ b/beszel/internal/agent/connection_manager_test.go
@@ -1,315 +0,0 @@
-//go:build testing
-// +build testing
-
-package agent
-
-import (
-	"crypto/ed25519"
-	"fmt"
-	"net"
-	"net/url"
-	"os"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"golang.org/x/crypto/ssh"
-)
-
-func createTestAgent(t *testing.T) *Agent {
-	dataDir := t.TempDir()
-	agent, err := NewAgent(dataDir)
-	require.NoError(t, err)
-	return agent
-}
-
-func createTestServerOptions(t *testing.T) ServerOptions {
-	// Generate test key pair
-	_, privKey, err := ed25519.GenerateKey(nil)
-	require.NoError(t, err)
-	sshPubKey, err := ssh.NewPublicKey(privKey.Public().(ed25519.PublicKey))
-	require.NoError(t, err)
-
-	// Find available port
-	listener, err := net.Listen("tcp", "127.0.0.1:0")
-	require.NoError(t, err)
-	port := listener.Addr().(*net.TCPAddr).Port
-	listener.Close()
-
-	return ServerOptions{
-		Network: "tcp",
-		Addr:    fmt.Sprintf("127.0.0.1:%d", port),
-		Keys:    []ssh.PublicKey{sshPubKey},
-	}
-}
-
-// TestConnectionManager_NewConnectionManager tests connection manager creation
-func TestConnectionManager_NewConnectionManager(t *testing.T) {
-	agent := createTestAgent(t)
-	cm := newConnectionManager(agent)
-
-	assert.NotNil(t, cm, "Connection manager should not be nil")
-	assert.Equal(t, agent, cm.agent, "Agent reference should be set")
-	assert.Equal(t, Disconnected, cm.State, "Initial state should be Disconnected")
-	assert.Nil(t, cm.eventChan, "Event channel should be nil initially")
-	assert.Nil(t, cm.wsClient, "WebSocket client should be nil initially")
-	assert.Nil(t, cm.wsTicker, "WebSocket ticker should be nil initially")
-	assert.False(t, cm.isConnecting, "isConnecting should be false initially")
-}
-
-// TestConnectionManager_StateTransitions tests basic state transitions
-func TestConnectionManager_StateTransitions(t *testing.T) {
-	agent := createTestAgent(t)
-	cm := agent.connectionManager
-	initialState := cm.State
-	cm.wsClient = &WebSocketClient{
-		hubURL: &url.URL{
-			Host: "localhost:8080",
-		},
-	}
-	assert.NotNil(t, cm, "Connection manager should not be nil")
-	assert.Equal(t, Disconnected, initialState, "Initial state should be Disconnected")
-
-	// Test state transitions
-	cm.handleStateChange(WebSocketConnected)
-	assert.Equal(t, WebSocketConnected, cm.State, "State should change to WebSocketConnected")
-
-	cm.handleStateChange(SSHConnected)
-	assert.Equal(t, SSHConnected, cm.State, "State should change to SSHConnected")
-
-	cm.handleStateChange(Disconnected)
-	assert.Equal(t, Disconnected, cm.State, "State should change to Disconnected")
-
-	// Test that same state doesn't trigger changes
-	cm.State = WebSocketConnected
-	cm.handleStateChange(WebSocketConnected)
-	assert.Equal(t, WebSocketConnected, cm.State, "Same state should not trigger change")
-}
-
-// TestConnectionManager_EventHandling tests event handling logic
-func TestConnectionManager_EventHandling(t *testing.T) {
-	agent := createTestAgent(t)
-	cm := agent.connectionManager
-	cm.wsClient = &WebSocketClient{
-		hubURL: &url.URL{
-			Host: "localhost:8080",
-		},
-	}
-
-	testCases := []struct {
-		name          string
-		initialState  ConnectionState
-		event         ConnectionEvent
-		expectedState ConnectionState
-	}{
-		{
-			name:          "WebSocket connect from disconnected",
-			initialState:  Disconnected,
-			event:         WebSocketConnect,
-			expectedState: WebSocketConnected,
-		},
-		{
-			name:          "SSH connect from disconnected",
-			initialState:  Disconnected,
-			event:         SSHConnect,
-			expectedState: SSHConnected,
-		},
-		{
-			name:          "WebSocket disconnect from connected",
-			initialState:  WebSocketConnected,
-			event:         WebSocketDisconnect,
-			expectedState: Disconnected,
-		},
-		{
-			name:          "SSH disconnect from connected",
-			initialState:  SSHConnected,
-			event:         SSHDisconnect,
-			expectedState: Disconnected,
-		},
-		{
-			name:          "WebSocket disconnect from SSH connected (no change)",
-			initialState:  SSHConnected,
-			event:         WebSocketDisconnect,
-			expectedState: SSHConnected,
-		},
-		{
-			name:          "SSH disconnect from WebSocket connected (no change)",
-			initialState:  WebSocketConnected,
-			event:         SSHDisconnect,
-			expectedState: WebSocketConnected,
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			cm.State = tc.initialState
-			cm.handleEvent(tc.event)
-			assert.Equal(t, tc.expectedState, cm.State, "State should match expected after event")
-		})
-	}
-}
-
-// TestConnectionManager_TickerManagement tests WebSocket ticker management
-func TestConnectionManager_TickerManagement(t *testing.T) {
-	agent := createTestAgent(t)
-	cm := agent.connectionManager
-
-	// Test starting ticker
-	cm.startWsTicker()
-	assert.NotNil(t, cm.wsTicker, "Ticker should be created")
-
-	// Test stopping ticker (should not panic)
-	assert.NotPanics(t, func() {
-		cm.stopWsTicker()
-	}, "Stopping ticker should not panic")
-
-	// Test stopping nil ticker (should not panic)
-	cm.wsTicker = nil
-	assert.NotPanics(t, func() {
-		cm.stopWsTicker()
-	}, "Stopping nil ticker should not panic")
-
-	// Test restarting ticker
-	cm.startWsTicker()
-	assert.NotNil(t, cm.wsTicker, "Ticker should be recreated")
-
-	// Test resetting existing ticker
-	firstTicker := cm.wsTicker
-	cm.startWsTicker()
-	assert.Equal(t, firstTicker, cm.wsTicker, "Same ticker instance should be reused")
-
-	cm.stopWsTicker()
-}
-
-// TestConnectionManager_WebSocketConnectionFlow tests WebSocket connection logic
-func TestConnectionManager_WebSocketConnectionFlow(t *testing.T) {
-	if testing.Short() {
-		t.Skip("Skipping WebSocket connection test in short mode")
-	}
-
-	agent := createTestAgent(t)
-	cm := agent.connectionManager
-
-	// Test WebSocket connection without proper environment
-	err := cm.startWebSocketConnection()
-	assert.Error(t, err, "WebSocket connection should fail without proper environment")
-	assert.Equal(t, Disconnected, cm.State, "State should remain Disconnected after failed connection")
-
-	// Test with invalid URL
-	os.Setenv("BESZEL_AGENT_HUB_URL", "invalid-url")
-	os.Setenv("BESZEL_AGENT_TOKEN", "test-token")
-	defer func() {
-		os.Unsetenv("BESZEL_AGENT_HUB_URL")
-		os.Unsetenv("BESZEL_AGENT_TOKEN")
-	}()
-
-	// Test with missing token
-	os.Setenv("BESZEL_AGENT_HUB_URL", "http://localhost:8080")
-	os.Unsetenv("BESZEL_AGENT_TOKEN")
-
-	_, err2 := newWebSocketClient(agent)
-	assert.Error(t, err2, "WebSocket client creation should fail without token")
-}
-
-// TestConnectionManager_ReconnectionLogic tests reconnection prevention logic
-func TestConnectionManager_ReconnectionLogic(t *testing.T) {
-	agent := createTestAgent(t)
-	cm := agent.connectionManager
-	cm.eventChan = make(chan ConnectionEvent, 1)
-
-	// Test that isConnecting flag prevents duplicate reconnection attempts
-	// Start from connected state, then simulate disconnect
-	cm.State = WebSocketConnected
-	cm.isConnecting = false
-
-	// First disconnect should trigger reconnection logic
-	cm.handleStateChange(Disconnected)
-	assert.Equal(t, Disconnected, cm.State, "Should change to disconnected")
-	assert.True(t, cm.isConnecting, "Should set isConnecting flag")
-}
-
-// TestConnectionManager_ConnectWithRateLimit tests connection rate limiting
-func TestConnectionManager_ConnectWithRateLimit(t *testing.T) {
-	agent := createTestAgent(t)
-	cm := agent.connectionManager
-
-	// Set up environment for WebSocket client creation
-	os.Setenv("BESZEL_AGENT_HUB_URL", "ws://localhost:8080")
-	os.Setenv("BESZEL_AGENT_TOKEN", "test-token")
-	defer func() {
-		os.Unsetenv("BESZEL_AGENT_HUB_URL")
-		os.Unsetenv("BESZEL_AGENT_TOKEN")
-	}()
-
-	// Create WebSocket client
-	wsClient, err := newWebSocketClient(agent)
-	require.NoError(t, err)
-	cm.wsClient = wsClient
-
-	// Set recent connection attempt
-	cm.wsClient.lastConnectAttempt = time.Now()
-
-	// Test that connection is rate limited
-	err = cm.startWebSocketConnection()
-	assert.Error(t, err, "Should error due to rate limiting")
-	assert.Contains(t, err.Error(), "already connecting", "Error should indicate rate limiting")
-
-	// Test connection after rate limit expires
-	cm.wsClient.lastConnectAttempt = time.Now().Add(-10 * time.Second)
-	err = cm.startWebSocketConnection()
-	// This will fail due to no actual server, but should not be rate limited
-	assert.Error(t, err, "Connection should fail but not due to rate limiting")
-	assert.NotContains(t, err.Error(), "already connecting", "Error should not indicate rate limiting")
-}
-
-// TestConnectionManager_StartWithInvalidConfig tests starting with invalid configuration
-func TestConnectionManager_StartWithInvalidConfig(t *testing.T) {
-	agent := createTestAgent(t)
-	cm := agent.connectionManager
-	serverOptions := createTestServerOptions(t)
-
-	// Test starting when already started
-	cm.eventChan = make(chan ConnectionEvent, 5)
-	err := cm.Start(serverOptions)
-	assert.Error(t, err, "Should error when starting already started connection manager")
-}
-
-// TestConnectionManager_CloseWebSocket tests WebSocket closing
-func TestConnectionManager_CloseWebSocket(t *testing.T) {
-	agent := createTestAgent(t)
-	cm := agent.connectionManager
-
-	// Test closing when no WebSocket client exists
-	assert.NotPanics(t, func() {
-		cm.closeWebSocket()
-	}, "Should not panic when closing nil WebSocket client")
-
-	// Set up environment and create WebSocket client
-	os.Setenv("BESZEL_AGENT_HUB_URL", "ws://localhost:8080")
-	os.Setenv("BESZEL_AGENT_TOKEN", "test-token")
-	defer func() {
-		os.Unsetenv("BESZEL_AGENT_HUB_URL")
-		os.Unsetenv("BESZEL_AGENT_TOKEN")
-	}()
-
-	wsClient, err := newWebSocketClient(agent)
-	require.NoError(t, err)
-	cm.wsClient = wsClient
-
-	// Test closing when WebSocket client exists
-	assert.NotPanics(t, func() {
-		cm.closeWebSocket()
-	}, "Should not panic when closing WebSocket client")
-}
-
-// TestConnectionManager_ConnectFlow tests the connect method
-func TestConnectionManager_ConnectFlow(t *testing.T) {
-	agent := createTestAgent(t)
-	cm := agent.connectionManager
-
-	// Test connect without WebSocket client
-	assert.NotPanics(t, func() {
-		cm.connect()
-	}, "Connect should not panic without WebSocket client")
-}
--- a/beszel/internal/agent/data_dir.go
+++ b/beszel/internal/agent/data_dir.go
@@ -1,122 +0,0 @@
-package agent
-
-import (
-	"errors"
-	"fmt"
-	"os"
-	"path/filepath"
-	"runtime"
-)
-
-// getDataDir returns the path to the data directory for the agent and an error
-// if the directory is not valid. Pass an empty string to attempt to find the
-// optimal data directory.
-func getDataDir(dataDir string) (string, error) {
-	if dataDir == "" {
-		dataDir, _ = GetEnv("DATA_DIR")
-	}
-
-	if dataDir != "" {
-		return testDataDirs([]string{dataDir})
-	}
-
-	var dirsToTry []string
-
-	if runtime.GOOS == "windows" {
-		dirsToTry = []string{
-			filepath.Join(os.Getenv("APPDATA"), "beszel-agent"),
-			filepath.Join(os.Getenv("LOCALAPPDATA"), "beszel-agent"),
-		}
-	} else {
-		homeDir, err := os.UserHomeDir()
-		if err != nil {
-			return "", err
-		}
-		dirsToTry = []string{
-			"/var/lib/beszel-agent",
-			filepath.Join(homeDir, ".config", "beszel"),
-		}
-	}
-	return testDataDirs(dirsToTry)
-}
-
-func testDataDirs(paths []string) (string, error) {
-	// first check if the directory exists and is writable
-	for _, path := range paths {
-		if valid, _ := isValidDataDir(path, false); valid {
-			return path, nil
-		}
-	}
-	// if the directory doesn't exist, try to create it
-	for _, path := range paths {
-		exists, _ := directoryExists(path)
-		if exists {
-			continue
-		}
-
-		if err := os.MkdirAll(path, 0755); err != nil {
-			continue
-		}
-
-		// Verify the created directory is actually writable
-		writable, _ := directoryIsWritable(path)
-		if !writable {
-			continue
-		}
-
-		return path, nil
-	}
-
-	return "", errors.New("data directory not found")
-}
-
-func isValidDataDir(path string, createIfNotExists bool) (bool, error) {
-	exists, err := directoryExists(path)
-	if err != nil {
-		return false, err
-	}
-
-	if !exists {
-		if !createIfNotExists {
-			return false, nil
-		}
-		if err = os.MkdirAll(path, 0755); err != nil {
-			return false, err
-		}
-	}
-
-	// Always check if the directory is writable
-	writable, err := directoryIsWritable(path)
-	if err != nil {
-		return false, err
-	}
-	return writable, nil
-}
-
-// directoryExists checks if a directory exists
-func directoryExists(path string) (bool, error) {
-	// Check if directory exists
-	stat, err := os.Stat(path)
-	if err != nil {
-		if os.IsNotExist(err) {
-			return false, nil
-		}
-		return false, err
-	}
-	if !stat.IsDir() {
-		return false, fmt.Errorf("%s is not a directory", path)
-	}
-	return true, nil
-}
-
-// directoryIsWritable tests if a directory is writable by creating and removing a temporary file
-func directoryIsWritable(path string) (bool, error) {
-	testFile := filepath.Join(path, ".write-test")
-	file, err := os.Create(testFile)
-	if err != nil {
-		return false, err
-	}
-	defer file.Close()
-	defer os.Remove(testFile)
-	return true, nil
-}
--- a/beszel/internal/agent/data_dir_test.go
+++ b/beszel/internal/agent/data_dir_test.go
@@ -1,263 +0,0 @@
-//go:build testing
-// +build testing
-
-package agent
-
-import (
-	"os"
-	"path/filepath"
-	"runtime"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func TestGetDataDir(t *testing.T) {
-	// Test with explicit dataDir parameter
-	t.Run("explicit data dir", func(t *testing.T) {
-		tempDir := t.TempDir()
-		result, err := getDataDir(tempDir)
-		require.NoError(t, err)
-		assert.Equal(t, tempDir, result)
-	})
-
-	// Test with explicit non-existent dataDir that can be created
-	t.Run("explicit data dir - create new", func(t *testing.T) {
-		tempDir := t.TempDir()
-		newDir := filepath.Join(tempDir, "new-data-dir")
-		result, err := getDataDir(newDir)
-		require.NoError(t, err)
-		assert.Equal(t, newDir, result)
-
-		// Verify directory was created
-		stat, err := os.Stat(newDir)
-		require.NoError(t, err)
-		assert.True(t, stat.IsDir())
-	})
-
-	// Test with DATA_DIR environment variable
-	t.Run("DATA_DIR environment variable", func(t *testing.T) {
-		tempDir := t.TempDir()
-
-		// Set environment variable
-		oldValue := os.Getenv("DATA_DIR")
-		defer func() {
-			if oldValue == "" {
-				os.Unsetenv("DATA_DIR")
-			} else {
-				os.Setenv("DATA_DIR", oldValue)
-			}
-		}()
-
-		os.Setenv("DATA_DIR", tempDir)
-
-		result, err := getDataDir("")
-		require.NoError(t, err)
-		assert.Equal(t, tempDir, result)
-	})
-
-	// Test with invalid explicit dataDir
-	t.Run("invalid explicit data dir", func(t *testing.T) {
-		invalidPath := "/invalid/path/that/cannot/be/created"
-		_, err := getDataDir(invalidPath)
-		assert.Error(t, err)
-	})
-
-	// Test fallback behavior (empty dataDir, no env var)
-	t.Run("fallback to default directories", func(t *testing.T) {
-		// Clear DATA_DIR environment variable
-		oldValue := os.Getenv("DATA_DIR")
-		defer func() {
-			if oldValue == "" {
-				os.Unsetenv("DATA_DIR")
-			} else {
-				os.Setenv("DATA_DIR", oldValue)
-			}
-		}()
-		os.Unsetenv("DATA_DIR")
-
-		// This will try platform-specific defaults, which may or may not work
-		// We're mainly testing that it doesn't panic and returns some result
-		result, err := getDataDir("")
-		// We don't assert success/failure here since it depends on system permissions
-		// Just verify we get a string result if no error
-		if err == nil {
-			assert.NotEmpty(t, result)
-		}
-	})
-}
-
-func TestTestDataDirs(t *testing.T) {
-	// Test with existing valid directory
-	t.Run("existing valid directory", func(t *testing.T) {
-		tempDir := t.TempDir()
-		result, err := testDataDirs([]string{tempDir})
-		require.NoError(t, err)
-		assert.Equal(t, tempDir, result)
-	})
-
-	// Test with multiple directories, first one valid
-	t.Run("multiple dirs - first valid", func(t *testing.T) {
-		tempDir := t.TempDir()
-		invalidDir := "/invalid/path"
-		result, err := testDataDirs([]string{tempDir, invalidDir})
-		require.NoError(t, err)
-		assert.Equal(t, tempDir, result)
-	})
-
-	// Test with multiple directories, second one valid
-	t.Run("multiple dirs - second valid", func(t *testing.T) {
-		tempDir := t.TempDir()
-		invalidDir := "/invalid/path"
-		result, err := testDataDirs([]string{invalidDir, tempDir})
-		require.NoError(t, err)
-		assert.Equal(t, tempDir, result)
-	})
-
-	// Test with non-existing directory that can be created
-	t.Run("create new directory", func(t *testing.T) {
-		tempDir := t.TempDir()
-		newDir := filepath.Join(tempDir, "new-dir")
-		result, err := testDataDirs([]string{newDir})
-		require.NoError(t, err)
-		assert.Equal(t, newDir, result)
-
-		// Verify directory was created
-		stat, err := os.Stat(newDir)
-		require.NoError(t, err)
-		assert.True(t, stat.IsDir())
-	})
-
-	// Test with no valid directories
-	t.Run("no valid directories", func(t *testing.T) {
-		invalidPaths := []string{"/invalid/path1", "/invalid/path2"}
-		_, err := testDataDirs(invalidPaths)
-		assert.Error(t, err)
-		assert.Contains(t, err.Error(), "data directory not found")
-	})
-}
-
-func TestIsValidDataDir(t *testing.T) {
-	// Test with existing directory
-	t.Run("existing directory", func(t *testing.T) {
-		tempDir := t.TempDir()
-		valid, err := isValidDataDir(tempDir, false)
-		require.NoError(t, err)
-		assert.True(t, valid)
-	})
-
-	// Test with non-existing directory, createIfNotExists=false
-	t.Run("non-existing dir - no create", func(t *testing.T) {
-		tempDir := t.TempDir()
-		nonExistentDir := filepath.Join(tempDir, "does-not-exist")
-		valid, err := isValidDataDir(nonExistentDir, false)
-		require.NoError(t, err)
-		assert.False(t, valid)
-	})
-
-	// Test with non-existing directory, createIfNotExists=true
-	t.Run("non-existing dir - create", func(t *testing.T) {
-		tempDir := t.TempDir()
-		newDir := filepath.Join(tempDir, "new-dir")
-		valid, err := isValidDataDir(newDir, true)
-		require.NoError(t, err)
-		assert.True(t, valid)
-
-		// Verify directory was created
-		stat, err := os.Stat(newDir)
-		require.NoError(t, err)
-		assert.True(t, stat.IsDir())
-	})
-
-	// Test with file instead of directory
-	t.Run("file instead of directory", func(t *testing.T) {
-		tempDir := t.TempDir()
-		tempFile := filepath.Join(tempDir, "testfile")
-		err := os.WriteFile(tempFile, []byte("test"), 0644)
-		require.NoError(t, err)
-
-		valid, err := isValidDataDir(tempFile, false)
-		assert.Error(t, err)
-		assert.False(t, valid)
-		assert.Contains(t, err.Error(), "is not a directory")
-	})
-}
-
-func TestDirectoryExists(t *testing.T) {
-	// Test with existing directory
-	t.Run("existing directory", func(t *testing.T) {
-		tempDir := t.TempDir()
-		exists, err := directoryExists(tempDir)
-		require.NoError(t, err)
-		assert.True(t, exists)
-	})
-
-	// Test with non-existing directory
-	t.Run("non-existing directory", func(t *testing.T) {
-		tempDir := t.TempDir()
-		nonExistentDir := filepath.Join(tempDir, "does-not-exist")
-		exists, err := directoryExists(nonExistentDir)
-		require.NoError(t, err)
-		assert.False(t, exists)
-	})
-
-	// Test with file instead of directory
-	t.Run("file instead of directory", func(t *testing.T) {
-		tempDir := t.TempDir()
-		tempFile := filepath.Join(tempDir, "testfile")
-		err := os.WriteFile(tempFile, []byte("test"), 0644)
-		require.NoError(t, err)
-
-		exists, err := directoryExists(tempFile)
-		assert.Error(t, err)
-		assert.False(t, exists)
-		assert.Contains(t, err.Error(), "is not a directory")
-	})
-}
-
-func TestDirectoryIsWritable(t *testing.T) {
-	// Test with writable directory
-	t.Run("writable directory", func(t *testing.T) {
-		tempDir := t.TempDir()
-		writable, err := directoryIsWritable(tempDir)
-		require.NoError(t, err)
-		assert.True(t, writable)
-	})
-
-	// Test with non-existing directory
-	t.Run("non-existing directory", func(t *testing.T) {
-		tempDir := t.TempDir()
-		nonExistentDir := filepath.Join(tempDir, "does-not-exist")
-		writable, err := directoryIsWritable(nonExistentDir)
-		assert.Error(t, err)
-		assert.False(t, writable)
-	})
-
-	// Test with non-writable directory (Unix-like systems only)
-	t.Run("non-writable directory", func(t *testing.T) {
-		if runtime.GOOS != "linux" && runtime.GOOS != "darwin" {
-			t.Skip("Skipping non-writable directory test on", runtime.GOOS)
-		}
-
-		tempDir := t.TempDir()
-		readOnlyDir := filepath.Join(tempDir, "readonly")
-
-		// Create the directory
-		err := os.Mkdir(readOnlyDir, 0755)
-		require.NoError(t, err)
-
-		// Make it read-only
-		err = os.Chmod(readOnlyDir, 0444)
-		require.NoError(t, err)
-
-		// Restore permissions after test for cleanup
-		defer func() {
-			os.Chmod(readOnlyDir, 0755)
-		}()
-
-		writable, err := directoryIsWritable(readOnlyDir)
-		assert.Error(t, err)
-		assert.False(t, writable)
-	})
-}
--- a/beszel/internal/agent/docker.go
+++ b/beszel/internal/agent/docker.go
@@ -2,7 +2,6 @@ package agent

 import (
 	"beszel/internal/entities/container"
-	"bytes"
 	"context"
 	"encoding/json"
 	"fmt"
@@ -28,9 +27,6 @@ type dockerManager struct {
 	validIds            map[string]struct{}         // Map of valid container ids, used to prune invalid containers from containerStatsMap
 	goodDockerVersion   bool                        // Whether docker version is at least 25.0.0 (one-shot works correctly)
 	isWindows           bool                        // Whether the Docker Engine API is running on Windows
-	buf                 *bytes.Buffer               // Buffer to store and read response bodies
-	decoder             *json.Decoder               // Reusable JSON decoder that reads from buf
-	apiStats            *container.ApiStats         // Reusable API stats object
 }

 // userAgentRoundTripper is a custom http.RoundTripper that adds a User-Agent header to all requests
@@ -67,9 +63,10 @@ func (dm *dockerManager) getDockerStats() ([]*container.Stats, error) {
 	if err != nil {
 		return nil, err
 	}
+	defer resp.Body.Close()

 	dm.apiContainerList = dm.apiContainerList[:0]
-	if err := dm.decode(resp, &dm.apiContainerList); err != nil {
+	if err := json.NewDecoder(resp.Body).Decode(&dm.apiContainerList); err != nil {
 		return nil, err
 	}

@@ -86,8 +83,7 @@ func (dm *dockerManager) getDockerStats() ([]*container.Stats, error) {

 	var failedContainers []*container.ApiInfo

-	for i := range dm.apiContainerList {
-		ctr := dm.apiContainerList[i]
+	for _, ctr := range dm.apiContainerList {
 		ctr.IdShort = ctr.Id[:12]
 		dm.validIds[ctr.IdShort] = struct{}{}
 		// check if container is less than 1 minute old (possible restart)
@@ -115,8 +111,7 @@ func (dm *dockerManager) getDockerStats() ([]*container.Stats, error) {
 	// retry failed containers separately so we can run them in parallel (docker 24 bug)
 	if len(failedContainers) > 0 {
 		slog.Debug("Retrying failed containers", "count", len(failedContainers))
-		for i := range failedContainers {
-			ctr := failedContainers[i]
+		for _, ctr := range failedContainers {
 			dm.queue()
 			go func() {
 				defer dm.dequeue()
@@ -169,13 +164,8 @@ func (dm *dockerManager) updateContainerStats(ctr *container.ApiInfo) error {
 	stats.NetworkRecv = 0

 	// docker host container stats response
-	// res := dm.getApiStats()
-	// defer dm.putApiStats(res)
-	//
-
-	res := dm.apiStats
-	res.Networks = nil
-	if err := dm.decode(resp, res); err != nil {
+	var res container.ApiStats
+	if err := json.NewDecoder(resp.Body).Decode(&res); err != nil {
 		return err
 	}

@@ -183,14 +173,9 @@ func (dm *dockerManager) updateContainerStats(ctr *container.ApiInfo) error {
 	var usedMemory uint64
 	var cpuPct float64

-	// store current cpu stats
-	prevCpuContainer, prevCpuSystem := stats.CpuContainer, stats.CpuSystem
-	stats.CpuContainer = res.CPUStats.CPUUsage.TotalUsage
-	stats.CpuSystem = res.CPUStats.SystemUsage
-
 	if dm.isWindows {
 		usedMemory = res.MemoryStats.PrivateWorkingSet
-		cpuPct = res.CalculateCpuPercentWindows(prevCpuContainer, stats.PrevReadTime)
+		cpuPct = res.CalculateCpuPercentWindows(stats.PrevCpu[0], stats.PrevRead)
 	} else {
 		// check if container has valid data, otherwise may be in restart loop (#103)
 		if res.MemoryStats.Usage == 0 {
@@ -202,12 +187,13 @@ func (dm *dockerManager) updateContainerStats(ctr *container.ApiInfo) error {
 		}
 		usedMemory = res.MemoryStats.Usage - memCache

-		cpuPct = res.CalculateCpuPercentLinux(prevCpuContainer, prevCpuSystem)
+		cpuPct = res.CalculateCpuPercentLinux(stats.PrevCpu)
 	}

 	if cpuPct > 100 {
 		return fmt.Errorf("%s cpu pct greater than 100: %+v", name, cpuPct)
 	}
+	stats.PrevCpu = [2]uint64{res.CPUStats.CPUUsage.TotalUsage, res.CPUStats.SystemUsage}

 	// network
 	var total_sent, total_recv uint64
@@ -215,25 +201,21 @@ func (dm *dockerManager) updateContainerStats(ctr *container.ApiInfo) error {
 		total_sent += v.TxBytes
 		total_recv += v.RxBytes
 	}
-	var sent_delta, recv_delta uint64
-	millisecondsElapsed := uint64(time.Since(stats.PrevReadTime).Milliseconds())
-	if initialized && millisecondsElapsed > 0 {
-		// get bytes per second
-		sent_delta = (total_sent - stats.PrevNet.Sent) * 1000 / millisecondsElapsed
-		recv_delta = (total_recv - stats.PrevNet.Recv) * 1000 / millisecondsElapsed
-		// check for unrealistic network values (> 5GB/s)
-		if sent_delta > 5e9 || recv_delta > 5e9 {
-			slog.Warn("Bad network delta", "container", name)
-			sent_delta, recv_delta = 0, 0
-		}
+	var sent_delta, recv_delta float64
+	// prevent first run from sending all prev sent/recv bytes
+	if initialized {
+		secondsElapsed := time.Since(stats.PrevRead).Seconds()
+		sent_delta = float64(total_sent-stats.PrevNet.Sent) / secondsElapsed
+		recv_delta = float64(total_recv-stats.PrevNet.Recv) / secondsElapsed
 	}
-	stats.PrevNet.Sent, stats.PrevNet.Recv = total_sent, total_recv
+	stats.PrevNet.Sent = total_sent
+	stats.PrevNet.Recv = total_recv

 	stats.Cpu = twoDecimals(cpuPct)
 	stats.Mem = bytesToMegabytes(float64(usedMemory))
-	stats.NetworkSent = bytesToMegabytes(float64(sent_delta))
-	stats.NetworkRecv = bytesToMegabytes(float64(recv_delta))
-	stats.PrevReadTime = res.Read
+	stats.NetworkSent = bytesToMegabytes(sent_delta)
+	stats.NetworkRecv = bytesToMegabytes(recv_delta)
+	stats.PrevRead = res.Read

 	return nil
 }
@@ -249,6 +231,7 @@ func (dm *dockerManager) deleteContainerStatsSync(id string) {
 func newDockerManager(a *Agent) *dockerManager {
 	dockerHost, exists := GetEnv("DOCKER_HOST")
 	if exists {
+		slog.Info("DOCKER_HOST", "host", dockerHost)
 		// return nil if set to empty string
 		if dockerHost == "" {
 			return nil
@@ -259,6 +242,7 @@ func newDockerManager(a *Agent) *dockerManager {

 	parsedURL, err := url.Parse(dockerHost)
 	if err != nil {
+		slog.Error("Error parsing DOCKER_HOST", "err", err)
 		os.Exit(1)
 	}

@@ -306,7 +290,6 @@ func newDockerManager(a *Agent) *dockerManager {
 		containerStatsMap: make(map[string]*container.Stats),
 		sem:               make(chan struct{}, 5),
 		apiContainerList:  []*container.ApiInfo{},
-		apiStats:          &container.ApiStats{},
 	}

 	// If using podman, return client
@@ -325,8 +308,9 @@ func newDockerManager(a *Agent) *dockerManager {
 	if err != nil {
 		return manager
 	}
+	defer resp.Body.Close()

-	if err := manager.decode(resp, &versionInfo); err != nil {
+	if err := json.NewDecoder(resp.Body).Decode(&versionInfo); err != nil {
 		return manager
 	}

@@ -340,22 +324,6 @@ func newDockerManager(a *Agent) *dockerManager {
 	return manager
 }

-// Decodes Docker API JSON response using a reusable buffer and decoder. Not thread safe.
-func (dm *dockerManager) decode(resp *http.Response, d any) error {
-	if dm.buf == nil {
-		// initialize buffer with 256kb starting size
-		dm.buf = bytes.NewBuffer(make([]byte, 0, 1024*256))
-		dm.decoder = json.NewDecoder(dm.buf)
-	}
-	defer resp.Body.Close()
-	defer dm.buf.Reset()
-	_, err := dm.buf.ReadFrom(resp.Body)
-	if err != nil {
-		return err
-	}
-	return dm.decoder.Decode(d)
-}
-
 // Test docker / podman sockets and return if one exists
 func getDockerHost() string {
 	scheme := "unix://"
--- a/beszel/internal/agent/gpu.go
+++ b/beszel/internal/agent/gpu.go
@@ -18,24 +18,24 @@ import (

 const (
 	// Commands
-	nvidiaSmiCmd  string = "nvidia-smi"
-	rocmSmiCmd    string = "rocm-smi"
-	tegraStatsCmd string = "tegrastats"
+	nvidiaSmiCmd  = "nvidia-smi"
+	rocmSmiCmd    = "rocm-smi"
+	tegraStatsCmd = "tegrastats"

 	// Polling intervals
-	nvidiaSmiInterval  string        = "4"    // in seconds
-	tegraStatsInterval string        = "3700" // in milliseconds
-	rocmSmiInterval    time.Duration = 4300 * time.Millisecond
+	nvidiaSmiInterval  = "4"    // in seconds
+	tegraStatsInterval = "3700" // in milliseconds
+	rocmSmiInterval    = 4300 * time.Millisecond

 	// Command retry and timeout constants
-	retryWaitTime     time.Duration = 5 * time.Second
-	maxFailureRetries int           = 5
+	retryWaitTime     = 5 * time.Second
+	maxFailureRetries = 5

-	cmdBufferSize uint16 = 10 * 1024
+	cmdBufferSize = 10 * 1024

 	// Unit Conversions
-	mebibytesInAMegabyte float64 = 1.024  // nvidia-smi reports memory in MiB
-	milliwattsInAWatt    float64 = 1000.0 // tegrastats reports power in mW
+	mebibytesInAMegabyte = 1.024  // nvidia-smi reports memory in MiB
+	milliwattsInAWatt    = 1000.0 // tegrastats reports power in mW
 )

 // GPUManager manages data collection for GPUs (either Nvidia or AMD)
@@ -243,26 +243,21 @@ func (gm *GPUManager) GetCurrentData() map[string]system.GPUData {
 	// copy / reset the data
 	gpuData := make(map[string]system.GPUData, len(gm.GpuDataMap))
 	for id, gpu := range gm.GpuDataMap {
-		gpuAvg := *gpu
-
-		gpuAvg.Temperature = twoDecimals(gpu.Temperature)
-		gpuAvg.MemoryUsed = twoDecimals(gpu.MemoryUsed)
-		gpuAvg.MemoryTotal = twoDecimals(gpu.MemoryTotal)
-
-		// avoid division by zero
-		if gpu.Count > 0 {
-			gpuAvg.Usage = twoDecimals(gpu.Usage / gpu.Count)
-			gpuAvg.Power = twoDecimals(gpu.Power / gpu.Count)
-		}
-
-		// reset accumulators in the original
-		gpu.Usage, gpu.Power, gpu.Count = 0, 0, 0
-
+		// sum the data
+		gpu.Temperature = twoDecimals(gpu.Temperature)
+		gpu.MemoryUsed = twoDecimals(gpu.MemoryUsed)
+		gpu.MemoryTotal = twoDecimals(gpu.MemoryTotal)
+		gpu.Usage = twoDecimals(gpu.Usage / gpu.Count)
+		gpu.Power = twoDecimals(gpu.Power / gpu.Count)
+		// reset the count
+		gpu.Count = 1
+		// dereference to avoid overwriting anything else
+		gpuCopy := *gpu
 		// append id to the name if there are multiple GPUs with the same name
 		if nameCounts[gpu.Name] > 1 {
-			gpuAvg.Name = fmt.Sprintf("%s %s", gpu.Name, id)
+			gpuCopy.Name = fmt.Sprintf("%s %s", gpu.Name, id)
 		}
-		gpuData[id] = gpuAvg
+		gpuData[id] = gpuCopy
 	}
 	slog.Debug("GPU", "data", gpuData)
 	return gpuData
--- a/beszel/internal/agent/gpu_test.go
+++ b/beszel/internal/agent/gpu_test.go
@@ -279,19 +279,6 @@ func TestParseJetsonData(t *testing.T) {
 				Count:       1,
 			},
 		},
-		{
-			name:  "orin nano",
-			input: "06-18-2025 11:25:24 RAM 3452/7620MB (lfb 25x4MB) SWAP 1518/16384MB (cached 174MB) CPU [1%@1420,2%@1420,0%@1420,2%@1420,2%@729,1%@729] GR3D_FREQ 0% cpu@50.031C soc2@49.031C soc0@50C gpu@49.031C tj@50.25C soc1@50.25C VDD_IN 4824mW/4824mW VDD_CPU_GPU_CV 518mW/518mW VDD_SOC 1475mW/1475mW",
-			wantMetrics: &system.GPUData{
-				Name:        "GPU",
-				MemoryUsed:  3452.0,
-				MemoryTotal: 7620.0,
-				Usage:       0.0,
-				Temperature: 50.25,
-				Power:       0.518,
-				Count:       1,
-			},
-		},
 		{
 			name:  "missing temperature",
 			input: "11-14-2024 22:54:33 RAM 4300/30698MB GR3D_FREQ 45% VDD_GPU_SOC 2171mW",
@@ -331,85 +318,44 @@ func TestParseJetsonData(t *testing.T) {
 }

 func TestGetCurrentData(t *testing.T) {
-	t.Run("calculates averages and resets accumulators", func(t *testing.T) {
-		gm := &GPUManager{
-			GpuDataMap: map[string]*system.GPUData{
-				"0": {
-					Name:        "GPU1",
-					Temperature: 50,
-					MemoryUsed:  2048,
-					MemoryTotal: 4096,
-					Usage:       100, // 100 over 2 counts = 50 avg
-					Power:       200, // 200 over 2 counts = 100 avg
-					Count:       2,
-				},
-				"1": {
-					Name:        "GPU1",
-					Temperature: 60,
-					MemoryUsed:  3072,
-					MemoryTotal: 8192,
-					Usage:       30,
-					Power:       60,
-					Count:       1,
-				},
-				"2": {
-					Name:        "GPU 2",
-					Temperature: 70,
-					MemoryUsed:  4096,
-					MemoryTotal: 8192,
-					Usage:       200,
-					Power:       400,
-					Count:       1,
-				},
+	gm := &GPUManager{
+		GpuDataMap: map[string]*system.GPUData{
+			"0": {
+				Name:        "GPU1",
+				Temperature: 50,
+				MemoryUsed:  2048,
+				MemoryTotal: 4096,
+				Usage:       100, // 100 over 2 counts = 50 avg
+				Power:       200, // 200 over 2 counts = 100 avg
+				Count:       2,
 			},
-		}
-
-		result := gm.GetCurrentData()
-
-		// Verify name disambiguation
-		assert.Equal(t, "GPU1 0", result["0"].Name)
-		assert.Equal(t, "GPU1 1", result["1"].Name)
-		assert.Equal(t, "GPU 2", result["2"].Name)
-
-		// Check averaged values in the result
-		assert.InDelta(t, 50.0, result["0"].Usage, 0.01)
-		assert.InDelta(t, 100.0, result["0"].Power, 0.01)
-		assert.InDelta(t, 30.0, result["1"].Usage, 0.01)
-		assert.InDelta(t, 60.0, result["1"].Power, 0.01)
-
-		// Verify that accumulators in the original map are reset
-		assert.Equal(t, float64(0), gm.GpuDataMap["0"].Count, "GPU 0 Count should be reset")
-		assert.Equal(t, float64(0), gm.GpuDataMap["0"].Usage, "GPU 0 Usage should be reset")
-		assert.Equal(t, float64(0), gm.GpuDataMap["0"].Power, "GPU 0 Power should be reset")
-		assert.Equal(t, float64(0), gm.GpuDataMap["1"].Count, "GPU 1 Count should be reset")
-		assert.Equal(t, float64(0), gm.GpuDataMap["1"].Usage, "GPU 1 Usage should be reset")
-		assert.Equal(t, float64(0), gm.GpuDataMap["1"].Power, "GPU 1 Power should be reset")
-	})
-
-	t.Run("handles zero count without panicking", func(t *testing.T) {
-		gm := &GPUManager{
-			GpuDataMap: map[string]*system.GPUData{
-				"0": {
-					Name:  "TestGPU",
-					Count: 0,
-					Usage: 0,
-					Power: 0,
-				},
+			"1": {
+				Name:        "GPU1",
+				Temperature: 60,
+				MemoryUsed:  3072,
+				MemoryTotal: 8192,
+				Usage:       30,
+				Power:       60,
+				Count:       1,
 			},
-		}
+		},
+	}

-		var result map[string]system.GPUData
-		assert.NotPanics(t, func() {
-			result = gm.GetCurrentData()
-		})
+	result := gm.GetCurrentData()

-		// Check that usage and power are 0
-		assert.Equal(t, 0.0, result["0"].Usage)
-		assert.Equal(t, 0.0, result["0"].Power)
+	// Verify name disambiguation
+	assert.Equal(t, "GPU1 0", result["0"].Name)
+	assert.Equal(t, "GPU1 1", result["1"].Name)

-		// Verify reset count
-		assert.Equal(t, float64(0), gm.GpuDataMap["0"].Count)
-	})
+	// Check averaged values
+	assert.InDelta(t, 50.0, result["0"].Usage, 0.01)
+	assert.InDelta(t, 100.0, result["0"].Power, 0.01)
+	assert.InDelta(t, 30.0, result["1"].Usage, 0.01)
+	assert.InDelta(t, 60.0, result["1"].Power, 0.01)
+
+	// Verify reset counts
+	assert.Equal(t, float64(1), gm.GpuDataMap["0"].Count)
+	assert.Equal(t, float64(1), gm.GpuDataMap["1"].Count)
 }

 func TestDetectGPUs(t *testing.T) {
@@ -776,18 +722,6 @@ func TestAccumulation(t *testing.T) {
 				assert.InDelta(t, expected.avgUsage, gpu.Usage, 0.01, "Average usage in GetCurrentData should match")
 				assert.InDelta(t, expected.avgPower, gpu.Power, 0.01, "Average power in GetCurrentData should match")
 			}
-
-			// Verify that accumulators in the original map are reset
-			for id := range tt.expectedValues {
-				gpu, exists := gm.GpuDataMap[id]
-				assert.True(t, exists, "GPU with ID %s should still exist after GetCurrentData", id)
-				if !exists {
-					continue
-				}
-				assert.Equal(t, float64(0), gpu.Count, "Count should be reset for GPU ID %s", id)
-				assert.Equal(t, float64(0), gpu.Usage, "Usage should be reset for GPU ID %s", id)
-				assert.Equal(t, float64(0), gpu.Power, "Power should be reset for GPU ID %s", id)
-			}
 		})
 	}
 }
--- a/beszel/internal/agent/health.go
+++ b/beszel/internal/agent/health.go
@@ -0,0 +1,18 @@
+package agent
+
+import (
+	"net"
+	"time"
+)
+
+// Health checks if the agent's server is running by attempting to connect to it.
+//
+// If an error occurs when attempting to connect to the server, it returns the error.
+func Health(addr string, network string) error {
+	conn, err := net.DialTimeout(network, addr, 4*time.Second)
+	if err != nil {
+		return err
+	}
+	conn.Close()
+	return nil
+}
--- a/beszel/internal/agent/health/health.go
+++ b/beszel/internal/agent/health/health.go
@@ -1,43 +0,0 @@
-// Package health provides functions to check and update the health of the agent.
-// It uses a file in the temp directory to store the timestamp of the last connection attempt.
-// If the timestamp is older than 90 seconds, the agent is considered unhealthy.
-// NB: The agent must be started with the Start() method to be considered healthy.
-package health
-
-import (
-	"errors"
-	"log"
-	"os"
-	"path/filepath"
-	"time"
-)
-
-// healthFile is the path to the health file
-var healthFile = filepath.Join(os.TempDir(), "beszel_health")
-
-// Check checks if the agent is connected by checking the modification time of the health file
-func Check() error {
-	fileInfo, err := os.Stat(healthFile)
-	if err != nil {
-		return err
-	}
-	if time.Since(fileInfo.ModTime()) > 91*time.Second {
-		log.Println("over 90 seconds since last connection")
-		return errors.New("unhealthy")
-	}
-	return nil
-}
-
-// Update updates the modification time of the health file
-func Update() error {
-	file, err := os.Create(healthFile)
-	if err != nil {
-		return err
-	}
-	return file.Close()
-}
-
-// CleanUp removes the health file
-func CleanUp() error {
-	return os.Remove(healthFile)
-}
--- a/beszel/internal/agent/health/health_test.go
+++ b/beszel/internal/agent/health/health_test.go
@@ -1,67 +0,0 @@
-//go:build testing
-// +build testing
-
-package health
-
-import (
-	"os"
-	"path/filepath"
-	"testing"
-	"time"
-
-	"testing/synctest"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func TestHealth(t *testing.T) {
-	// Override healthFile to use a temporary directory for this test.
-	originalHealthFile := healthFile
-	tmpDir := t.TempDir()
-	healthFile = filepath.Join(tmpDir, "beszel_health_test")
-	defer func() { healthFile = originalHealthFile }()
-
-	t.Run("check with no health file", func(t *testing.T) {
-		err := Check()
-		require.Error(t, err)
-		assert.True(t, os.IsNotExist(err), "expected a file-not-exist error, but got: %v", err)
-	})
-
-	t.Run("update and check", func(t *testing.T) {
-		err := Update()
-		require.NoError(t, err, "Update() failed")
-
-		err = Check()
-		assert.NoError(t, err, "Check() failed immediately after Update()")
-	})
-
-	// This test uses synctest to simulate time passing.
-	// NOTE: This test requires GOEXPERIMENT=synctest to run.
-	t.Run("check with simulated time", func(t *testing.T) {
-		synctest.Run(func() {
-			// Update the file to set the initial timestamp.
-			require.NoError(t, Update(), "Update() failed inside synctest")
-
-			// Set the mtime to the current fake time to align the file's timestamp with the simulated clock.
-			now := time.Now()
-			require.NoError(t, os.Chtimes(healthFile, now, now), "Chtimes failed")
-
-			// Wait a duration less than the threshold.
-			time.Sleep(89 * time.Second)
-			synctest.Wait()
-
-			// The check should still pass.
-			assert.NoError(t, Check(), "Check() failed after 89s")
-
-			// Wait for the total duration to exceed the threshold.
-			time.Sleep(5 * time.Second)
-			synctest.Wait()
-
-			// The check should now fail as unhealthy.
-			err := Check()
-			require.Error(t, err, "Check() should have failed after 91s")
-			assert.Equal(t, "unhealthy", err.Error(), "Check() returned wrong error")
-		})
-	})
-}
--- a/beszel/internal/agent/health_test.go
+++ b/beszel/internal/agent/health_test.go
@@ -0,0 +1,118 @@
+//go:build testing
+// +build testing
+
+package agent_test
+
+import (
+	"fmt"
+	"net"
+	"os"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"beszel/internal/agent"
+)
+
+// setupTestServer creates a temporary server for testing
+func setupTestServer(t *testing.T) (string, func()) {
+	// Create a temporary socket file for Unix socket testing
+	tempSockFile := os.TempDir() + "/beszel_health_test.sock"
+
+	// Clean up any existing socket file
+	os.Remove(tempSockFile)
+
+	// Create a listener
+	listener, err := net.Listen("unix", tempSockFile)
+	require.NoError(t, err, "Failed to create test listener")
+
+	// Start a simple server in a goroutine
+	go func() {
+		conn, err := listener.Accept()
+		if err != nil {
+			return // Listener closed
+		}
+		defer conn.Close()
+		// Just accept the connection and do nothing
+	}()
+
+	// Return the socket file path and a cleanup function
+	return tempSockFile, func() {
+		listener.Close()
+		os.Remove(tempSockFile)
+	}
+}
+
+// setupTCPTestServer creates a temporary TCP server for testing
+func setupTCPTestServer(t *testing.T) (string, func()) {
+	// Listen on a random available port
+	listener, err := net.Listen("tcp", "127.0.0.1:0")
+	require.NoError(t, err, "Failed to create test listener")
+
+	// Get the port that was assigned
+	addr := listener.Addr().(*net.TCPAddr)
+	port := addr.Port
+
+	// Start a simple server in a goroutine
+	go func() {
+		conn, err := listener.Accept()
+		if err != nil {
+			return // Listener closed
+		}
+		defer conn.Close()
+		// Just accept the connection and do nothing
+	}()
+
+	// Return the address and a cleanup function
+	return fmt.Sprintf("127.0.0.1:%d", port), func() {
+		listener.Close()
+	}
+}
+
+func TestHealth(t *testing.T) {
+	t.Run("server is running (unix socket)", func(t *testing.T) {
+		// Setup a test server
+		sockFile, cleanup := setupTestServer(t)
+		defer cleanup()
+
+		// Run the health check with explicit parameters
+		err := agent.Health(sockFile, "unix")
+		require.NoError(t, err, "Failed to check health")
+	})
+
+	t.Run("server is running (tcp address)", func(t *testing.T) {
+		// Setup a test server
+		addr, cleanup := setupTCPTestServer(t)
+		defer cleanup()
+
+		// Run the health check with explicit parameters
+		err := agent.Health(addr, "tcp")
+		require.NoError(t, err, "Failed to check health")
+	})
+
+	t.Run("server is not running", func(t *testing.T) {
+		// Use an address that's likely not in use
+		addr := "127.0.0.1:65535"
+
+		// Run the health check with explicit parameters
+		err := agent.Health(addr, "tcp")
+		require.Error(t, err, "Health check should return an error when server is not running")
+	})
+
+	t.Run("invalid network", func(t *testing.T) {
+		// Use an invalid network type
+		err := agent.Health("127.0.0.1:8080", "invalid_network")
+		require.Error(t, err, "Health check should return an error with invalid network")
+	})
+
+	t.Run("unix socket not found", func(t *testing.T) {
+		// Use a non-existent unix socket
+		nonExistentSocket := os.TempDir() + "/non_existent_socket.sock"
+
+		// Make sure it really doesn't exist
+		os.Remove(nonExistentSocket)
+
+		err := agent.Health(nonExistentSocket, "unix")
+		require.Error(t, err, "Health check should return an error when socket doesn't exist")
+	})
+}
--- a/beszel/internal/agent/network.go
+++ b/beszel/internal/agent/network.go
@@ -57,7 +57,6 @@ func (a *Agent) skipNetworkInterface(v psutilNet.IOCountersStat) bool {
 		strings.HasPrefix(v.Name, "docker"),
 		strings.HasPrefix(v.Name, "br-"),
 		strings.HasPrefix(v.Name, "veth"),
-		strings.HasPrefix(v.Name, "bond"),
 		v.BytesRecv == 0,
 		v.BytesSent == 0:
 		return true
--- a/beszel/internal/agent/sensors.go
+++ b/beszel/internal/agent/sensors.go
@@ -3,13 +3,10 @@ package agent
 import (
 	"beszel/internal/entities/system"
 	"context"
-	"fmt"
 	"log/slog"
 	"path"
-	"runtime"
 	"strconv"
 	"strings"
-	"unicode/utf8"

 	"github.com/shirou/gopsutil/v4/common"
 	"github.com/shirou/gopsutil/v4/sensors"
@@ -33,9 +30,6 @@ func (a *Agent) newSensorConfig() *SensorConfig {
 	return a.newSensorConfigWithEnv(primarySensor, sysSensors, sensorsEnvVal, skipCollection)
 }

-// Matches sensors.TemperaturesWithContext to allow for panic recovery (gopsutil/issues/1832)
-type getTempsFn func(ctx context.Context) ([]sensors.TemperatureStat, error)
-
 // newSensorConfigWithEnv creates a SensorConfig with the provided environment variables
 // sensorsSet indicates if the SENSORS environment variable was explicitly set (even to empty string)
 func (a *Agent) newSensorConfigWithEnv(primarySensor, sysSensors, sensorsEnvVal string, skipCollection bool) *SensorConfig {
@@ -84,18 +78,8 @@ func (a *Agent) updateTemperatures(systemStats *system.Stats) {
 	// reset high temp
 	a.systemInfo.DashboardTemp = 0

-	temps, err := a.getTempsWithPanicRecovery(sensors.TemperaturesWithContext)
-	if err != nil {
-		// retry once on panic (gopsutil/issues/1832)
-		temps, err = a.getTempsWithPanicRecovery(sensors.TemperaturesWithContext)
-		if err != nil {
-			slog.Warn("Error updating temperatures", "err", err)
-			if len(systemStats.Temperatures) > 0 {
-				systemStats.Temperatures = make(map[string]float64)
-			}
-			return
-		}
-	}
+	// get sensor data
+	temps, _ := sensors.TemperaturesWithContext(a.sensorConfig.context)
 	slog.Debug("Temperature", "sensors", temps)

 	// return if no sensors
@@ -105,11 +89,6 @@ func (a *Agent) updateTemperatures(systemStats *system.Stats) {

 	systemStats.Temperatures = make(map[string]float64, len(temps))
 	for i, sensor := range temps {
-		// check for malformed strings on darwin (gopsutil/issues/1832)
-		if runtime.GOOS == "darwin" && !utf8.ValidString(sensor.SensorKey) {
-			continue
-		}
-
 		// scale temperature
 		if sensor.Temperature != 0 && sensor.Temperature < 1 {
 			sensor.Temperature = scaleTemperature(sensor.Temperature)
@@ -128,28 +107,15 @@ func (a *Agent) updateTemperatures(systemStats *system.Stats) {
 			continue
 		}
 		// set dashboard temperature
-		switch a.sensorConfig.primarySensor {
-		case "":
+		if a.sensorConfig.primarySensor == "" {
 			a.systemInfo.DashboardTemp = max(a.systemInfo.DashboardTemp, sensor.Temperature)
-		case sensorName:
+		} else if a.sensorConfig.primarySensor == sensorName {
 			a.systemInfo.DashboardTemp = sensor.Temperature
 		}
 		systemStats.Temperatures[sensorName] = twoDecimals(sensor.Temperature)
 	}
 }

-// getTempsWithPanicRecovery wraps sensors.TemperaturesWithContext to recover from panics (gopsutil/issues/1832)
-func (a *Agent) getTempsWithPanicRecovery(getTemps getTempsFn) (temps []sensors.TemperatureStat, err error) {
-	defer func() {
-		if r := recover(); r != nil {
-			err = fmt.Errorf("panic: %v", r)
-		}
-	}()
-	// get sensor data (error ignored intentionally as it may be only with one sensor)
-	temps, _ = getTemps(a.sensorConfig.context)
-	return
-}
-
 // isValidSensor checks if a sensor is valid based on the sensor name and the sensor config
 func isValidSensor(sensorName string, config *SensorConfig) bool {
 	// if no sensors configured, everything is valid
--- a/beszel/internal/agent/sensors_test.go
+++ b/beszel/internal/agent/sensors_test.go
@@ -4,14 +4,11 @@
 package agent

 import (
-	"beszel/internal/entities/system"
 	"context"
-	"fmt"
 	"os"
 	"testing"

 	"github.com/shirou/gopsutil/v4/common"
-	"github.com/shirou/gopsutil/v4/sensors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -457,97 +454,3 @@ func TestScaleTemperatureLogic(t *testing.T) {
 			result, expected)
 	})
 }
-
-func TestGetTempsWithPanicRecovery(t *testing.T) {
-	agent := &Agent{
-		systemInfo: system.Info{},
-		sensorConfig: &SensorConfig{
-			context: context.Background(),
-		},
-	}
-
-	tests := []struct {
-		name        string
-		getTempsFn  getTempsFn
-		expectError bool
-		errorMsg    string
-	}{
-		{
-			name: "successful_function_call",
-			getTempsFn: func(ctx context.Context) ([]sensors.TemperatureStat, error) {
-				return []sensors.TemperatureStat{
-					{SensorKey: "test_sensor", Temperature: 45.0},
-				}, nil
-			},
-			expectError: false,
-		},
-		{
-			name: "function_returns_error",
-			getTempsFn: func(ctx context.Context) ([]sensors.TemperatureStat, error) {
-				return []sensors.TemperatureStat{
-					{SensorKey: "test_sensor", Temperature: 45.0},
-				}, fmt.Errorf("sensor error")
-			},
-			expectError: false, // getTempsWithPanicRecovery ignores errors from the function
-		},
-		{
-			name: "function_panics_with_string",
-			getTempsFn: func(ctx context.Context) ([]sensors.TemperatureStat, error) {
-				panic("test panic")
-			},
-			expectError: true,
-			errorMsg:    "panic: test panic",
-		},
-		{
-			name: "function_panics_with_error",
-			getTempsFn: func(ctx context.Context) ([]sensors.TemperatureStat, error) {
-				panic(fmt.Errorf("panic error"))
-			},
-			expectError: true,
-			errorMsg:    "panic:",
-		},
-		{
-			name: "function_panics_with_index_out_of_bounds",
-			getTempsFn: func(ctx context.Context) ([]sensors.TemperatureStat, error) {
-				slice := []int{1, 2, 3}
-				_ = slice[10] // out of bounds panic
-				return nil, nil
-			},
-			expectError: true,
-			errorMsg:    "panic:",
-		},
-		{
-			name: "function_panics_with_any_conversion",
-			getTempsFn: func(ctx context.Context) ([]sensors.TemperatureStat, error) {
-				var i any = "string"
-				_ = i.(int) // type assertion panic
-				return nil, nil
-			},
-			expectError: true,
-			errorMsg:    "panic:",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			var temps []sensors.TemperatureStat
-			var err error
-
-			// The function should not panic, regardless of what the injected function does
-			assert.NotPanics(t, func() {
-				temps, err = agent.getTempsWithPanicRecovery(tt.getTempsFn)
-			}, "getTempsWithPanicRecovery should not panic")
-
-			if tt.expectError {
-				assert.Error(t, err, "Expected an error to be returned")
-				if tt.errorMsg != "" {
-					assert.Contains(t, err.Error(), tt.errorMsg,
-						"Error message should contain expected text")
-				}
-				assert.Nil(t, temps, "Temps should be nil when panic occurs")
-			} else {
-				assert.NoError(t, err, "Should not return error for successful calls")
-			}
-		})
-	}
-}
--- a/beszel/internal/agent/server.go
+++ b/beszel/internal/agent/server.go
@@ -1,44 +1,25 @@
 package agent

 import (
-	"beszel"
 	"beszel/internal/common"
-	"beszel/internal/entities/system"
 	"encoding/json"
-	"errors"
 	"fmt"
-	"io"
 	"log/slog"
 	"net"
 	"os"
 	"strings"
-	"time"

-	"github.com/blang/semver"
-	"github.com/fxamacker/cbor/v2"
 	"github.com/gliderlabs/ssh"
 	gossh "golang.org/x/crypto/ssh"
 )

-// ServerOptions contains configuration options for starting the SSH server.
 type ServerOptions struct {
-	Addr    string            // Network address to listen on (e.g., ":45876" or "/path/to/socket")
-	Network string            // Network type ("tcp" or "unix")
-	Keys    []gossh.PublicKey // SSH public keys for authentication
+	Addr    string
+	Network string
+	Keys    []gossh.PublicKey
 }

-// hubVersions caches hub versions by session ID to avoid repeated parsing.
-var hubVersions map[string]semver.Version
-
-// StartServer starts the SSH server with the provided options.
-// It configures the server with secure defaults, sets up authentication,
-// and begins listening for connections. Returns an error if the server
-// is already running or if there's an issue starting the server.
 func (a *Agent) StartServer(opts ServerOptions) error {
-	if a.server != nil {
-		return errors.New("server already started")
-	}
-
 	slog.Info("Starting SSH server", "addr", opts.Addr, "network", opts.Network)

 	if opts.Network == "unix" {
@@ -56,9 +37,7 @@ func (a *Agent) StartServer(opts ServerOptions) error {
 	defer ln.Close()

 	// base config (limit to allowed algorithms)
-	config := &gossh.ServerConfig{
-		ServerVersion: fmt.Sprintf("SSH-2.0-%s_%s", beszel.AppName, beszel.Version),
-	}
+	config := &gossh.ServerConfig{}
 	config.KeyExchanges = common.DefaultKeyExchanges
 	config.MACs = common.DefaultMACs
 	config.Ciphers = common.DefaultCiphers
@@ -66,92 +45,42 @@ func (a *Agent) StartServer(opts ServerOptions) error {
 	// set default handler
 	ssh.Handle(a.handleSession)

-	a.server = &ssh.Server{
+	server := ssh.Server{
 		ServerConfigCallback: func(ctx ssh.Context) *gossh.ServerConfig {
 			return config
 		},
 		// check public key(s)
 		PublicKeyHandler: func(ctx ssh.Context, key ssh.PublicKey) bool {
-			remoteAddr := ctx.RemoteAddr()
 			for _, pubKey := range opts.Keys {
 				if ssh.KeysEqual(key, pubKey) {
-					slog.Info("SSH connected", "addr", remoteAddr)
 					return true
 				}
 			}
-			slog.Warn("Invalid SSH key", "addr", remoteAddr)
 			return false
 		},
 		// disable pty
 		PtyCallback: func(ctx ssh.Context, pty ssh.Pty) bool {
 			return false
 		},
-		// close idle connections after 70 seconds
-		IdleTimeout: 70 * time.Second,
+		// log failed connections
+		ConnectionFailedCallback: func(conn net.Conn, err error) {
+			slog.Warn("Failed connection attempt", "addr", conn.RemoteAddr().String(), "err", err)
+		},
 	}

 	// Start SSH server on the listener
-	return a.server.Serve(ln)
+	return server.Serve(ln)
 }

-// getHubVersion retrieves and caches the hub version for a given session.
-// It extracts the version from the SSH client version string and caches
-// it to avoid repeated parsing. Returns a zero version if parsing fails.
-func (a *Agent) getHubVersion(sessionId string, sessionCtx ssh.Context) semver.Version {
-	if hubVersions == nil {
-		hubVersions = make(map[string]semver.Version, 1)
-	}
-	hubVersion, ok := hubVersions[sessionId]
-	if ok {
-		return hubVersion
-	}
-	// Extract hub version from SSH client version
-	clientVersion := sessionCtx.Value(ssh.ContextKeyClientVersion)
-	if versionStr, ok := clientVersion.(string); ok {
-		hubVersion, _ = extractHubVersion(versionStr)
-	}
-	hubVersions[sessionId] = hubVersion
-	return hubVersion
-}
-
-// handleSession handles an incoming SSH session by gathering system statistics
-// and sending them to the hub. It signals connection events, determines the
-// appropriate encoding format based on hub version, and exits with appropriate
-// status codes.
 func (a *Agent) handleSession(s ssh.Session) {
-	a.connectionManager.eventChan <- SSHConnect
-
-	sessionCtx := s.Context()
-	sessionID := sessionCtx.SessionID()
-
-	hubVersion := a.getHubVersion(sessionID, sessionCtx)
-
-	stats := a.gatherStats(sessionID)
-
-	err := a.writeToSession(s, stats, hubVersion)
-	if err != nil {
+	slog.Debug("New session", "client", s.RemoteAddr())
+	stats := a.gatherStats(s.Context().SessionID())
+	if err := json.NewEncoder(s).Encode(stats); err != nil {
 		slog.Error("Error encoding stats", "err", err, "stats", stats)
 		s.Exit(1)
-	} else {
-		s.Exit(0)
+		return
 	}
-}
-
-// writeToSession encodes and writes system statistics to the session.
-// It chooses between CBOR and JSON encoding based on the hub version,
-// using CBOR for newer versions and JSON for legacy compatibility.
-func (a *Agent) writeToSession(w io.Writer, stats *system.CombinedData, hubVersion semver.Version) error {
-	if hubVersion.GTE(beszel.MinVersionCbor) {
-		return cbor.NewEncoder(w).Encode(stats)
-	}
-	return json.NewEncoder(w).Encode(stats)
-}
-
-// extractHubVersion extracts the beszel version from SSH client version string.
-// Expected format: "SSH-2.0-beszel_X.Y.Z" or "beszel_X.Y.Z"
-func extractHubVersion(versionString string) (semver.Version, error) {
-	_, after, _ := strings.Cut(versionString, "_")
-	return semver.Parse(after)
+	s.Exit(0)
 }

 // ParseKeys parses a string containing SSH public keys in authorized_keys format.
@@ -174,9 +103,7 @@ func ParseKeys(input string) ([]gossh.PublicKey, error) {
 	return parsedKeys, nil
 }

-// GetAddress determines the network address to listen on from various sources.
-// It checks the provided address, then environment variables (LISTEN, PORT),
-// and finally defaults to ":45876".
+// GetAddress gets the address to listen on or connect to from environment variables or default value.
 func GetAddress(addr string) string {
 	if addr == "" {
 		addr, _ = GetEnv("LISTEN")
@@ -195,9 +122,7 @@ func GetAddress(addr string) string {
 	return addr
 }

-// GetNetwork determines the network type based on the address format.
-// It checks the NETWORK environment variable first, then infers from
-// the address format: addresses starting with "/" are "unix", others are "tcp".
+// GetNetwork returns the network type to use based on the address
 func GetNetwork(addr string) string {
 	if network, ok := GetEnv("NETWORK"); ok && network != "" {
 		return network
@@ -207,17 +132,3 @@ func GetNetwork(addr string) string {
 	}
 	return "tcp"
 }
-
-// StopServer stops the SSH server if it's running.
-// It returns an error if the server is not running or if there's an error stopping it.
-func (a *Agent) StopServer() error {
-	if a.server == nil {
-		return errors.New("SSH server not running")
-	}
-
-	slog.Info("Stopping SSH server")
-	_ = a.server.Close()
-	a.server = nil
-	a.connectionManager.eventChan <- SSHDisconnect
-	return nil
-}
--- a/beszel/internal/agent/server_test.go
+++ b/beszel/internal/agent/server_test.go
@@ -1,43 +1,34 @@
 package agent

 import (
-	"beszel/internal/entities/container"
-	"beszel/internal/entities/system"
-	"context"
 	"crypto/ed25519"
-	"encoding/json"
 	"fmt"
-	"net"
 	"os"
 	"path/filepath"
 	"strings"
-	"sync"
 	"testing"
 	"time"

-	"github.com/blang/semver"
-	"github.com/fxamacker/cbor/v2"
-	"github.com/gliderlabs/ssh"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	gossh "golang.org/x/crypto/ssh"
+	"golang.org/x/crypto/ssh"
 )

 func TestStartServer(t *testing.T) {
 	// Generate a test key pair
 	pubKey, privKey, err := ed25519.GenerateKey(nil)
 	require.NoError(t, err)
-	signer, err := gossh.NewSignerFromKey(privKey)
+	signer, err := ssh.NewSignerFromKey(privKey)
 	require.NoError(t, err)
-	sshPubKey, err := gossh.NewPublicKey(pubKey)
+	sshPubKey, err := ssh.NewPublicKey(pubKey)
 	require.NoError(t, err)

 	// Generate a different key pair for bad key test
 	badPubKey, badPrivKey, err := ed25519.GenerateKey(nil)
 	require.NoError(t, err)
-	badSigner, err := gossh.NewSignerFromKey(badPrivKey)
+	badSigner, err := ssh.NewSignerFromKey(badPrivKey)
 	require.NoError(t, err)
-	sshBadPubKey, err := gossh.NewPublicKey(badPubKey)
+	sshBadPubKey, err := ssh.NewPublicKey(badPubKey)
 	require.NoError(t, err)

 	socketFile := filepath.Join(t.TempDir(), "beszel-test.sock")
@@ -55,7 +46,7 @@ func TestStartServer(t *testing.T) {
 			config: ServerOptions{
 				Network: "tcp",
 				Addr:    ":45987",
-				Keys:    []gossh.PublicKey{sshPubKey},
+				Keys:    []ssh.PublicKey{sshPubKey},
 			},
 		},
 		{
@@ -63,7 +54,7 @@ func TestStartServer(t *testing.T) {
 			config: ServerOptions{
 				Network: "tcp4",
 				Addr:    "127.0.0.1:45988",
-				Keys:    []gossh.PublicKey{sshPubKey},
+				Keys:    []ssh.PublicKey{sshPubKey},
 			},
 		},
 		{
@@ -71,7 +62,7 @@ func TestStartServer(t *testing.T) {
 			config: ServerOptions{
 				Network: "tcp6",
 				Addr:    "[::1]:45989",
-				Keys:    []gossh.PublicKey{sshPubKey},
+				Keys:    []ssh.PublicKey{sshPubKey},
 			},
 		},
 		{
@@ -79,7 +70,7 @@ func TestStartServer(t *testing.T) {
 			config: ServerOptions{
 				Network: "unix",
 				Addr:    socketFile,
-				Keys:    []gossh.PublicKey{sshPubKey},
+				Keys:    []ssh.PublicKey{sshPubKey},
 			},
 			setup: func() error {
 				// Create a socket file that should be removed
@@ -98,7 +89,7 @@ func TestStartServer(t *testing.T) {
 			config: ServerOptions{
 				Network: "tcp",
 				Addr:    ":45987",
-				Keys:    []gossh.PublicKey{sshBadPubKey},
+				Keys:    []ssh.PublicKey{sshBadPubKey},
 			},
 			wantErr:     true,
 			errContains: "ssh: handshake failed",
@@ -108,7 +99,7 @@ func TestStartServer(t *testing.T) {
 			config: ServerOptions{
 				Network: "tcp",
 				Addr:    ":45987",
-				Keys:    []gossh.PublicKey{sshPubKey},
+				Keys:    []ssh.PublicKey{sshPubKey},
 			},
 		},
 	}
@@ -124,8 +115,7 @@ func TestStartServer(t *testing.T) {
 				defer tt.cleanup()
 			}

-			agent, err := NewAgent("")
-			require.NoError(t, err)
+			agent := NewAgent()

 			// Start server in a goroutine since it blocks
 			errChan := make(chan error, 1)
@@ -137,7 +127,8 @@ func TestStartServer(t *testing.T) {
 			time.Sleep(100 * time.Millisecond)

 			// Try to connect to verify server is running
-			var client *gossh.Client
+			var client *ssh.Client
+			var err error

 			// Choose the appropriate signer based on the test case
 			testSigner := signer
@@ -145,23 +136,23 @@ func TestStartServer(t *testing.T) {
 				testSigner = badSigner
 			}

-			sshClientConfig := &gossh.ClientConfig{
+			sshClientConfig := &ssh.ClientConfig{
 				User: "a",
-				Auth: []gossh.AuthMethod{
-					gossh.PublicKeys(testSigner),
+				Auth: []ssh.AuthMethod{
+					ssh.PublicKeys(testSigner),
 				},
-				HostKeyCallback: gossh.InsecureIgnoreHostKey(),
+				HostKeyCallback: ssh.InsecureIgnoreHostKey(),
 				Timeout:         4 * time.Second,
 			}

 			switch tt.config.Network {
 			case "unix":
-				client, err = gossh.Dial("unix", tt.config.Addr, sshClientConfig)
+				client, err = ssh.Dial("unix", tt.config.Addr, sshClientConfig)
 			default:
 				if !strings.Contains(tt.config.Addr, ":") {
 					tt.config.Addr = ":" + tt.config.Addr
 				}
-				client, err = gossh.Dial("tcp", tt.config.Addr, sshClientConfig)
+				client, err = ssh.Dial("tcp", tt.config.Addr, sshClientConfig)
 			}

 			if tt.wantErr {
@@ -296,310 +287,3 @@ func TestParseInvalidKey(t *testing.T) {
 		t.Fatalf("Expected error message to contain '%s', got: %v", expectedErrMsg, err)
 	}
 }
-
-/////////////////////////////////////////////////////////////////
-//////////////////// Hub Version Tests //////////////////////////
-/////////////////////////////////////////////////////////////////
-
-func TestExtractHubVersion(t *testing.T) {
-	tests := []struct {
-		name            string
-		clientVersion   string
-		expectedVersion string
-		expectError     bool
-	}{
-		{
-			name:            "valid beszel client version with underscore",
-			clientVersion:   "SSH-2.0-beszel_0.11.1",
-			expectedVersion: "0.11.1",
-			expectError:     false,
-		},
-		{
-			name:            "valid beszel client version with beta",
-			clientVersion:   "SSH-2.0-beszel_1.0.0-beta",
-			expectedVersion: "1.0.0-beta",
-			expectError:     false,
-		},
-		{
-			name:            "valid beszel client version with rc",
-			clientVersion:   "SSH-2.0-beszel_0.12.0-rc1",
-			expectedVersion: "0.12.0-rc1",
-			expectError:     false,
-		},
-		{
-			name:            "different SSH client",
-			clientVersion:   "SSH-2.0-OpenSSH_8.0",
-			expectedVersion: "8.0",
-			expectError:     true,
-		},
-		{
-			name:          "malformed version string without underscore",
-			clientVersion: "SSH-2.0-beszel",
-			expectError:   true,
-		},
-		{
-			name:          "empty version string",
-			clientVersion: "",
-			expectError:   true,
-		},
-		{
-			name:            "version string with underscore but no version",
-			clientVersion:   "beszel_",
-			expectedVersion: "",
-			expectError:     true,
-		},
-		{
-			name:            "version with patch and build metadata",
-			clientVersion:   "SSH-2.0-beszel_1.2.3+build.123",
-			expectedVersion: "1.2.3+build.123",
-			expectError:     false,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			result, err := extractHubVersion(tt.clientVersion)
-
-			if tt.expectError {
-				assert.Error(t, err)
-				return
-			}
-
-			require.NoError(t, err)
-			assert.Equal(t, tt.expectedVersion, result.String())
-		})
-	}
-}
-
-/////////////////////////////////////////////////////////////////
-/////////////// Hub Version Detection Tests ////////////////////
-/////////////////////////////////////////////////////////////////
-
-func TestGetHubVersion(t *testing.T) {
-	agent, err := NewAgent("")
-	require.NoError(t, err)
-
-	// Mock SSH context that implements the ssh.Context interface
-	mockCtx := &mockSSHContext{
-		sessionID:     "test-session-123",
-		clientVersion: "SSH-2.0-beszel_0.12.0",
-	}
-
-	// Test first call - should extract and cache version
-	version := agent.getHubVersion("test-session-123", mockCtx)
-	assert.Equal(t, "0.12.0", version.String())
-
-	// Test second call - should return cached version
-	mockCtx.clientVersion = "SSH-2.0-beszel_0.11.0" // Change version but should still return cached
-	version = agent.getHubVersion("test-session-123", mockCtx)
-	assert.Equal(t, "0.12.0", version.String()) // Should still be cached version
-
-	// Test different session - should extract new version
-	version = agent.getHubVersion("different-session", mockCtx)
-	assert.Equal(t, "0.11.0", version.String())
-
-	// Test with invalid version string (non-beszel client)
-	mockCtx.clientVersion = "SSH-2.0-OpenSSH_8.0"
-	version = agent.getHubVersion("invalid-session", mockCtx)
-	assert.Equal(t, "0.0.0", version.String()) // Should be empty version for non-beszel clients
-
-	// Test with no client version
-	mockCtx.clientVersion = ""
-	version = agent.getHubVersion("no-version-session", mockCtx)
-	assert.True(t, version.EQ(semver.Version{})) // Should be empty version
-}
-
-// mockSSHContext implements ssh.Context for testing
-type mockSSHContext struct {
-	context.Context
-	sync.Mutex
-	sessionID     string
-	clientVersion string
-}
-
-func (m *mockSSHContext) SessionID() string {
-	return m.sessionID
-}
-
-func (m *mockSSHContext) ClientVersion() string {
-	return m.clientVersion
-}
-
-func (m *mockSSHContext) ServerVersion() string {
-	return "SSH-2.0-beszel_test"
-}
-
-func (m *mockSSHContext) Value(key interface{}) interface{} {
-	if key == ssh.ContextKeyClientVersion {
-		return m.clientVersion
-	}
-	return nil
-}
-
-func (m *mockSSHContext) User() string                    { return "test-user" }
-func (m *mockSSHContext) RemoteAddr() net.Addr            { return nil }
-func (m *mockSSHContext) LocalAddr() net.Addr             { return nil }
-func (m *mockSSHContext) Permissions() *ssh.Permissions   { return nil }
-func (m *mockSSHContext) SetValue(key, value interface{}) {}
-
-/////////////////////////////////////////////////////////////////
-/////////////// CBOR vs JSON Encoding Tests ////////////////////
-/////////////////////////////////////////////////////////////////
-
-// TestWriteToSessionEncoding tests that writeToSession actually encodes data in the correct format
-func TestWriteToSessionEncoding(t *testing.T) {
-	tests := []struct {
-		name             string
-		hubVersion       string
-		expectedUsesCbor bool
-	}{
-		{
-			name:             "old hub version should use JSON",
-			hubVersion:       "0.11.1",
-			expectedUsesCbor: false,
-		},
-		{
-			name:             "non-beta release should use CBOR",
-			hubVersion:       "0.12.0",
-			expectedUsesCbor: true,
-		},
-		{
-			name:             "even newer hub version should use CBOR",
-			hubVersion:       "0.16.4",
-			expectedUsesCbor: true,
-		},
-		{
-			name:             "beta version below release threshold should use JSON",
-			hubVersion:       "0.12.0-beta0",
-			expectedUsesCbor: false,
-		},
-		{
-			name:             "matching beta version should use CBOR",
-			hubVersion:       "0.12.0-beta2",
-			expectedUsesCbor: true,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// Reset the global hubVersions map to ensure clean state for each test
-			hubVersions = nil
-
-			agent, err := NewAgent("")
-			require.NoError(t, err)
-
-			// Parse the test version
-			version, err := semver.Parse(tt.hubVersion)
-			require.NoError(t, err)
-
-			// Create test data to encode
-			testData := createTestCombinedData()
-
-			var buf strings.Builder
-			err = agent.writeToSession(&buf, testData, version)
-			require.NoError(t, err)
-
-			encodedData := buf.String()
-			require.NotEmpty(t, encodedData)
-
-			// Verify the encoding format by attempting to decode
-			if tt.expectedUsesCbor {
-				var decodedCbor system.CombinedData
-				err = cbor.Unmarshal([]byte(encodedData), &decodedCbor)
-				assert.NoError(t, err, "Should be valid CBOR data")
-
-				var decodedJson system.CombinedData
-				err = json.Unmarshal([]byte(encodedData), &decodedJson)
-				assert.Error(t, err, "Should not be valid JSON data")
-
-				assert.Equal(t, testData.Info.Hostname, decodedCbor.Info.Hostname)
-				assert.Equal(t, testData.Stats.Cpu, decodedCbor.Stats.Cpu)
-			} else {
-				// Should be JSON - try to decode as JSON
-				var decodedJson system.CombinedData
-				err = json.Unmarshal([]byte(encodedData), &decodedJson)
-				assert.NoError(t, err, "Should be valid JSON data")
-
-				var decodedCbor system.CombinedData
-				err = cbor.Unmarshal([]byte(encodedData), &decodedCbor)
-				assert.Error(t, err, "Should not be valid CBOR data")
-
-				// Verify the decoded JSON data matches our test data
-				assert.Equal(t, testData.Info.Hostname, decodedJson.Info.Hostname)
-				assert.Equal(t, testData.Stats.Cpu, decodedJson.Stats.Cpu)
-
-				// Verify it looks like JSON (starts with '{' and contains readable field names)
-				assert.True(t, strings.HasPrefix(encodedData, "{"), "JSON should start with '{'")
-				assert.Contains(t, encodedData, `"info"`, "JSON should contain readable field names")
-				assert.Contains(t, encodedData, `"stats"`, "JSON should contain readable field names")
-			}
-		})
-	}
-}
-
-// Helper function to create test data for encoding tests
-func createTestCombinedData() *system.CombinedData {
-	return &system.CombinedData{
-		Stats: system.Stats{
-			Cpu:       25.5,
-			Mem:       8589934592, // 8GB
-			MemUsed:   4294967296, // 4GB
-			MemPct:    50.0,
-			DiskTotal: 1099511627776, // 1TB
-			DiskUsed:  549755813888,  // 512GB
-			DiskPct:   50.0,
-		},
-		Info: system.Info{
-			Hostname:     "test-host",
-			Cores:        8,
-			CpuModel:     "Test CPU Model",
-			Uptime:       3600,
-			AgentVersion: "0.12.0",
-			Os:           system.Linux,
-		},
-		Containers: []*container.Stats{
-			{
-				Name: "test-container",
-				Cpu:  10.5,
-				Mem:  1073741824, // 1GB
-			},
-		},
-	}
-}
-
-func TestHubVersionCaching(t *testing.T) {
-	// Reset the global hubVersions map to ensure clean state
-	hubVersions = nil
-
-	agent, err := NewAgent("")
-	require.NoError(t, err)
-
-	ctx1 := &mockSSHContext{
-		sessionID:     "session1",
-		clientVersion: "SSH-2.0-beszel_0.12.0",
-	}
-	ctx2 := &mockSSHContext{
-		sessionID:     "session2",
-		clientVersion: "SSH-2.0-beszel_0.11.0",
-	}
-
-	// First calls should cache the versions
-	v1 := agent.getHubVersion("session1", ctx1)
-	v2 := agent.getHubVersion("session2", ctx2)
-
-	assert.Equal(t, "0.12.0", v1.String())
-	assert.Equal(t, "0.11.0", v2.String())
-
-	// Verify caching by changing context but keeping same session ID
-	ctx1.clientVersion = "SSH-2.0-beszel_0.10.0"
-	v1Cached := agent.getHubVersion("session1", ctx1)
-	assert.Equal(t, "0.12.0", v1Cached.String()) // Should still be cached version
-
-	// New session should get new version
-	ctx3 := &mockSSHContext{
-		sessionID:     "session3",
-		clientVersion: "SSH-2.0-beszel_0.13.0",
-	}
-	v3 := agent.getHubVersion("session3", ctx3)
-	assert.Equal(t, "0.13.0", v3.String())
-}
--- a/beszel/internal/agent/smart.go
+++ b/beszel/internal/agent/smart.go
@@ -0,0 +1,304 @@
+package agent
+
+import (
+	"beszel/internal/entities/smart"
+	"beszel/internal/entities/system"
+	"context"
+	"encoding/json"
+	"fmt"
+	"os/exec"
+	"reflect"
+	"sync"
+	"time"
+
+	"golang.org/x/exp/slog"
+)
+
+// SmartManager manages data collection for SMART devices
+// TODO: add retry argument
+// TODO: add timeout argument
+type SmartManager struct {
+	SmartDataMap map[string]*system.SmartData
+	SmartDevices []*DeviceInfo
+	mutex        sync.Mutex
+}
+
+type scanOutput struct {
+	Devices []struct {
+		Name     string `json:"name"`
+		Type     string `json:"type"`
+		InfoName string `json:"info_name"`
+		Protocol string `json:"protocol"`
+	} `json:"devices"`
+}
+
+type DeviceInfo struct {
+	Name     string `json:"name"`
+	Type     string `json:"type"`
+	InfoName string `json:"info_name"`
+	Protocol string `json:"protocol"`
+}
+
+var errNoValidSmartData = fmt.Errorf("no valid GPU data found") // Error for missing data
+
+// Starts the SmartManager
+func (sm *SmartManager) Start() {
+	sm.SmartDataMap = make(map[string]*system.SmartData)
+	for {
+		err := sm.ScanDevices()
+		if err != nil {
+			slog.Warn("smartctl scan failed, stopping", "err", err)
+			return
+		}
+		// TODO: add retry logic
+		for _, deviceInfo := range sm.SmartDevices {
+			err := sm.CollectSmart(deviceInfo)
+			if err != nil {
+				slog.Warn("smartctl collect failed, stopping", "err", err)
+				return
+			}
+		}
+		// Sleep for 10 seconds before next scan
+		time.Sleep(10 * time.Second)
+	}
+}
+
+// GetCurrentData returns the current SMART data
+func (sm *SmartManager) GetCurrentData() map[string]system.SmartData {
+	sm.mutex.Lock()
+	defer sm.mutex.Unlock()
+	result := make(map[string]system.SmartData)
+	for key, value := range sm.SmartDataMap {
+		result[key] = *value
+	}
+	return result
+}
+
+// ScanDevices scans for SMART devices
+// Scan devices using `smartctl --scan -j`
+// If scan fails, return error
+// If scan succeeds, parse the output and update the SmartDevices slice
+func (sm *SmartManager) ScanDevices() error {
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+
+	cmd := exec.CommandContext(ctx, "smartctl", "--scan", "-j")
+	output, err := cmd.Output()
+
+	if err != nil {
+		return err
+	}
+
+	hasValidData := sm.parseScan(output)
+	if !hasValidData {
+		return errNoValidSmartData
+	}
+	return nil
+}
+
+// CollectSmart collects SMART data for a device
+// Collect data using `smartctl --all -j /dev/sdX` or `smartctl --all -j /dev/nvmeX`
+// If collect fails, return error
+// If collect succeeds, parse the output and update the SmartDataMap
+func (sm *SmartManager) CollectSmart(deviceInfo *DeviceInfo) error {
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+
+	cmd := exec.CommandContext(ctx, "smartctl", "--all", "-j", deviceInfo.Name)
+
+	output, err := cmd.Output()
+
+	if err != nil {
+		return err
+	}
+	
+	hasValidData := false
+	if deviceInfo.Type == "scsi" {
+		// parse scsi devices
+		hasValidData = sm.parseSmartForScsi(output)
+	} else if deviceInfo.Type == "nvme" {
+		// parse nvme devices
+		hasValidData = sm.parseSmartForNvme(output)
+	}
+
+	if !hasValidData {
+		return errNoValidSmartData
+	}
+	return nil
+}
+
+// parseScan parses the output of smartctl --scan -j and updates the SmartDevices slice
+func (sm *SmartManager) parseScan(output []byte) bool {
+	sm.mutex.Lock()
+	defer sm.mutex.Unlock()
+
+	sm.SmartDevices = make([]*DeviceInfo, 0)
+	scan := &scanOutput{}
+
+	if err := json.Unmarshal(output, scan); err != nil {
+		fmt.Printf("Failed to parse JSON: %v\n", err)
+		return false
+	}
+
+	scannedDeviceNameMap := make(map[string]bool)
+
+	for _, device := range scan.Devices {
+		deviceInfo := &DeviceInfo{
+			Name:     device.Name,
+			Type:     device.Type,
+			InfoName: device.InfoName,
+			Protocol: device.Protocol,
+		}
+		sm.SmartDevices = append(sm.SmartDevices, deviceInfo)
+		scannedDeviceNameMap[device.Name] = true
+	}
+	// remove devices that are not in the scan
+	for key := range sm.SmartDataMap {
+		if _, ok := scannedDeviceNameMap[key]; !ok {
+			delete(sm.SmartDataMap, key)
+		}
+	}
+	devicesString := ""
+	for _, device := range sm.SmartDevices {
+		devicesString += device.Name + " "
+	}
+
+	return true
+}
+
+// parseSmartForScsi parses the output of smartctl --all -j /dev/sdX and updates the SmartDataMap
+func (sm *SmartManager) parseSmartForScsi(output []byte) bool {
+	data := &smart.SmartInfoForSata{}
+
+	if err := json.Unmarshal(output, &data); err != nil {
+		return false
+	}
+
+	sm.mutex.Lock()
+	defer sm.mutex.Unlock()
+
+	// get device name (e.g. /dev/sda)
+	keyName := data.SerialNumber
+
+	// if device does not exist in SmartDataMap, initialize it
+	if _, ok := sm.SmartDataMap[keyName]; !ok {
+		sm.SmartDataMap[keyName] = &system.SmartData{}
+	}
+
+	// update SmartData
+	smartData := sm.SmartDataMap[keyName]
+	smartData.ModelFamily = data.ModelFamily
+	smartData.ModelName = data.ModelName
+	smartData.SerialNumber = data.SerialNumber
+	smartData.FirmwareVersion = data.FirmwareVersion
+	smartData.Capacity = data.UserCapacity.Bytes
+	if data.SmartStatus.Passed {
+		smartData.SmartStatus = "PASSED"
+	} else {
+		smartData.SmartStatus = "FAILED"
+	}
+	smartData.DiskName = data.Device.Name
+	smartData.DiskType = data.Device.Type
+
+	// update SmartAttributes
+	smartData.Attributes = make([]*system.SmartAttribute, 0, len(data.AtaSmartAttributes.Table))
+	for _, attr := range data.AtaSmartAttributes.Table {
+		smartAttr := &system.SmartAttribute{
+			Id:         attr.ID,
+			Name:       attr.Name,
+			Value:      attr.Value,
+			Worst:      attr.Worst,
+			Threshold:  attr.Thresh,
+			RawValue:   attr.Raw.Value,
+			RawString:  attr.Raw.String,
+			Flags:      attr.Flags.String,
+			WhenFailed: attr.WhenFailed,
+		}
+		smartData.Attributes = append(smartData.Attributes, smartAttr)
+	}
+	smartData.Temperature = data.Temperature.Current
+	sm.SmartDataMap[keyName] = smartData
+
+	return true
+}
+
+// parseSmartForNvme parses the output of smartctl --all -j /dev/nvmeX and updates the SmartDataMap
+func (sm *SmartManager) parseSmartForNvme(output []byte) bool {
+	data := &smart.SmartInfoForNvme{}
+
+	if err := json.Unmarshal(output, &data); err != nil {
+		return false
+	}
+
+	sm.mutex.Lock()
+	defer sm.mutex.Unlock()
+
+	// get device name (e.g. /dev/nvme0)
+	keyName := data.SerialNumber
+
+	// if device does not exist in SmartDataMap, initialize it
+	if _, ok := sm.SmartDataMap[keyName]; !ok {
+		sm.SmartDataMap[keyName] = &system.SmartData{}
+	}
+
+	// update SmartData
+	smartData := sm.SmartDataMap[keyName]
+	smartData.ModelName = data.ModelName
+	smartData.SerialNumber = data.SerialNumber
+	smartData.FirmwareVersion = data.FirmwareVersion
+	smartData.Capacity = data.UserCapacity.Bytes
+	if data.SmartStatus.Passed {
+		smartData.SmartStatus = "PASSED"
+	} else {
+		smartData.SmartStatus = "FAILED"
+	}
+	smartData.DiskName = data.Device.Name
+	smartData.DiskType = data.Device.Type
+
+	v := reflect.ValueOf(data.NVMeSmartHealthInformationLog)
+	t := v.Type()
+	smartData.Attributes = make([]*system.SmartAttribute, 0, v.NumField())
+
+	// nvme attributes does not follow the same format as ata attributes,
+	// so we have to manually iterate over the fields and update SmartAttributes
+	for i := 0; i < v.NumField(); i++ {
+		field := t.Field(i)
+		value := v.Field(i)
+		key := field.Name
+		val := value.Interface()
+		// drop non int values
+		if _, ok := val.(int); !ok {
+			continue
+		}
+		smartAttr := &system.SmartAttribute{
+			Name:  key,
+			RawValue: val.(int),
+		}
+		smartData.Attributes = append(smartData.Attributes, smartAttr)
+	}
+	smartData.Temperature = data.NVMeSmartHealthInformationLog.Temperature
+
+	sm.SmartDataMap[keyName] = smartData
+
+	return true
+}
+
+// detectSmartctl checks if smartctl is installed, returns an error if not
+func (sm *SmartManager) detectSmartctl() error {
+	if _, err := exec.LookPath("smartctl"); err == nil {
+		return nil
+	}
+	return fmt.Errorf("no smartctl found - install smartctl")
+}
+
+// NewGPUManager creates and initializes a new GPUManager
+func NewSmartManager() (*SmartManager, error) {
+	var sm SmartManager
+	if err := sm.detectSmartctl(); err != nil {
+		return nil, err
+	}
+
+	go sm.Start()
+
+	return &sm, nil
+}
--- a/beszel/internal/agent/system.go
+++ b/beszel/internal/agent/system.go
@@ -14,7 +14,6 @@ import (
 	"github.com/shirou/gopsutil/v4/cpu"
 	"github.com/shirou/gopsutil/v4/disk"
 	"github.com/shirou/gopsutil/v4/host"
-	"github.com/shirou/gopsutil/v4/load"
 	"github.com/shirou/gopsutil/v4/mem"
 	psutilNet "github.com/shirou/gopsutil/v4/net"
 )
@@ -78,16 +77,6 @@ func (a *Agent) getSystemStats() system.Stats {
 		systemStats.Cpu = twoDecimals(cpuPct[0])
 	}

-	// load average
-	if avgstat, err := load.Avg(); err == nil {
-		systemStats.LoadAvg1 = twoDecimals(avgstat.Load1)
-		systemStats.LoadAvg5 = twoDecimals(avgstat.Load5)
-		systemStats.LoadAvg15 = twoDecimals(avgstat.Load15)
-		slog.Debug("Load average", "5m", systemStats.LoadAvg5, "15m", systemStats.LoadAvg15)
-	} else {
-		slog.Error("Error getting load average", "err", err)
-	}
-
 	// memory
 	if v, err := mem.VirtualMemory(); err == nil {
 		// swap
@@ -248,12 +237,20 @@ func (a *Agent) getSystemStats() system.Stats {
 			}
 		}
 	}
+	if a.smartManager != nil {
+		if smartData := a.smartManager.GetCurrentData(); len(smartData) > 0 {
+			systemStats.SmartData = smartData
+			if systemStats.Temperatures == nil {
+				systemStats.Temperatures = make(map[string]float64, len(a.smartManager.SmartDataMap))
+			}
+			for key, value := range a.smartManager.SmartDataMap {
+				systemStats.Temperatures[key] = float64(value.Temperature)
+			}
+		}
+	}

 	// update base system info
 	a.systemInfo.Cpu = systemStats.Cpu
-	a.systemInfo.LoadAvg1 = systemStats.LoadAvg1
-	a.systemInfo.LoadAvg5 = systemStats.LoadAvg5
-	a.systemInfo.LoadAvg15 = systemStats.LoadAvg15
 	a.systemInfo.MemPct = systemStats.MemPct
 	a.systemInfo.DiskPct = systemStats.DiskPct
 	a.systemInfo.Uptime, _ = host.Uptime()
--- a/beszel/internal/alerts/alerts.go
+++ b/beszel/internal/alerts/alerts.go
@@ -47,9 +47,6 @@ type SystemAlertStats struct {
 	NetSent      float64            `json:"ns"`
 	NetRecv      float64            `json:"nr"`
 	Temperatures map[string]float32 `json:"t"`
-	LoadAvg1     float64            `json:"l1"`
-	LoadAvg5     float64            `json:"l5"`
-	LoadAvg15    float64            `json:"l15"`
 }

 type SystemAlertData struct {
--- a/beszel/internal/alerts/alerts_system.go
+++ b/beszel/internal/alerts/alerts_system.go
@@ -2,11 +2,11 @@ package alerts

 import (
 	"beszel/internal/entities/system"
-	"encoding/json"
 	"fmt"
 	"strings"
 	"time"

+	"github.com/goccy/go-json"
 	"github.com/pocketbase/dbx"
 	"github.com/pocketbase/pocketbase/core"
 	"github.com/pocketbase/pocketbase/tools/types"
@@ -54,15 +54,6 @@ func (am *AlertManager) HandleSystemAlerts(systemRecord *core.Record, data *syst
 			}
 			val = data.Info.DashboardTemp
 			unit = "°C"
-		case "LoadAvg1":
-			val = data.Info.LoadAvg1
-			unit = ""
-		case "LoadAvg5":
-			val = data.Info.LoadAvg5
-			unit = ""
-		case "LoadAvg15":
-			val = data.Info.LoadAvg15
-			unit = ""
 		}

 		triggered := alertRecord.GetBool("triggered")
@@ -199,12 +190,6 @@ func (am *AlertManager) HandleSystemAlerts(systemRecord *core.Record, data *syst
 					}
 					alert.mapSums[key] += temp
 				}
-			case "LoadAvg1":
-				alert.val += stats.LoadAvg1
-			case "LoadAvg5":
-				alert.val += stats.LoadAvg5
-			case "LoadAvg15":
-				alert.val += stats.LoadAvg15
 			default:
 				continue
 			}
@@ -262,10 +247,6 @@ func (am *AlertManager) sendSystemAlert(alert SystemAlertData) {
 	if alert.name == "Disk" {
 		alert.name += " usage"
 	}
-	// format LoadAvg5 and LoadAvg15
-	if after, ok := strings.CutPrefix(alert.name, "LoadAvg"); ok {
-		alert.name = after + "m Load"
-	}

 	// make title alert name lowercase if not CPU
 	titleAlertName := alert.name
--- a/beszel/internal/common/common-ssh.go
+++ b/beszel/internal/common/common-ssh.go
@@ -1,10 +0,0 @@
-package common
-
-var (
-	// Allowed ssh key exchanges
-	DefaultKeyExchanges = []string{"curve25519-sha256"}
-	// Allowed ssh macs
-	DefaultMACs = []string{"hmac-sha2-256-etm@openssh.com"}
-	// Allowed ssh ciphers
-	DefaultCiphers = []string{"chacha20-poly1305@openssh.com"}
-)
--- a/beszel/internal/common/common-ws.go
+++ b/beszel/internal/common/common-ws.go
@@ -1,32 +0,0 @@
-package common
-
-type WebSocketAction = uint8
-
-// Not implemented yet
-// type AgentError = uint8
-
-const (
-	// Request system data from agent
-	GetData WebSocketAction = iota
-	// Check the fingerprint of the agent
-	CheckFingerprint
-)
-
-// HubRequest defines the structure for requests sent from hub to agent.
-type HubRequest[T any] struct {
-	Action WebSocketAction `cbor:"0,keyasint"`
-	Data   T               `cbor:"1,keyasint,omitempty,omitzero"`
-	// Error  AgentError      `cbor:"error,omitempty,omitzero"`
-}
-
-type FingerprintRequest struct {
-	Signature   []byte `cbor:"0,keyasint"`
-	NeedSysInfo bool   `cbor:"1,keyasint"` // For universal token system creation
-}
-
-type FingerprintResponse struct {
-	Fingerprint string `cbor:"0,keyasint"`
-	// Optional system info for universal token system creation
-	Hostname string `cbor:"1,keyasint,omitempty,omitzero"`
-	Port     string `cbor:"2,keyasint,omitempty,omitzero"`
-}
--- a/beszel/internal/common/common.go
+++ b/beszel/internal/common/common.go
@@ -0,0 +1,7 @@
+package common
+
+var (
+	DefaultKeyExchanges = []string{"curve25519-sha256"}
+	DefaultMACs         = []string{"hmac-sha2-256-etm@openssh.com"}
+	DefaultCiphers      = []string{"chacha20-poly1305@openssh.com"}
+)
--- a/beszel/internal/entities/container/container.go
+++ b/beszel/internal/entities/container/container.go
@@ -34,16 +34,10 @@ type ApiStats struct {
 	MemoryStats MemoryStats `json:"memory_stats"`
 }

-func (s *ApiStats) CalculateCpuPercentLinux(prevCpuContainer uint64, prevCpuSystem uint64) float64 {
-	cpuDelta := s.CPUStats.CPUUsage.TotalUsage - prevCpuContainer
-	systemDelta := s.CPUStats.SystemUsage - prevCpuSystem
-
-	// Avoid division by zero and handle first run case
-	if systemDelta == 0 || prevCpuContainer == 0 {
-		return 0.0
-	}
-
-	return float64(cpuDelta) / float64(systemDelta) * 100.0
+func (s *ApiStats) CalculateCpuPercentLinux(prevCpuUsage [2]uint64) float64 {
+	cpuDelta := s.CPUStats.CPUUsage.TotalUsage - prevCpuUsage[0]
+	systemDelta := s.CPUStats.SystemUsage - prevCpuUsage[1]
+	return float64(cpuDelta) / float64(systemDelta) * 100
 }

 // from: https://github.com/docker/cli/blob/master/cli/command/container/stats_helpers.go#L185
@@ -105,14 +99,12 @@ type prevNetStats struct {

 // Docker container stats
 type Stats struct {
-	Name        string  `json:"n" cbor:"0,keyasint"`
-	Cpu         float64 `json:"c" cbor:"1,keyasint"`
-	Mem         float64 `json:"m" cbor:"2,keyasint"`
-	NetworkSent float64 `json:"ns" cbor:"3,keyasint"`
-	NetworkRecv float64 `json:"nr" cbor:"4,keyasint"`
-	// PrevCpu     [2]uint64    `json:"-"`
-	CpuSystem    uint64       `json:"-"`
-	CpuContainer uint64       `json:"-"`
-	PrevNet      prevNetStats `json:"-"`
-	PrevReadTime time.Time    `json:"-"`
+	Name        string       `json:"n"`
+	Cpu         float64      `json:"c"`
+	Mem         float64      `json:"m"`
+	NetworkSent float64      `json:"ns"`
+	NetworkRecv float64      `json:"nr"`
+	PrevCpu     [2]uint64    `json:"-"`
+	PrevNet     prevNetStats `json:"-"`
+	PrevRead    time.Time    `json:"-"`
 }
--- a/beszel/internal/entities/smart/smart.go
+++ b/beszel/internal/entities/smart/smart.go
@@ -0,0 +1,269 @@
+package smart
+
+type SmartInfoForSata struct {
+	JSONFormatVersion []int `json:"json_format_version"`
+	Smartctl         struct {
+		Version      []int  `json:"version"`
+		SvnRevision  string `json:"svn_revision"`
+		PlatformInfo string `json:"platform_info"`
+		BuildInfo    string `json:"build_info"`
+		Argv         []string `json:"argv"`
+		ExitStatus   int    `json:"exit_status"`
+	} `json:"smartctl"`
+	Device struct {
+		Name     string `json:"name"`
+		InfoName string `json:"info_name"`
+		Type     string `json:"type"`
+		Protocol string `json:"protocol"`
+	} `json:"device"`
+	ModelFamily       string `json:"model_family"`
+	ModelName         string `json:"model_name"`
+	SerialNumber      string `json:"serial_number"`
+	Wwn               struct {
+		Naa int `json:"naa"`
+		Oui int `json:"oui"`
+		ID  int `json:"id"`
+	} `json:"wwn"`
+	FirmwareVersion string `json:"firmware_version"`
+	UserCapacity    struct {
+		Blocks uint64 `json:"blocks"`
+		Bytes  uint64 `json:"bytes"`
+	} `json:"user_capacity"`
+	LogicalBlockSize  int `json:"logical_block_size"`
+	PhysicalBlockSize int `json:"physical_block_size"`
+	RotationRate      int `json:"rotation_rate"`
+	FormFactor        struct {
+		AtaValue int    `json:"ata_value"`
+		Name     string `json:"name"`
+	} `json:"form_factor"`
+	Trim struct {
+		Supported bool `json:"supported"`
+	} `json:"trim"`
+	InSmartctlDatabase bool `json:"in_smartctl_database"`
+	AtaVersion         struct {
+		String     string `json:"string"`
+		MajorValue int    `json:"major_value"`
+		MinorValue int    `json:"minor_value"`
+	} `json:"ata_version"`
+	SataVersion struct {
+		String string `json:"string"`
+		Value  int    `json:"value"`
+	} `json:"sata_version"`
+	InterfaceSpeed struct {
+		Max struct {
+			SataValue       int    `json:"sata_value"`
+			String          string `json:"string"`
+			UnitsPerSecond  int    `json:"units_per_second"`
+			BitsPerUnit     int    `json:"bits_per_unit"`
+		} `json:"max"`
+		Current struct {
+			SataValue       int    `json:"sata_value"`
+			String          string `json:"string"`
+			UnitsPerSecond  int    `json:"units_per_second"`
+			BitsPerUnit     int    `json:"bits_per_unit"`
+		} `json:"current"`
+	} `json:"interface_speed"`
+	LocalTime struct {
+		TimeT   int    `json:"time_t"`
+		Asctime string `json:"asctime"`
+	} `json:"local_time"`
+	SmartStatus struct {
+		Passed bool `json:"passed"`
+	} `json:"smart_status"`
+	AtaSmartData struct {
+		OfflineDataCollection struct {
+			Status struct {
+				Value  int    `json:"value"`
+				String string `json:"string"`
+				Passed bool   `json:"passed"`
+			} `json:"status"`
+			CompletionSeconds int `json:"completion_seconds"`
+		} `json:"offline_data_collection"`
+		SelfTest struct {
+			Status struct {
+				Value  int    `json:"value"`
+				String string `json:"string"`
+				Passed bool   `json:"passed"`
+			} `json:"status"`
+			PollingMinutes struct {
+				Short    int `json:"short"`
+				Extended int `json:"extended"`
+			} `json:"polling_minutes"`
+		} `json:"self_test"`
+		Capabilities struct {
+			Values                             []int `json:"values"`
+			ExecOfflineImmediateSupported      bool  `json:"exec_offline_immediate_supported"`
+			OfflineIsAbortedUponNewCmd         bool  `json:"offline_is_aborted_upon_new_cmd"`
+			OfflineSurfaceScanSupported        bool  `json:"offline_surface_scan_supported"`
+			SelfTestsSupported                 bool  `json:"self_tests_supported"`
+			ConveyanceSelfTestSupported        bool  `json:"conveyance_self_test_supported"`
+			SelectiveSelfTestSupported         bool  `json:"selective_self_test_supported"`
+			AttributeAutosaveEnabled           bool  `json:"attribute_autosave_enabled"`
+			ErrorLoggingSupported              bool  `json:"error_logging_supported"`
+			GpLoggingSupported                 bool  `json:"gp_logging_supported"`
+		} `json:"capabilities"`
+	} `json:"ata_smart_data"`
+	AtaSctCapabilities struct {
+		Value                        int  `json:"value"`
+		ErrorRecoveryControlSupported bool `json:"error_recovery_control_supported"`
+		FeatureControlSupported       bool `json:"feature_control_supported"`
+		DataTableSupported            bool `json:"data_table_supported"`
+	} `json:"ata_sct_capabilities"`
+	AtaSmartAttributes struct {
+		Revision int `json:"revision"`
+		Table    []struct {
+			ID         int    `json:"id"`
+			Name       string `json:"name"`
+			Value      int    `json:"value"`
+			Worst      int    `json:"worst"`
+			Thresh     int    `json:"thresh"`
+			WhenFailed string `json:"when_failed"`
+			Flags      struct {
+				Value          int    `json:"value"`
+				String         string `json:"string"`
+				Prefailure     bool   `json:"prefailure"`
+				UpdatedOnline  bool   `json:"updated_online"`
+				Performance    bool   `json:"performance"`
+				ErrorRate      bool   `json:"error_rate"`
+				EventCount     bool   `json:"event_count"`
+				AutoKeep       bool   `json:"auto_keep"`
+			} `json:"flags"`
+			Raw struct {
+				Value  int    `json:"value"`
+				String string `json:"string"`
+			} `json:"raw"`
+		} `json:"table"`
+	} `json:"ata_smart_attributes"`
+	PowerOnTime struct {
+		Hours int `json:"hours"`
+	} `json:"power_on_time"`
+	PowerCycleCount int `json:"power_cycle_count"`
+	Temperature     struct {
+		Current int `json:"current"`
+	} `json:"temperature"`
+	AtaSmartErrorLog struct {
+		Summary struct {
+			Revision int `json:"revision"`
+			Count    int `json:"count"`
+		} `json:"summary"`
+	} `json:"ata_smart_error_log"`
+	AtaSmartSelfTestLog struct {
+		Standard struct {
+			Revision int `json:"revision"`
+			Count    int `json:"count"`
+		} `json:"standard"`
+	} `json:"ata_smart_self_test_log"`
+	AtaSmartSelectiveSelfTestLog struct {
+		Revision               int `json:"revision"`
+		Table                  []struct {
+			LbaMin  int `json:"lba_min"`
+			LbaMax  int `json:"lba_max"`
+			Status  struct {
+				Value  int    `json:"value"`
+				String string `json:"string"`
+			} `json:"status"`
+		} `json:"table"`
+		Flags struct {
+			Value                  int  `json:"value"`
+			RemainderScanEnabled   bool `json:"remainder_scan_enabled"`
+		} `json:"flags"`
+		PowerUpScanResumeMinutes int `json:"power_up_scan_resume_minutes"`
+	} `json:"ata_smart_selective_self_test_log"`
+}
+
+
+type SmartInfoForNvme struct {
+	JSONFormatVersion              [2]int                           `json:"json_format_version"`
+	Smartctl                       struct {
+		Version      [2]int  `json:"version"`
+		SVNRevision  string  `json:"svn_revision"`
+		PlatformInfo string  `json:"platform_info"`
+		BuildInfo    string  `json:"build_info"`
+		Argv         []string `json:"argv"`
+		ExitStatus   int     `json:"exit_status"`
+	} `json:"smartctl"`
+	Device struct {
+		Name     string `json:"name"`
+		InfoName string `json:"info_name"`
+		Type     string `json:"type"`
+		Protocol string `json:"protocol"`
+	} `json:"device"`
+	ModelName               string `json:"model_name"`
+	SerialNumber            string `json:"serial_number"`
+	FirmwareVersion         string `json:"firmware_version"`
+	NVMePCIVendor           struct {
+		ID          int `json:"id"`
+		SubsystemID int `json:"subsystem_id"`
+	} `json:"nvme_pci_vendor"`
+	NVMeIEEEOUIIdentifier   int    `json:"nvme_ieee_oui_identifier"`
+	NVMeTotalCapacity       int    `json:"nvme_total_capacity"`
+	NVMeUnallocatedCapacity int    `json:"nvme_unallocated_capacity"`
+	NVMeControllerID        int    `json:"nvme_controller_id"`
+	NVMeVersion             struct {
+		String string `json:"string"`
+		Value  int    `json:"value"`
+	} `json:"nvme_version"`
+	NVMeNumberOfNamespaces  int `json:"nvme_number_of_namespaces"`
+	NVMeNamespaces          []struct {
+		ID              int `json:"id"`
+		Size            struct {
+			Blocks int `json:"blocks"`
+			Bytes  int `json:"bytes"`
+		} `json:"size"`
+		Capacity      struct {
+			Blocks int `json:"blocks"`
+			Bytes  int `json:"bytes"`
+		} `json:"capacity"`
+		Utilization   struct {
+			Blocks int `json:"blocks"`
+			Bytes  int `json:"bytes"`
+		} `json:"utilization"`
+		FormattedLBASize int `json:"formatted_lba_size"`
+		EUI64           struct {
+			OUI    int `json:"oui"`
+			ExtID  int `json:"ext_id"`
+		} `json:"eui64"`
+	} `json:"nvme_namespaces"`
+	UserCapacity     struct {
+		Blocks uint64 `json:"blocks"`
+		Bytes  uint64 `json:"bytes"`
+	} `json:"user_capacity"`
+	LogicalBlockSize int `json:"logical_block_size"`
+	LocalTime        struct {
+		TimeT  int64  `json:"time_t"`
+		Asctime string `json:"asctime"`
+	} `json:"local_time"`
+	SmartStatus struct {
+		Passed bool `json:"passed"`
+		NVMe   struct {
+			Value int `json:"value"`
+		} `json:"nvme"`
+	} `json:"smart_status"`
+	NVMeSmartHealthInformationLog struct {
+		CriticalWarning           int   `json:"critical_warning"`
+		Temperature               int   `json:"temperature"`
+		AvailableSpare            int   `json:"available_spare"`
+		AvailableSpareThreshold   int   `json:"available_spare_threshold"`
+		PercentageUsed            int   `json:"percentage_used"`
+		DataUnitsRead             int   `json:"data_units_read"`
+		DataUnitsWritten          int   `json:"data_units_written"`
+		HostReads                 int   `json:"host_reads"`
+		HostWrites                int   `json:"host_writes"`
+		ControllerBusyTime        int   `json:"controller_busy_time"`
+		PowerCycles               int   `json:"power_cycles"`
+		PowerOnHours              int   `json:"power_on_hours"`
+		UnsafeShutdowns           int   `json:"unsafe_shutdowns"`
+		MediaErrors               int   `json:"media_errors"`
+		NumErrLogEntries          int   `json:"num_err_log_entries"`
+		WarningTempTime           int   `json:"warning_temp_time"`
+		CriticalCompTime          int   `json:"critical_comp_time"`
+		TemperatureSensors       []int `json:"temperature_sensors"`
+	} `json:"nvme_smart_health_information_log"`
+	Temperature struct {
+		Current int `json:"current"`
+	} `json:"temperature"`
+	PowerCycleCount int `json:"power_cycle_count"`
+	PowerOnTime     struct {
+		Hours int `json:"hours"`
+	} `json:"power_on_time"`
+}
--- a/beszel/internal/entities/system/system.go
+++ b/beszel/internal/entities/system/system.go
@@ -8,41 +8,39 @@ import (
 )

 type Stats struct {
-	Cpu            float64             `json:"cpu" cbor:"0,keyasint"`
-	MaxCpu         float64             `json:"cpum,omitempty" cbor:"1,keyasint,omitempty"`
-	Mem            float64             `json:"m" cbor:"2,keyasint"`
-	MemUsed        float64             `json:"mu" cbor:"3,keyasint"`
-	MemPct         float64             `json:"mp" cbor:"4,keyasint"`
-	MemBuffCache   float64             `json:"mb" cbor:"5,keyasint"`
-	MemZfsArc      float64             `json:"mz,omitempty" cbor:"6,keyasint,omitempty"` // ZFS ARC memory
-	Swap           float64             `json:"s,omitempty" cbor:"7,keyasint,omitempty"`
-	SwapUsed       float64             `json:"su,omitempty" cbor:"8,keyasint,omitempty"`
-	DiskTotal      float64             `json:"d" cbor:"9,keyasint"`
-	DiskUsed       float64             `json:"du" cbor:"10,keyasint"`
-	DiskPct        float64             `json:"dp" cbor:"11,keyasint"`
-	DiskReadPs     float64             `json:"dr" cbor:"12,keyasint"`
-	DiskWritePs    float64             `json:"dw" cbor:"13,keyasint"`
-	MaxDiskReadPs  float64             `json:"drm,omitempty" cbor:"14,keyasint,omitempty"`
-	MaxDiskWritePs float64             `json:"dwm,omitempty" cbor:"15,keyasint,omitempty"`
-	NetworkSent    float64             `json:"ns" cbor:"16,keyasint"`
-	NetworkRecv    float64             `json:"nr" cbor:"17,keyasint"`
-	MaxNetworkSent float64             `json:"nsm,omitempty" cbor:"18,keyasint,omitempty"`
-	MaxNetworkRecv float64             `json:"nrm,omitempty" cbor:"19,keyasint,omitempty"`
-	Temperatures   map[string]float64  `json:"t,omitempty" cbor:"20,keyasint,omitempty"`
-	ExtraFs        map[string]*FsStats `json:"efs,omitempty" cbor:"21,keyasint,omitempty"`
-	GPUData        map[string]GPUData  `json:"g,omitempty" cbor:"22,keyasint,omitempty"`
-	LoadAvg1       float64             `json:"l1,omitempty" cbor:"23,keyasint,omitempty,omitzero"`
-	LoadAvg5       float64             `json:"l5,omitempty" cbor:"24,keyasint,omitempty,omitzero"`
-	LoadAvg15      float64             `json:"l15,omitempty" cbor:"25,keyasint,omitempty,omitzero"`
+	Cpu            float64              `json:"cpu"`
+	MaxCpu         float64              `json:"cpum,omitempty"`
+	Mem            float64              `json:"m"`
+	MemUsed        float64              `json:"mu"`
+	MemPct         float64              `json:"mp"`
+	MemBuffCache   float64              `json:"mb"`
+	MemZfsArc      float64              `json:"mz,omitempty"` // ZFS ARC memory
+	Swap           float64              `json:"s,omitempty"`
+	SwapUsed       float64              `json:"su,omitempty"`
+	DiskTotal      float64              `json:"d"`
+	DiskUsed       float64              `json:"du"`
+	DiskPct        float64              `json:"dp"`
+	DiskReadPs     float64              `json:"dr"`
+	DiskWritePs    float64              `json:"dw"`
+	MaxDiskReadPs  float64              `json:"drm,omitempty"`
+	MaxDiskWritePs float64              `json:"dwm,omitempty"`
+	NetworkSent    float64              `json:"ns"`
+	NetworkRecv    float64              `json:"nr"`
+	MaxNetworkSent float64              `json:"nsm,omitempty"`
+	MaxNetworkRecv float64              `json:"nrm,omitempty"`
+	Temperatures   map[string]float64   `json:"t,omitempty"`
+	ExtraFs        map[string]*FsStats  `json:"efs,omitempty"`
+	GPUData        map[string]GPUData   `json:"g,omitempty"`
+	SmartData      map[string]SmartData `json:"sm,omitempty"`
 }

 type GPUData struct {
-	Name        string  `json:"n" cbor:"0,keyasint"`
+	Name        string  `json:"n"`
 	Temperature float64 `json:"-"`
-	MemoryUsed  float64 `json:"mu,omitempty" cbor:"1,keyasint,omitempty"`
-	MemoryTotal float64 `json:"mt,omitempty" cbor:"2,keyasint,omitempty"`
-	Usage       float64 `json:"u" cbor:"3,keyasint"`
-	Power       float64 `json:"p,omitempty" cbor:"4,keyasint,omitempty"`
+	MemoryUsed  float64 `json:"mu,omitempty"`
+	MemoryTotal float64 `json:"mt,omitempty"`
+	Usage       float64 `json:"u"`
+	Power       float64 `json:"p,omitempty"`
 	Count       float64 `json:"-"`
 }

@@ -50,14 +48,14 @@ type FsStats struct {
 	Time           time.Time `json:"-"`
 	Root           bool      `json:"-"`
 	Mountpoint     string    `json:"-"`
-	DiskTotal      float64   `json:"d" cbor:"0,keyasint"`
-	DiskUsed       float64   `json:"du" cbor:"1,keyasint"`
+	DiskTotal      float64   `json:"d"`
+	DiskUsed       float64   `json:"du"`
 	TotalRead      uint64    `json:"-"`
 	TotalWrite     uint64    `json:"-"`
-	DiskReadPs     float64   `json:"r" cbor:"2,keyasint"`
-	DiskWritePs    float64   `json:"w" cbor:"3,keyasint"`
-	MaxDiskReadPS  float64   `json:"rm,omitempty" cbor:"4,keyasint,omitempty"`
-	MaxDiskWritePS float64   `json:"wm,omitempty" cbor:"5,keyasint,omitempty"`
+	DiskReadPs     float64   `json:"r"`
+	DiskWritePs    float64   `json:"w"`
+	MaxDiskReadPS  float64   `json:"rm,omitempty"`
+	MaxDiskWritePS float64   `json:"wm,omitempty"`
 }

 type NetIoStats struct {
@@ -67,7 +65,7 @@ type NetIoStats struct {
 	Name      string
 }

-type Os = uint8
+type Os uint8

 const (
 	Linux Os = iota
@@ -76,30 +74,52 @@ const (
 	Freebsd
 )

+type SmartData struct {
+	ModelFamily     string            `json:"mf,omitempty"`
+	ModelName       string            `json:"mn,omitempty"`
+	SerialNumber    string            `json:"sn,omitempty"`
+	FirmwareVersion string            `json:"fv,omitempty"`
+	Capacity        uint64            `json:"c,omitempty"`
+	SmartStatus     string            `json:"s,omitempty"`
+	DiskName        string            `json:"dn,omitempty"` // something like /dev/sda
+	DiskType        string            `json:"dt,omitempty"`
+	Temperature	    int               `json:"t,omitempty"`
+	Attributes      []*SmartAttribute `json:"a,omitempty"`
+}
+
+type SmartAttribute struct {
+	Id         int    `json:"id,omitempty"`
+	Name       string `json:"n"`
+	Value      int    `json:"v,omitempty"`
+	Worst      int    `json:"w,omitempty"`
+	Threshold  int    `json:"t,omitempty"`
+	RawValue   int    `json:"rv"`
+	RawString  string `json:"rs,omitempty"`
+	Flags      string `json:"f,omitempty"`
+	WhenFailed string `json:"wf,omitempty"`
+}
+
 type Info struct {
-	Hostname      string  `json:"h" cbor:"0,keyasint"`
-	KernelVersion string  `json:"k,omitempty" cbor:"1,keyasint,omitempty"`
-	Cores         int     `json:"c" cbor:"2,keyasint"`
-	Threads       int     `json:"t,omitempty" cbor:"3,keyasint,omitempty"`
-	CpuModel      string  `json:"m" cbor:"4,keyasint"`
-	Uptime        uint64  `json:"u" cbor:"5,keyasint"`
-	Cpu           float64 `json:"cpu" cbor:"6,keyasint"`
-	MemPct        float64 `json:"mp" cbor:"7,keyasint"`
-	DiskPct       float64 `json:"dp" cbor:"8,keyasint"`
-	Bandwidth     float64 `json:"b" cbor:"9,keyasint"`
-	AgentVersion  string  `json:"v" cbor:"10,keyasint"`
-	Podman        bool    `json:"p,omitempty" cbor:"11,keyasint,omitempty"`
-	GpuPct        float64 `json:"g,omitempty" cbor:"12,keyasint,omitempty"`
-	DashboardTemp float64 `json:"dt,omitempty" cbor:"13,keyasint,omitempty"`
-	Os            Os      `json:"os" cbor:"14,keyasint"`
-	LoadAvg1      float64 `json:"l1,omitempty" cbor:"15,keyasint,omitempty"`
-	LoadAvg5      float64 `json:"l5,omitempty" cbor:"16,keyasint,omitempty"`
-	LoadAvg15     float64 `json:"l15,omitempty" cbor:"17,keyasint,omitempty"`
+	Hostname      string  `json:"h"`
+	KernelVersion string  `json:"k,omitempty"`
+	Cores         int     `json:"c"`
+	Threads       int     `json:"t,omitempty"`
+	CpuModel      string  `json:"m"`
+	Uptime        uint64  `json:"u"`
+	Cpu           float64 `json:"cpu"`
+	MemPct        float64 `json:"mp"`
+	DiskPct       float64 `json:"dp"`
+	Bandwidth     float64 `json:"b"`
+	AgentVersion  string  `json:"v"`
+	Podman        bool    `json:"p,omitempty"`
+	GpuPct        float64 `json:"g,omitempty"`
+	DashboardTemp float64 `json:"dt,omitempty"`
+	Os            Os      `json:"os"`
 }

 // Final data structure to return to the hub
 type CombinedData struct {
-	Stats      Stats              `json:"stats" cbor:"0,keyasint"`
-	Info       Info               `json:"info" cbor:"1,keyasint"`
-	Containers []*container.Stats `json:"container" cbor:"2,keyasint"`
+	Stats      Stats              `json:"stats"`
+	Info       Info               `json:"info"`
+	Containers []*container.Stats `json:"container"`
 }
--- a/beszel/internal/hub/agent_connect.go
+++ b/beszel/internal/hub/agent_connect.go
@@ -1,320 +0,0 @@
-package hub
-
-import (
-	"beszel/internal/common"
-	"beszel/internal/hub/expirymap"
-	"beszel/internal/hub/ws"
-	"errors"
-	"net"
-	"net/http"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/blang/semver"
-	"github.com/lxzan/gws"
-	"github.com/pocketbase/dbx"
-	"github.com/pocketbase/pocketbase/core"
-)
-
-// agentConnectRequest holds information related to an agent's connection attempt.
-type agentConnectRequest struct {
-	hub         *Hub
-	req         *http.Request
-	res         http.ResponseWriter
-	token       string
-	agentSemVer semver.Version
-	// isUniversalToken is true if the token is a universal token.
-	isUniversalToken bool
-	// userId is the user ID associated with the universal token.
-	userId string
-}
-
-// universalTokenMap stores active universal tokens and their associated user IDs.
-var universalTokenMap tokenMap
-
-type tokenMap struct {
-	store *expirymap.ExpiryMap[string]
-	once  sync.Once
-}
-
-// getMap returns the expirymap, creating it if necessary.
-func (tm *tokenMap) GetMap() *expirymap.ExpiryMap[string] {
-	tm.once.Do(func() {
-		tm.store = expirymap.New[string](time.Hour)
-	})
-	return tm.store
-}
-
-// handleAgentConnect is the HTTP handler for an agent's connection request.
-func (h *Hub) handleAgentConnect(e *core.RequestEvent) error {
-	agentRequest := agentConnectRequest{req: e.Request, res: e.Response, hub: h}
-	_ = agentRequest.agentConnect()
-	return nil
-}
-
-// agentConnect validates agent credentials and upgrades the connection to a WebSocket.
-func (acr *agentConnectRequest) agentConnect() (err error) {
-	var agentVersion string
-
-	acr.token, agentVersion, err = acr.validateAgentHeaders(acr.req.Header)
-	if err != nil {
-		return acr.sendResponseError(acr.res, http.StatusBadRequest, "")
-	}
-
-	// Check if token is an active universal token
-	acr.userId, acr.isUniversalToken = universalTokenMap.GetMap().GetOk(acr.token)
-
-	// Find matching fingerprint records for this token
-	fpRecords := getFingerprintRecordsByToken(acr.token, acr.hub)
-	if len(fpRecords) == 0 && !acr.isUniversalToken {
-		// Invalid token - no records found and not a universal token
-		return acr.sendResponseError(acr.res, http.StatusUnauthorized, "Invalid token")
-	}
-
-	// Validate agent version
-	acr.agentSemVer, err = semver.Parse(agentVersion)
-	if err != nil {
-		return acr.sendResponseError(acr.res, http.StatusUnauthorized, "Invalid agent version")
-	}
-
-	// Upgrade connection to WebSocket
-	conn, err := ws.GetUpgrader().Upgrade(acr.res, acr.req)
-	if err != nil {
-		return acr.sendResponseError(acr.res, http.StatusInternalServerError, "WebSocket upgrade failed")
-	}
-
-	go acr.verifyWsConn(conn, fpRecords)
-
-	return nil
-}
-
-// verifyWsConn verifies the WebSocket connection using the agent's fingerprint and
-// SSH key signature, then adds the system to the system manager.
-func (acr *agentConnectRequest) verifyWsConn(conn *gws.Conn, fpRecords []ws.FingerprintRecord) (err error) {
-	wsConn := ws.NewWsConnection(conn)
-
-	// must set wsConn in connection store before the read loop
-	conn.Session().Store("wsConn", wsConn)
-
-	// make sure connection is closed if there is an error
-	defer func() {
-		if err != nil {
-			wsConn.Close([]byte(err.Error()))
-		}
-	}()
-
-	go conn.ReadLoop()
-
-	signer, err := acr.hub.GetSSHKey("")
-	if err != nil {
-		return err
-	}
-
-	agentFingerprint, err := wsConn.GetFingerprint(acr.token, signer, acr.isUniversalToken)
-	if err != nil {
-		return err
-	}
-
-	// Find or create the appropriate system for this token and fingerprint
-	fpRecord, err := acr.findOrCreateSystemForToken(fpRecords, agentFingerprint)
-	if err != nil {
-		return err
-	}
-
-	return acr.hub.sm.AddWebSocketSystem(fpRecord.SystemId, acr.agentSemVer, wsConn)
-}
-
-// validateAgentHeaders extracts and validates the token and agent version from HTTP headers.
-func (acr *agentConnectRequest) validateAgentHeaders(headers http.Header) (string, string, error) {
-	token := headers.Get("X-Token")
-	agentVersion := headers.Get("X-Beszel")
-
-	if agentVersion == "" || token == "" || len(token) > 64 {
-		return "", "", errors.New("")
-	}
-	return token, agentVersion, nil
-}
-
-// sendResponseError writes an HTTP error response.
-func (acr *agentConnectRequest) sendResponseError(res http.ResponseWriter, code int, message string) error {
-	res.WriteHeader(code)
-	if message != "" {
-		res.Write([]byte(message))
-	}
-	return nil
-}
-
-// getFingerprintRecordsByToken retrieves all fingerprint records associated with a given token.
-func getFingerprintRecordsByToken(token string, h *Hub) []ws.FingerprintRecord {
-	var records []ws.FingerprintRecord
-	// All will populate empty slice even on error
-	_ = h.DB().NewQuery("SELECT id, system, fingerprint, token FROM fingerprints WHERE token = {:token}").
-		Bind(dbx.Params{
-			"token": token,
-		}).
-		All(&records)
-	return records
-}
-
-// findOrCreateSystemForToken finds an existing system matching the token and fingerprint,
-// or creates a new one for a universal token.
-func (acr *agentConnectRequest) findOrCreateSystemForToken(fpRecords []ws.FingerprintRecord, agentFingerprint common.FingerprintResponse) (ws.FingerprintRecord, error) {
-	// No records - only valid for active universal tokens
-	if len(fpRecords) == 0 {
-		return acr.handleNoRecords(agentFingerprint)
-	}
-
-	// Single record - handle as regular token
-	if len(fpRecords) == 1 && !acr.isUniversalToken {
-		return acr.handleSingleRecord(fpRecords[0], agentFingerprint)
-	}
-
-	// Multiple records or universal token - look for matching fingerprint
-	return acr.handleMultipleRecordsOrUniversalToken(fpRecords, agentFingerprint)
-}
-
-// handleNoRecords handles the case where no fingerprint records are found for a token.
-// A new system is created if the token is a valid universal token.
-func (acr *agentConnectRequest) handleNoRecords(agentFingerprint common.FingerprintResponse) (ws.FingerprintRecord, error) {
-	var fpRecord ws.FingerprintRecord
-
-	if !acr.isUniversalToken || acr.userId == "" {
-		return fpRecord, errors.New("no matching fingerprints")
-	}
-
-	return acr.createNewSystemForUniversalToken(agentFingerprint)
-}
-
-// handleSingleRecord handles the case with a single fingerprint record. It validates
-// the agent's fingerprint against the stored one, or sets it on first connect.
-func (acr *agentConnectRequest) handleSingleRecord(fpRecord ws.FingerprintRecord, agentFingerprint common.FingerprintResponse) (ws.FingerprintRecord, error) {
-	// If no current fingerprint, update with new fingerprint (first time connecting)
-	if fpRecord.Fingerprint == "" {
-		if err := acr.hub.SetFingerprint(&fpRecord, agentFingerprint.Fingerprint); err != nil {
-			return fpRecord, err
-		}
-		// Update the record with the fingerprint that was set
-		fpRecord.Fingerprint = agentFingerprint.Fingerprint
-		return fpRecord, nil
-	}
-
-	// Abort if fingerprint exists but doesn't match (different machine)
-	if fpRecord.Fingerprint != agentFingerprint.Fingerprint {
-		return fpRecord, errors.New("fingerprint mismatch")
-	}
-
-	return fpRecord, nil
-}
-
-// handleMultipleRecordsOrUniversalToken finds a matching fingerprint from multiple records.
-// If no match is found and the token is a universal token, a new system is created.
-func (acr *agentConnectRequest) handleMultipleRecordsOrUniversalToken(fpRecords []ws.FingerprintRecord, agentFingerprint common.FingerprintResponse) (ws.FingerprintRecord, error) {
-	// Return existing record with matching fingerprint if found
-	for i := range fpRecords {
-		if fpRecords[i].Fingerprint == agentFingerprint.Fingerprint {
-			return fpRecords[i], nil
-		}
-	}
-
-	// No matching fingerprint record found, but it's
-	// an active universal token so create a new system
-	if acr.isUniversalToken {
-		return acr.createNewSystemForUniversalToken(agentFingerprint)
-	}
-
-	return ws.FingerprintRecord{}, errors.New("fingerprint mismatch")
-}
-
-// createNewSystemForUniversalToken creates a new system and fingerprint record for a universal token.
-func (acr *agentConnectRequest) createNewSystemForUniversalToken(agentFingerprint common.FingerprintResponse) (ws.FingerprintRecord, error) {
-	var fpRecord ws.FingerprintRecord
-	if !acr.isUniversalToken || acr.userId == "" {
-		return fpRecord, errors.New("invalid token")
-	}
-
-	fpRecord.Token = acr.token
-
-	systemId, err := acr.createSystem(agentFingerprint)
-	if err != nil {
-		return fpRecord, err
-	}
-	fpRecord.SystemId = systemId
-
-	// Set the fingerprint for the new system
-	if err := acr.hub.SetFingerprint(&fpRecord, agentFingerprint.Fingerprint); err != nil {
-		return fpRecord, err
-	}
-
-	// Update the record with the fingerprint that was set
-	fpRecord.Fingerprint = agentFingerprint.Fingerprint
-
-	return fpRecord, nil
-}
-
-// createSystem creates a new system record in the database using details from the agent.
-func (acr *agentConnectRequest) createSystem(agentFingerprint common.FingerprintResponse) (recordId string, err error) {
-	systemsCollection, err := acr.hub.FindCachedCollectionByNameOrId("systems")
-	if err != nil {
-		return "", err
-	}
-	remoteAddr := getRealIP(acr.req)
-	// separate port from address
-	if agentFingerprint.Hostname == "" {
-		agentFingerprint.Hostname = remoteAddr
-	}
-	if agentFingerprint.Port == "" {
-		agentFingerprint.Port = "45876"
-	}
-	// create new record
-	systemRecord := core.NewRecord(systemsCollection)
-	systemRecord.Set("name", agentFingerprint.Hostname)
-	systemRecord.Set("host", remoteAddr)
-	systemRecord.Set("port", agentFingerprint.Port)
-	systemRecord.Set("users", []string{acr.userId})
-
-	return systemRecord.Id, acr.hub.Save(systemRecord)
-}
-
-// SetFingerprint creates or updates a fingerprint record in the database.
-func (h *Hub) SetFingerprint(fpRecord *ws.FingerprintRecord, fingerprint string) (err error) {
-	// // can't use raw query here because it doesn't trigger SSE
-	var record *core.Record
-	switch fpRecord.Id {
-	case "":
-		// create new record for universal token
-		collection, _ := h.FindCachedCollectionByNameOrId("fingerprints")
-		record = core.NewRecord(collection)
-		record.Set("system", fpRecord.SystemId)
-	default:
-		record, err = h.FindRecordById("fingerprints", fpRecord.Id)
-	}
-	if err != nil {
-		return err
-	}
-	record.Set("token", fpRecord.Token)
-	record.Set("fingerprint", fingerprint)
-	return h.SaveNoValidate(record)
-}
-
-// getRealIP extracts the client's real IP address from request headers,
-// checking common proxy headers before falling back to the remote address.
-func getRealIP(r *http.Request) string {
-	if ip := r.Header.Get("CF-Connecting-IP"); ip != "" {
-		return ip
-	}
-	if ip := r.Header.Get("X-Forwarded-For"); ip != "" {
-		// X-Forwarded-For can contain a comma-separated list: "client_ip, proxy1, proxy2"
-		// Take the first one
-		ips := strings.Split(ip, ",")
-		if len(ips) > 0 {
-			return strings.TrimSpace(ips[0])
-		}
-	}
-	// Fallback to RemoteAddr
-	ip, _, err := net.SplitHostPort(r.RemoteAddr)
-	if err != nil {
-		return r.RemoteAddr
-	}
-	return ip
-}
--- a/beszel/internal/hub/agent_connect_test.go
+++ b/beszel/internal/hub/agent_connect_test.go
--- a/beszel/internal/hub/config/config.go
+++ b/beszel/internal/hub/config/config.go
@@ -1,5 +1,4 @@
-// Package config provides functions for syncing systems with the config.yml file
-package config
+package hub

 import (
 	"beszel/internal/entities/system"
@@ -8,7 +7,6 @@ import (
 	"os"
 	"path/filepath"

-	"github.com/google/uuid"
 	"github.com/pocketbase/dbx"
 	"github.com/pocketbase/pocketbase/apis"
 	"github.com/pocketbase/pocketbase/core"
@@ -16,20 +14,19 @@ import (
 	"gopkg.in/yaml.v3"
 )

-type config struct {
-	Systems []systemConfig `yaml:"systems"`
+type Config struct {
+	Systems []SystemConfig `yaml:"systems"`
 }

-type systemConfig struct {
+type SystemConfig struct {
 	Name  string   `yaml:"name"`
 	Host  string   `yaml:"host"`
 	Port  uint16   `yaml:"port,omitempty"`
-	Token string   `yaml:"token,omitempty"`
 	Users []string `yaml:"users"`
 }

 // Syncs systems with the config.yml file
-func SyncSystems(e *core.ServeEvent) error {
+func syncSystemsWithConfig(e *core.ServeEvent) error {
 	h := e.App
 	configPath := filepath.Join(h.DataDir(), "config.yml")
 	configData, err := os.ReadFile(configPath)
@@ -37,7 +34,7 @@ func SyncSystems(e *core.ServeEvent) error {
 		return nil
 	}

-	var config config
+	var config Config
 	err = yaml.Unmarshal(configData, &config)
 	if err != nil {
 		return fmt.Errorf("failed to parse config.yml: %v", err)
@@ -110,14 +107,6 @@ func SyncSystems(e *core.ServeEvent) error {
 			if err := h.Save(existingSystem); err != nil {
 				return err
 			}
-
-			// Only update token if one is specified in config, otherwise preserve existing token
-			if sysConfig.Token != "" {
-				if err := updateFingerprintToken(h, existingSystem.Id, sysConfig.Token); err != nil {
-					return err
-				}
-			}
-
 			delete(existingSystemsMap, key)
 		} else {
 			// Create new system
@@ -135,21 +124,10 @@ func SyncSystems(e *core.ServeEvent) error {
 			if err := h.Save(newSystem); err != nil {
 				return fmt.Errorf("failed to create new system: %v", err)
 			}
-
-			// For new systems, generate token if not provided
-			token := sysConfig.Token
-			if token == "" {
-				token = uuid.New().String()
-			}
-
-			// Create fingerprint record for new system
-			if err := createFingerprintRecord(h, newSystem.Id, token); err != nil {
-				return err
-			}
 		}
 	}

-	// Delete systems not in config (and their fingerprint records will cascade delete)
+	// Delete systems not in config
 	for _, system := range existingSystemsMap {
 		if err := h.Delete(system); err != nil {
 			return err
@@ -161,7 +139,7 @@ func SyncSystems(e *core.ServeEvent) error {
 }

 // Generates content for the config.yml file as a YAML string
-func generateYAML(h core.App) (string, error) {
+func (h *Hub) generateConfigYAML() (string, error) {
 	// Fetch all systems from the database
 	systems, err := h.FindRecordsByFilter("systems", "id != ''", "name", -1, 0)
 	if err != nil {
@@ -169,8 +147,8 @@ func generateYAML(h core.App) (string, error) {
 	}

 	// Create a Config struct to hold the data
-	config := config{
-		Systems: make([]systemConfig, 0, len(systems)),
+	config := Config{
+		Systems: make([]SystemConfig, 0, len(systems)),
 	}

 	// Fetch all users at once
@@ -178,29 +156,11 @@ func generateYAML(h core.App) (string, error) {
 	for _, system := range systems {
 		allUserIDs = append(allUserIDs, system.GetStringSlice("users")...)
 	}
-	userEmailMap, err := getUserEmailMap(h, allUserIDs)
+	userEmailMap, err := h.getUserEmailMap(allUserIDs)
 	if err != nil {
 		return "", err
 	}

-	// Fetch all fingerprint records to get tokens
-	type fingerprintData struct {
-		ID     string `db:"id"`
-		System string `db:"system"`
-		Token  string `db:"token"`
-	}
-	var fingerprints []fingerprintData
-	err = h.DB().NewQuery("SELECT id, system, token FROM fingerprints").All(&fingerprints)
-	if err != nil {
-		return "", err
-	}
-
-	// Create a map of system ID to token
-	systemTokenMap := make(map[string]string)
-	for _, fingerprint := range fingerprints {
-		systemTokenMap[fingerprint.System] = fingerprint.Token
-	}
-
 	// Populate the Config struct with system data
 	for _, system := range systems {
 		userIDs := system.GetStringSlice("users")
@@ -211,12 +171,11 @@ func generateYAML(h core.App) (string, error) {
 			}
 		}

-		sysConfig := systemConfig{
+		sysConfig := SystemConfig{
 			Name:  system.GetString("name"),
 			Host:  system.GetString("host"),
 			Port:  cast.ToUint16(system.Get("port")),
 			Users: userEmails,
-			Token: systemTokenMap[system.Id],
 		}
 		config.Systems = append(config.Systems, sysConfig)
 	}
@@ -228,13 +187,13 @@ func generateYAML(h core.App) (string, error) {
 	}

 	// Add a header to the YAML
-	yamlData = append([]byte("# Values for port, users, and token are optional.\n# Defaults are port 45876, the first created user, and a generated UUID token.\n\n"), yamlData...)
+	yamlData = append([]byte("# Values for port and users are optional.\n# Defaults are port 45876 and the first created user.\n\n"), yamlData...)

 	return string(yamlData), nil
 }

 // New helper function to get a map of user IDs to emails
-func getUserEmailMap(h core.App, userIDs []string) (map[string]string, error) {
+func (h *Hub) getUserEmailMap(userIDs []string) (map[string]string, error) {
 	users, err := h.FindRecordsByIds("users", userIDs)
 	if err != nil {
 		return nil, err
@@ -248,42 +207,13 @@ func getUserEmailMap(h core.App, userIDs []string) (map[string]string, error) {
 	return userEmailMap, nil
 }

-// Helper function to update or create fingerprint token for an existing system
-func updateFingerprintToken(app core.App, systemID, token string) error {
-	// Try to find existing fingerprint record
-	fingerprint, err := app.FindFirstRecordByFilter("fingerprints", "system = {:system}", dbx.Params{"system": systemID})
-	if err != nil {
-		// If no fingerprint record exists, create one
-		return createFingerprintRecord(app, systemID, token)
-	}
-
-	// Update existing fingerprint record with new token (keep existing fingerprint)
-	fingerprint.Set("token", token)
-	return app.Save(fingerprint)
-}
-
-// Helper function to create a new fingerprint record for a system
-func createFingerprintRecord(app core.App, systemID, token string) error {
-	fingerprintsCollection, err := app.FindCollectionByNameOrId("fingerprints")
-	if err != nil {
-		return fmt.Errorf("failed to find fingerprints collection: %v", err)
-	}
-
-	newFingerprint := core.NewRecord(fingerprintsCollection)
-	newFingerprint.Set("system", systemID)
-	newFingerprint.Set("token", token)
-	newFingerprint.Set("fingerprint", "") // Empty fingerprint, will be set on first connection
-
-	return app.Save(newFingerprint)
-}
-
 // Returns the current config.yml file as a JSON object
-func GetYamlConfig(e *core.RequestEvent) error {
+func (h *Hub) getYamlConfig(e *core.RequestEvent) error {
 	info, _ := e.RequestInfo()
 	if info.Auth == nil || info.Auth.GetString("role") != "admin" {
 		return apis.NewForbiddenError("Forbidden", nil)
 	}
-	configContent, err := generateYAML(e.App)
+	configContent, err := h.generateConfigYAML()
 	if err != nil {
 		return err
 	}
--- a/beszel/internal/hub/config/config_test.go
+++ b/beszel/internal/hub/config/config_test.go
@@ -1,245 +0,0 @@
-//go:build testing
-// +build testing
-
-package config_test
-
-import (
-	"beszel/internal/hub/config"
-	"beszel/internal/tests"
-	"os"
-	"path/filepath"
-	"testing"
-
-	"github.com/pocketbase/pocketbase/core"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"gopkg.in/yaml.v3"
-)
-
-// Config struct for testing (copied from config package since it's not exported)
-type testConfig struct {
-	Systems []testSystemConfig `yaml:"systems"`
-}
-
-type testSystemConfig struct {
-	Name  string   `yaml:"name"`
-	Host  string   `yaml:"host"`
-	Port  uint16   `yaml:"port,omitempty"`
-	Users []string `yaml:"users"`
-	Token string   `yaml:"token,omitempty"`
-}
-
-// Helper function to create a test system for config tests
-// func createConfigTestSystem(app core.App, name, host string, port uint16, userIDs []string) (*core.Record, error) {
-// 	systemCollection, err := app.FindCollectionByNameOrId("systems")
-// 	if err != nil {
-// 		return nil, err
-// 	}
-
-// 	system := core.NewRecord(systemCollection)
-// 	system.Set("name", name)
-// 	system.Set("host", host)
-// 	system.Set("port", port)
-// 	system.Set("users", userIDs)
-// 	system.Set("status", "pending")
-
-// 	return system, app.Save(system)
-// }
-
-// Helper function to create a fingerprint record
-func createConfigTestFingerprint(app core.App, systemID, token, fingerprint string) (*core.Record, error) {
-	fingerprintCollection, err := app.FindCollectionByNameOrId("fingerprints")
-	if err != nil {
-		return nil, err
-	}
-
-	fp := core.NewRecord(fingerprintCollection)
-	fp.Set("system", systemID)
-	fp.Set("token", token)
-	fp.Set("fingerprint", fingerprint)
-
-	return fp, app.Save(fp)
-}
-
-// TestConfigSyncWithTokens tests the config.SyncSystems function with various token scenarios
-func TestConfigSyncWithTokens(t *testing.T) {
-	testHub, err := tests.NewTestHub()
-	require.NoError(t, err)
-	defer testHub.Cleanup()
-
-	// Create test user
-	user, err := tests.CreateUser(testHub.App, "admin@example.com", "testtesttest")
-	require.NoError(t, err)
-
-	testCases := []struct {
-		name        string
-		setupFunc   func() (string, *core.Record, *core.Record) // Returns: existing token, system record, fingerprint record
-		configYAML  string
-		expectToken string // Expected token after sync
-		description string
-	}{
-		{
-			name: "new system with token in config",
-			setupFunc: func() (string, *core.Record, *core.Record) {
-				return "", nil, nil // No existing system
-			},
-			configYAML: `systems:
-  - name: "new-server"
-    host: "new.example.com"
-    port: 45876
-    users:
-      - "admin@example.com"
-    token: "explicit-token-123"`,
-			expectToken: "explicit-token-123",
-			description: "New system should use token from config",
-		},
-		{
-			name: "existing system without token in config (preserve existing)",
-			setupFunc: func() (string, *core.Record, *core.Record) {
-				// Create existing system and fingerprint
-				system, err := tests.CreateRecord(testHub.App, "systems", map[string]any{
-					"name":  "preserve-server",
-					"host":  "preserve.example.com",
-					"port":  45876,
-					"users": []string{user.Id},
-				})
-				require.NoError(t, err)
-
-				fingerprint, err := createConfigTestFingerprint(testHub.App, system.Id, "preserve-token-999", "preserve-fingerprint")
-				require.NoError(t, err)
-
-				return "preserve-token-999", system, fingerprint
-			},
-			configYAML: `systems:
-  - name: "preserve-server"
-    host: "preserve.example.com"
-    port: 45876
-    users:
-      - "admin@example.com"`,
-			expectToken: "preserve-token-999",
-			description: "Existing system should preserve original token when config doesn't specify one",
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			// Setup test data
-			_, existingSystem, existingFingerprint := tc.setupFunc()
-
-			// Write config file
-			configPath := filepath.Join(testHub.DataDir(), "config.yml")
-			err := os.WriteFile(configPath, []byte(tc.configYAML), 0644)
-			require.NoError(t, err)
-
-			// Create serve event and sync
-			event := &core.ServeEvent{App: testHub.App}
-			err = config.SyncSystems(event)
-			require.NoError(t, err)
-
-			// Parse the config to get the system name for verification
-			var configData testConfig
-			err = yaml.Unmarshal([]byte(tc.configYAML), &configData)
-			require.NoError(t, err)
-			require.Len(t, configData.Systems, 1)
-			systemName := configData.Systems[0].Name
-
-			// Find the system after sync
-			systems, err := testHub.FindRecordsByFilter("systems", "name = {:name}", "", -1, 0, map[string]any{"name": systemName})
-			require.NoError(t, err)
-			require.Len(t, systems, 1)
-			system := systems[0]
-
-			// Find the fingerprint record
-			fingerprints, err := testHub.FindRecordsByFilter("fingerprints", "system = {:system}", "", -1, 0, map[string]any{"system": system.Id})
-			require.NoError(t, err)
-			require.Len(t, fingerprints, 1)
-			fingerprint := fingerprints[0]
-
-			// Verify token
-			actualToken := fingerprint.GetString("token")
-			if tc.expectToken == "" {
-				// For generated tokens, just verify it's not empty and is a valid UUID format
-				assert.NotEmpty(t, actualToken, tc.description)
-				assert.Len(t, actualToken, 36, "Generated token should be UUID format") // UUID length
-			} else {
-				assert.Equal(t, tc.expectToken, actualToken, tc.description)
-			}
-
-			// For existing systems, verify fingerprint is preserved
-			if existingFingerprint != nil {
-				actualFingerprint := fingerprint.GetString("fingerprint")
-				expectedFingerprint := existingFingerprint.GetString("fingerprint")
-				assert.Equal(t, expectedFingerprint, actualFingerprint, "Fingerprint should be preserved")
-			}
-
-			// Cleanup for next test
-			if existingSystem != nil {
-				testHub.Delete(existingSystem)
-			}
-			if existingFingerprint != nil {
-				testHub.Delete(existingFingerprint)
-			}
-			// Clean up the new records
-			testHub.Delete(system)
-			testHub.Delete(fingerprint)
-		})
-	}
-}
-
-// TestConfigMigrationScenario tests the specific migration scenario mentioned in the discussion
-func TestConfigMigrationScenario(t *testing.T) {
-	testHub, err := tests.NewTestHub(t.TempDir())
-	require.NoError(t, err)
-	defer testHub.Cleanup()
-
-	// Create test user
-	user, err := tests.CreateUser(testHub.App, "admin@example.com", "testtesttest")
-	require.NoError(t, err)
-
-	// Simulate migration scenario: system exists with token from migration
-	existingSystem, err := tests.CreateRecord(testHub.App, "systems", map[string]any{
-		"name":  "migrated-server",
-		"host":  "migrated.example.com",
-		"port":  45876,
-		"users": []string{user.Id},
-	})
-	require.NoError(t, err)
-
-	migrationToken := "migration-generated-token-123"
-	existingFingerprint, err := createConfigTestFingerprint(testHub.App, existingSystem.Id, migrationToken, "existing-fingerprint-from-agent")
-	require.NoError(t, err)
-
-	// User exports config BEFORE this update (so no token field in YAML)
-	oldConfigYAML := `systems:
-  - name: "migrated-server"
-    host: "migrated.example.com"
-    port: 45876
-    users:
-      - "admin@example.com"`
-
-	// Write old config file and import
-	configPath := filepath.Join(testHub.DataDir(), "config.yml")
-	err = os.WriteFile(configPath, []byte(oldConfigYAML), 0644)
-	require.NoError(t, err)
-
-	event := &core.ServeEvent{App: testHub.App}
-	err = config.SyncSystems(event)
-	require.NoError(t, err)
-
-	// Verify the original token is preserved
-	updatedFingerprint, err := testHub.FindRecordById("fingerprints", existingFingerprint.Id)
-	require.NoError(t, err)
-
-	actualToken := updatedFingerprint.GetString("token")
-	assert.Equal(t, migrationToken, actualToken, "Migration token should be preserved when config doesn't specify a token")
-
-	// Verify fingerprint is also preserved
-	actualFingerprint := updatedFingerprint.GetString("fingerprint")
-	assert.Equal(t, "existing-fingerprint-from-agent", actualFingerprint, "Existing fingerprint should be preserved")
-
-	// Verify system still exists and is updated correctly
-	updatedSystem, err := testHub.FindRecordById("systems", existingSystem.Id)
-	require.NoError(t, err)
-	assert.Equal(t, "migrated-server", updatedSystem.GetString("name"))
-	assert.Equal(t, "migrated.example.com", updatedSystem.GetString("host"))
-}
--- a/beszel/internal/hub/expirymap/expirymap.go
+++ b/beszel/internal/hub/expirymap/expirymap.go
@@ -1,104 +0,0 @@
-package expirymap
-
-import (
-	"reflect"
-	"time"
-
-	"github.com/pocketbase/pocketbase/tools/store"
-)
-
-type val[T any] struct {
-	value   T
-	expires time.Time
-}
-
-type ExpiryMap[T any] struct {
-	store           *store.Store[string, *val[T]]
-	cleanupInterval time.Duration
-}
-
-// New creates a new expiry map with custom cleanup interval
-func New[T any](cleanupInterval time.Duration) *ExpiryMap[T] {
-	m := &ExpiryMap[T]{
-		store:           store.New(map[string]*val[T]{}),
-		cleanupInterval: cleanupInterval,
-	}
-	m.startCleaner()
-	return m
-}
-
-// Set stores a value with the given TTL
-func (m *ExpiryMap[T]) Set(key string, value T, ttl time.Duration) {
-	m.store.Set(key, &val[T]{
-		value:   value,
-		expires: time.Now().Add(ttl),
-	})
-}
-
-// GetOk retrieves a value and checks if it exists and hasn't expired
-// Performs lazy cleanup of expired entries on access
-func (m *ExpiryMap[T]) GetOk(key string) (T, bool) {
-	value, ok := m.store.GetOk(key)
-	if !ok {
-		return *new(T), false
-	}
-
-	// Check if expired and perform lazy cleanup
-	if value.expires.Before(time.Now()) {
-		m.store.Remove(key)
-		return *new(T), false
-	}
-
-	return value.value, true
-}
-
-// GetByValue retrieves a value by value
-func (m *ExpiryMap[T]) GetByValue(val T) (key string, value T, ok bool) {
-	for key, v := range m.store.GetAll() {
-		if reflect.DeepEqual(v.value, val) {
-			// check if expired
-			if v.expires.Before(time.Now()) {
-				m.store.Remove(key)
-				break
-			}
-			return key, v.value, true
-		}
-	}
-	return "", *new(T), false
-}
-
-// Remove explicitly removes a key
-func (m *ExpiryMap[T]) Remove(key string) {
-	m.store.Remove(key)
-}
-
-// RemovebyValue removes a value by value
-func (m *ExpiryMap[T]) RemovebyValue(value T) (T, bool) {
-	for key, val := range m.store.GetAll() {
-		if reflect.DeepEqual(val.value, value) {
-			m.store.Remove(key)
-			return val.value, true
-		}
-	}
-	return *new(T), false
-}
-
-// startCleaner runs the background cleanup process
-func (m *ExpiryMap[T]) startCleaner() {
-	go func() {
-		tick := time.Tick(m.cleanupInterval)
-		for range tick {
-			m.cleanup()
-		}
-	}()
-}
-
-// cleanup removes all expired entries
-func (m *ExpiryMap[T]) cleanup() {
-	now := time.Now()
-	for key, val := range m.store.GetAll() {
-		if val.expires.Before(now) {
-			m.store.Remove(key)
-		}
-	}
-}
--- a/beszel/internal/hub/expirymap/expirymap_test.go
+++ b/beszel/internal/hub/expirymap/expirymap_test.go
@@ -1,477 +0,0 @@
-//go:build testing
-// +build testing
-
-package expirymap
-
-import (
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-// Not using the following methods but are useful for testing
-
-// TESTING: Has checks if a key exists and hasn't expired
-func (m *ExpiryMap[T]) Has(key string) bool {
-	_, ok := m.GetOk(key)
-	return ok
-}
-
-// TESTING: Get retrieves a value, returns zero value if not found or expired
-func (m *ExpiryMap[T]) Get(key string) T {
-	value, _ := m.GetOk(key)
-	return value
-}
-
-// TESTING: Len returns the number of non-expired entries
-func (m *ExpiryMap[T]) Len() int {
-	count := 0
-	now := time.Now()
-	for _, val := range m.store.Values() {
-		if val.expires.After(now) {
-			count++
-		}
-	}
-	return count
-}
-
-func TestExpiryMap_BasicOperations(t *testing.T) {
-	em := New[string](time.Hour)
-
-	// Test Set and GetOk
-	em.Set("key1", "value1", time.Hour)
-	value, ok := em.GetOk("key1")
-	assert.True(t, ok)
-	assert.Equal(t, "value1", value)
-
-	// Test Get
-	value = em.Get("key1")
-	assert.Equal(t, "value1", value)
-
-	// Test Has
-	assert.True(t, em.Has("key1"))
-	assert.False(t, em.Has("nonexistent"))
-
-	// Test Remove
-	em.Remove("key1")
-	assert.False(t, em.Has("key1"))
-}
-
-func TestExpiryMap_Expiration(t *testing.T) {
-	em := New[string](time.Hour)
-
-	// Set a value with very short TTL
-	em.Set("shortlived", "value", time.Millisecond*10)
-
-	// Should exist immediately
-	assert.True(t, em.Has("shortlived"))
-
-	// Wait for expiration
-	time.Sleep(time.Millisecond * 20)
-
-	// Should be expired and automatically cleaned up on access
-	assert.False(t, em.Has("shortlived"))
-	value, ok := em.GetOk("shortlived")
-	assert.False(t, ok)
-	assert.Equal(t, "", value) // zero value for string
-}
-
-func TestExpiryMap_LazyCleanup(t *testing.T) {
-	em := New[int](time.Hour)
-
-	// Set multiple values with short TTL
-	em.Set("key1", 1, time.Millisecond*10)
-	em.Set("key2", 2, time.Millisecond*10)
-	em.Set("key3", 3, time.Hour) // This one won't expire
-
-	// Wait for expiration
-	time.Sleep(time.Millisecond * 20)
-
-	// Access expired keys should trigger lazy cleanup
-	_, ok := em.GetOk("key1")
-	assert.False(t, ok)
-
-	// Non-expired key should still exist
-	value, ok := em.GetOk("key3")
-	assert.True(t, ok)
-	assert.Equal(t, 3, value)
-}
-
-func TestExpiryMap_Len(t *testing.T) {
-	em := New[string](time.Hour)
-
-	// Initially empty
-	assert.Equal(t, 0, em.Len())
-
-	// Add some values
-	em.Set("key1", "value1", time.Hour)
-	em.Set("key2", "value2", time.Hour)
-	em.Set("key3", "value3", time.Millisecond*10) // Will expire soon
-
-	// Should count all initially
-	assert.Equal(t, 3, em.Len())
-
-	// Wait for one to expire
-	time.Sleep(time.Millisecond * 20)
-
-	// Len should reflect only non-expired entries
-	assert.Equal(t, 2, em.Len())
-}
-
-func TestExpiryMap_CustomInterval(t *testing.T) {
-	// Create with very short cleanup interval for testing
-	em := New[string](time.Millisecond * 50)
-
-	// Set a value that expires quickly
-	em.Set("test", "value", time.Millisecond*10)
-
-	// Should exist initially
-	assert.True(t, em.Has("test"))
-
-	// Wait for expiration + cleanup cycle
-	time.Sleep(time.Millisecond * 100)
-
-	// Should be cleaned up by background process
-	// Note: This test might be flaky due to timing, but demonstrates the concept
-	assert.False(t, em.Has("test"))
-}
-
-func TestExpiryMap_GenericTypes(t *testing.T) {
-	// Test with different types
-	t.Run("Int", func(t *testing.T) {
-		em := New[int](time.Hour)
-
-		em.Set("num", 42, time.Hour)
-		value, ok := em.GetOk("num")
-		assert.True(t, ok)
-		assert.Equal(t, 42, value)
-	})
-
-	t.Run("Struct", func(t *testing.T) {
-		type TestStruct struct {
-			Name string
-			Age  int
-		}
-
-		em := New[TestStruct](time.Hour)
-
-		expected := TestStruct{Name: "John", Age: 30}
-		em.Set("person", expected, time.Hour)
-
-		value, ok := em.GetOk("person")
-		assert.True(t, ok)
-		assert.Equal(t, expected, value)
-	})
-
-	t.Run("Pointer", func(t *testing.T) {
-		em := New[*string](time.Hour)
-
-		str := "hello"
-		em.Set("ptr", &str, time.Hour)
-
-		value, ok := em.GetOk("ptr")
-		assert.True(t, ok)
-		require.NotNil(t, value)
-		assert.Equal(t, "hello", *value)
-	})
-}
-
-func TestExpiryMap_ZeroValues(t *testing.T) {
-	em := New[string](time.Hour)
-
-	// Test getting non-existent key returns zero value
-	value := em.Get("nonexistent")
-	assert.Equal(t, "", value)
-
-	// Test getting expired key returns zero value
-	em.Set("expired", "value", time.Millisecond*10)
-	time.Sleep(time.Millisecond * 20)
-
-	value = em.Get("expired")
-	assert.Equal(t, "", value)
-}
-
-func TestExpiryMap_Concurrent(t *testing.T) {
-	em := New[int](time.Hour)
-
-	// Simple concurrent access test
-	done := make(chan bool, 2)
-
-	// Writer goroutine
-	go func() {
-		for i := 0; i < 100; i++ {
-			em.Set("key", i, time.Hour)
-			time.Sleep(time.Microsecond)
-		}
-		done <- true
-	}()
-
-	// Reader goroutine
-	go func() {
-		for i := 0; i < 100; i++ {
-			_ = em.Get("key")
-			time.Sleep(time.Microsecond)
-		}
-		done <- true
-	}()
-
-	// Wait for both to complete
-	<-done
-	<-done
-
-	// Should not panic and should have some value
-	assert.True(t, em.Has("key"))
-}
-
-func TestExpiryMap_GetByValue(t *testing.T) {
-	em := New[string](time.Hour)
-
-	// Test getting by value when value exists
-	em.Set("key1", "value1", time.Hour)
-	em.Set("key2", "value2", time.Hour)
-	em.Set("key3", "value1", time.Hour) // Duplicate value - should return first match
-
-	// Test successful retrieval
-	key, value, ok := em.GetByValue("value1")
-	assert.True(t, ok)
-	assert.Equal(t, "value1", value)
-	assert.Contains(t, []string{"key1", "key3"}, key) // Should be one of the keys with this value
-
-	// Test retrieval of unique value
-	key, value, ok = em.GetByValue("value2")
-	assert.True(t, ok)
-	assert.Equal(t, "value2", value)
-	assert.Equal(t, "key2", key)
-
-	// Test getting non-existent value
-	key, value, ok = em.GetByValue("nonexistent")
-	assert.False(t, ok)
-	assert.Equal(t, "", value) // zero value for string
-	assert.Equal(t, "", key)   // zero value for string
-}
-
-func TestExpiryMap_GetByValue_Expiration(t *testing.T) {
-	em := New[string](time.Hour)
-
-	// Set a value with short TTL
-	em.Set("shortkey", "shortvalue", time.Millisecond*10)
-	em.Set("longkey", "longvalue", time.Hour)
-
-	// Should find the short-lived value initially
-	key, value, ok := em.GetByValue("shortvalue")
-	assert.True(t, ok)
-	assert.Equal(t, "shortvalue", value)
-	assert.Equal(t, "shortkey", key)
-
-	// Wait for expiration
-	time.Sleep(time.Millisecond * 20)
-
-	// Should not find expired value and should trigger lazy cleanup
-	key, value, ok = em.GetByValue("shortvalue")
-	assert.False(t, ok)
-	assert.Equal(t, "", value)
-	assert.Equal(t, "", key)
-
-	// Should still find non-expired value
-	key, value, ok = em.GetByValue("longvalue")
-	assert.True(t, ok)
-	assert.Equal(t, "longvalue", value)
-	assert.Equal(t, "longkey", key)
-}
-
-func TestExpiryMap_GetByValue_GenericTypes(t *testing.T) {
-	t.Run("Int", func(t *testing.T) {
-		em := New[int](time.Hour)
-
-		em.Set("num1", 42, time.Hour)
-		em.Set("num2", 84, time.Hour)
-
-		key, value, ok := em.GetByValue(42)
-		assert.True(t, ok)
-		assert.Equal(t, 42, value)
-		assert.Equal(t, "num1", key)
-
-		key, value, ok = em.GetByValue(99)
-		assert.False(t, ok)
-		assert.Equal(t, 0, value)
-		assert.Equal(t, "", key)
-	})
-
-	t.Run("Struct", func(t *testing.T) {
-		type TestStruct struct {
-			Name string
-			Age  int
-		}
-
-		em := New[TestStruct](time.Hour)
-
-		person1 := TestStruct{Name: "John", Age: 30}
-		person2 := TestStruct{Name: "Jane", Age: 25}
-
-		em.Set("person1", person1, time.Hour)
-		em.Set("person2", person2, time.Hour)
-
-		key, value, ok := em.GetByValue(person1)
-		assert.True(t, ok)
-		assert.Equal(t, person1, value)
-		assert.Equal(t, "person1", key)
-
-		nonexistent := TestStruct{Name: "Bob", Age: 40}
-		key, value, ok = em.GetByValue(nonexistent)
-		assert.False(t, ok)
-		assert.Equal(t, TestStruct{}, value)
-		assert.Equal(t, "", key)
-	})
-}
-
-func TestExpiryMap_RemoveValue(t *testing.T) {
-	em := New[string](time.Hour)
-
-	// Test removing existing value
-	em.Set("key1", "value1", time.Hour)
-	em.Set("key2", "value2", time.Hour)
-	em.Set("key3", "value1", time.Hour) // Duplicate value
-
-	// Remove by value should remove one instance
-	removedValue, ok := em.RemovebyValue("value1")
-	assert.True(t, ok)
-	assert.Equal(t, "value1", removedValue)
-
-	// Should still have the other instance or value2
-	assert.True(t, em.Has("key2")) // value2 should still exist
-
-	// Check if one of the duplicate values was removed
-	// At least one key with "value1" should be gone
-	key1Exists := em.Has("key1")
-	key3Exists := em.Has("key3")
-	assert.False(t, key1Exists && key3Exists) // Both shouldn't exist
-	assert.True(t, key1Exists || key3Exists)  // At least one should be gone
-
-	// Test removing non-existent value
-	removedValue, ok = em.RemovebyValue("nonexistent")
-	assert.False(t, ok)
-	assert.Equal(t, "", removedValue) // zero value for string
-}
-
-func TestExpiryMap_RemoveValue_GenericTypes(t *testing.T) {
-	t.Run("Int", func(t *testing.T) {
-		em := New[int](time.Hour)
-
-		em.Set("num1", 42, time.Hour)
-		em.Set("num2", 84, time.Hour)
-
-		// Remove existing value
-		removedValue, ok := em.RemovebyValue(42)
-		assert.True(t, ok)
-		assert.Equal(t, 42, removedValue)
-		assert.False(t, em.Has("num1"))
-		assert.True(t, em.Has("num2"))
-
-		// Remove non-existent value
-		removedValue, ok = em.RemovebyValue(99)
-		assert.False(t, ok)
-		assert.Equal(t, 0, removedValue)
-	})
-
-	t.Run("Struct", func(t *testing.T) {
-		type TestStruct struct {
-			Name string
-			Age  int
-		}
-
-		em := New[TestStruct](time.Hour)
-
-		person1 := TestStruct{Name: "John", Age: 30}
-		person2 := TestStruct{Name: "Jane", Age: 25}
-
-		em.Set("person1", person1, time.Hour)
-		em.Set("person2", person2, time.Hour)
-
-		// Remove existing struct
-		removedValue, ok := em.RemovebyValue(person1)
-		assert.True(t, ok)
-		assert.Equal(t, person1, removedValue)
-		assert.False(t, em.Has("person1"))
-		assert.True(t, em.Has("person2"))
-
-		// Remove non-existent struct
-		nonexistent := TestStruct{Name: "Bob", Age: 40}
-		removedValue, ok = em.RemovebyValue(nonexistent)
-		assert.False(t, ok)
-		assert.Equal(t, TestStruct{}, removedValue)
-	})
-}
-
-func TestExpiryMap_RemoveValue_WithExpiration(t *testing.T) {
-	em := New[string](time.Hour)
-
-	// Set values with different TTLs
-	em.Set("key1", "value1", time.Millisecond*10) // Will expire
-	em.Set("key2", "value2", time.Hour)           // Won't expire
-	em.Set("key3", "value1", time.Hour)           // Won't expire, duplicate value
-
-	// Wait for first value to expire
-	time.Sleep(time.Millisecond * 20)
-
-	// Try to remove the expired value - should remove one of the "value1" entries
-	removedValue, ok := em.RemovebyValue("value1")
-	assert.True(t, ok)
-	assert.Equal(t, "value1", removedValue)
-
-	// Should still have key2 (different value)
-	assert.True(t, em.Has("key2"))
-
-	// Should have removed one of the "value1" entries (either key1 or key3)
-	// But we can't predict which one due to map iteration order
-	key1Exists := em.Has("key1")
-	key3Exists := em.Has("key3")
-
-	// Exactly one of key1 or key3 should be gone
-	assert.False(t, key1Exists && key3Exists) // Both shouldn't exist
-	assert.True(t, key1Exists || key3Exists)  // At least one should still exist
-}
-
-func TestExpiryMap_ValueOperations_Integration(t *testing.T) {
-	em := New[string](time.Hour)
-
-	// Test integration of GetByValue and RemoveValue
-	em.Set("key1", "shared", time.Hour)
-	em.Set("key2", "unique", time.Hour)
-	em.Set("key3", "shared", time.Hour)
-
-	// Find shared value
-	key, value, ok := em.GetByValue("shared")
-	assert.True(t, ok)
-	assert.Equal(t, "shared", value)
-	assert.Contains(t, []string{"key1", "key3"}, key)
-
-	// Remove shared value
-	removedValue, ok := em.RemovebyValue("shared")
-	assert.True(t, ok)
-	assert.Equal(t, "shared", removedValue)
-
-	// Should still be able to find the other shared value
-	key, value, ok = em.GetByValue("shared")
-	assert.True(t, ok)
-	assert.Equal(t, "shared", value)
-	assert.Contains(t, []string{"key1", "key3"}, key)
-
-	// Remove the other shared value
-	removedValue, ok = em.RemovebyValue("shared")
-	assert.True(t, ok)
-	assert.Equal(t, "shared", removedValue)
-
-	// Should not find shared value anymore
-	key, value, ok = em.GetByValue("shared")
-	assert.False(t, ok)
-	assert.Equal(t, "", value)
-	assert.Equal(t, "", key)
-
-	// Unique value should still exist
-	key, value, ok = em.GetByValue("unique")
-	assert.True(t, ok)
-	assert.Equal(t, "unique", value)
-	assert.Equal(t, "key2", key)
-}
--- a/beszel/internal/hub/hub.go
+++ b/beszel/internal/hub/hub.go
@@ -4,7 +4,6 @@ package hub
 import (
 	"beszel"
 	"beszel/internal/alerts"
-	"beszel/internal/hub/config"
 	"beszel/internal/hub/systems"
 	"beszel/internal/records"
 	"beszel/internal/users"
@@ -19,9 +18,7 @@ import (
 	"os"
 	"path"
 	"strings"
-	"time"

-	"github.com/google/uuid"
 	"github.com/pocketbase/pocketbase"
 	"github.com/pocketbase/pocketbase/apis"
 	"github.com/pocketbase/pocketbase/core"
@@ -35,7 +32,6 @@ type Hub struct {
 	rm     *records.RecordManager
 	sm     *systems.SystemManager
 	pubKey string
-	signer ssh.Signer
 	appURL string
 }

@@ -68,7 +64,7 @@ func (h *Hub) StartHub() error {
 			return err
 		}
 		// sync systems with config
-		if err := config.SyncSystems(e); err != nil {
+		if err := syncSystemsWithConfig(e); err != nil {
 			return err
 		}
 		// register api routes
@@ -116,9 +112,6 @@ func (h *Hub) initialize(e *core.ServeEvent) error {
 	if h.appURL != "" {
 		settings.Meta.AppURL = h.appURL
 	}
-	if err := e.App.Save(settings); err != nil {
-		return err
-	}
 	// set auth settings
 	usersCollection, err := e.App.FindCollectionByNameOrId("users")
 	if err != nil {
@@ -188,7 +181,6 @@ func (h *Hub) startServer(se *core.ServeEvent) error {
 		indexFile, _ := fs.ReadFile(site.DistDirFS, "index.html")
 		indexContent := strings.ReplaceAll(string(indexFile), "./", basePath)
 		indexContent = strings.Replace(indexContent, "{{V}}", beszel.Version, 1)
-		indexContent = strings.Replace(indexContent, "{{HUB_URL}}", h.appURL, 1)
 		// set up static asset serving
 		staticPaths := [2]string{"/static/", "/assets/"}
 		serveStatic := apis.Static(site.DistDirFS, false)
@@ -240,11 +232,7 @@ func (h *Hub) registerApiRoutes(se *core.ServeEvent) error {
 	// send test notification
 	se.Router.GET("/api/beszel/send-test-notification", h.SendTestNotification)
 	// API endpoint to get config.yml content
-	se.Router.GET("/api/beszel/config-yaml", config.GetYamlConfig)
-	// handle agent websocket connection
-	se.Router.GET("/api/beszel/agent-connect", h.handleAgentConnect)
-	// get or create universal tokens
-	se.Router.GET("/api/beszel/universal-token", h.getUniversalToken)
+	se.Router.GET("/api/beszel/config-yaml", h.getYamlConfig)
 	// create first user endpoint only needed if no users exist
 	if totalUsers, _ := h.CountRecords("users"); totalUsers == 0 {
 		se.Router.POST("/api/beszel/create-user", h.um.CreateFirstUser)
@@ -252,49 +240,8 @@ func (h *Hub) registerApiRoutes(se *core.ServeEvent) error {
 	return nil
 }

-// Handler for universal token API endpoint (create, read, delete)
-func (h *Hub) getUniversalToken(e *core.RequestEvent) error {
-	info, err := e.RequestInfo()
-	if err != nil || info.Auth == nil {
-		return apis.NewForbiddenError("Forbidden", nil)
-	}
-
-	tokenMap := universalTokenMap.GetMap()
-	userID := info.Auth.Id
-	query := e.Request.URL.Query()
-	token := query.Get("token")
-	tokenSet := token != ""
-
-	if !tokenSet {
-		// return existing token if it exists
-		if token, _, ok := tokenMap.GetByValue(userID); ok {
-			return e.JSON(http.StatusOK, map[string]any{"token": token, "active": true})
-		}
-		// if no token is provided, generate a new one
-		token = uuid.New().String()
-	}
-	response := map[string]any{"token": token}
-
-	switch query.Get("enable") {
-	case "1":
-		tokenMap.Set(token, userID, time.Hour)
-	case "0":
-		tokenMap.RemovebyValue(userID)
-	}
-	_, response["active"] = tokenMap.GetOk(token)
-	return e.JSON(http.StatusOK, response)
-}
-
 // generates key pair if it doesn't exist and returns signer
 func (h *Hub) GetSSHKey(dataDir string) (ssh.Signer, error) {
-	if h.signer != nil {
-		return h.signer, nil
-	}
-
-	if dataDir == "" {
-		dataDir = h.DataDir()
-	}
-
 	privateKeyPath := path.Join(dataDir, "id_ed25519")

 	// check if the key pair already exists
@@ -313,10 +260,12 @@ func (h *Hub) GetSSHKey(dataDir string) (ssh.Signer, error) {
 	}

 	// Generate the Ed25519 key pair
-	_, privKey, err := ed25519.GenerateKey(nil)
+	pubKey, privKey, err := ed25519.GenerateKey(nil)
 	if err != nil {
 		return nil, err
 	}
+
+	// Get the private key in OpenSSH format
 	privKeyPem, err := ssh.MarshalPrivateKey(privKey, "")
 	if err != nil {
 		return nil, err
@@ -327,11 +276,13 @@ func (h *Hub) GetSSHKey(dataDir string) (ssh.Signer, error) {
 	}

 	// These are fine to ignore the errors on, as we've literally just created a crypto.PublicKey | crypto.Signer
+	sshPubKey, _ := ssh.NewPublicKey(pubKey)
 	sshPrivate, _ := ssh.NewSignerFromSigner(privKey)
-	pubKeyBytes := ssh.MarshalAuthorizedKey(sshPrivate.PublicKey())
+
+	pubKeyBytes := ssh.MarshalAuthorizedKey(sshPubKey)
 	h.pubKey = strings.TrimSuffix(string(pubKeyBytes), "\n")

-	h.Logger().Info("ed25519 key pair generated successfully.")
+	h.Logger().Info("ed25519 SSH key pair generated successfully.")
 	h.Logger().Info("Saved to: " + privateKeyPath)

 	return sshPrivate, err
--- a/beszel/internal/hub/hub_test.go
+++ b/beszel/internal/hub/hub_test.go
@@ -1,10 +1,9 @@
 //go:build testing
 // +build testing

-package hub_test
+package hub

 import (
-	"beszel/internal/tests"
 	"testing"

 	"crypto/ed25519"
@@ -13,18 +12,20 @@ import (
 	"path/filepath"
 	"strings"

+	"github.com/pocketbase/pocketbase"
 	"github.com/stretchr/testify/assert"
+
 	"github.com/stretchr/testify/require"
 	"golang.org/x/crypto/ssh"
 )

-func getTestHub(t testing.TB) *tests.TestHub {
-	hub, _ := tests.NewTestHub(t.TempDir())
-	return hub
+func getTestHub() *Hub {
+	app := pocketbase.New()
+	return NewHub(app)
 }

 func TestMakeLink(t *testing.T) {
-	hub := getTestHub(t)
+	hub := getTestHub()

 	tests := []struct {
 		name     string
@@ -114,14 +115,14 @@ func TestMakeLink(t *testing.T) {
 }

 func TestGetSSHKey(t *testing.T) {
-	hub := getTestHub(t)
+	hub := getTestHub()

 	// Test Case 1: Key generation (no existing key)
 	t.Run("KeyGeneration", func(t *testing.T) {
 		tempDir := t.TempDir()

 		// Ensure pubKey is initially empty or different to ensure GetSSHKey sets it
-		hub.SetPubkey("")
+		hub.pubKey = ""

 		signer, err := hub.GetSSHKey(tempDir)
 		assert.NoError(t, err, "GetSSHKey should not error when generating a new key")
@@ -134,8 +135,8 @@ func TestGetSSHKey(t *testing.T) {
 		assert.False(t, info.IsDir(), "Private key path should be a file, not a directory")

 		// Check if h.pubKey was set
-		assert.NotEmpty(t, hub.GetPubkey(), "h.pubKey should be set after key generation")
-		assert.True(t, strings.HasPrefix(hub.GetPubkey(), "ssh-ed25519 "), "h.pubKey should start with 'ssh-ed25519 '")
+		assert.NotEmpty(t, hub.pubKey, "h.pubKey should be set after key generation")
+		assert.True(t, strings.HasPrefix(hub.pubKey, "ssh-ed25519 "), "h.pubKey should start with 'ssh-ed25519 '")

 		// Verify the generated private key is parsable
 		keyData, err := os.ReadFile(privateKeyPath)
@@ -169,14 +170,14 @@ func TestGetSSHKey(t *testing.T) {
 		expectedPubKeyStr := strings.TrimSpace(string(ssh.MarshalAuthorizedKey(sshPubKey)))

 		// Reset h.pubKey to ensure it's set by GetSSHKey from the file
-		hub.SetPubkey("")
+		hub.pubKey = ""

 		signer, err := hub.GetSSHKey(tempDir)
 		assert.NoError(t, err, "GetSSHKey should not error when reading an existing key")
 		assert.NotNil(t, signer, "GetSSHKey should return a non-nil signer for an existing key")

 		// Check if h.pubKey was set correctly to the public key from the file
-		assert.Equal(t, expectedPubKeyStr, hub.GetPubkey(), "h.pubKey should match the existing public key")
+		assert.Equal(t, expectedPubKeyStr, hub.pubKey, "h.pubKey should match the existing public key")

 		// Verify the signer's public key matches the original public key
 		signerPubKey := signer.PublicKey()
@@ -240,7 +241,7 @@ func TestGetSSHKey(t *testing.T) {
 				require.NoError(t, err, "Setup failed")

 				// Reset h.pubKey before each test case
-				hub.SetPubkey("")
+				hub.pubKey = ""

 				// Attempt to get SSH key
 				_, err = hub.GetSSHKey(tempDir)
@@ -249,7 +250,7 @@ func TestGetSSHKey(t *testing.T) {
 				tc.errorCheck(t, err)

 				// Check that pubKey was not set in error cases
-				assert.Empty(t, hub.GetPubkey(), "h.pubKey should not be set if there was an error")
+				assert.Empty(t, hub.pubKey, "h.pubKey should not be set if there was an error")
 			})
 		}
 	})
--- a/beszel/internal/hub/hub_test_helpers.go
+++ b/beszel/internal/hub/hub_test_helpers.go
@@ -1,21 +0,0 @@
-//go:build testing
-// +build testing
-
-package hub
-
-import "beszel/internal/hub/systems"
-
-// TESTING ONLY: GetSystemManager returns the system manager
-func (h *Hub) GetSystemManager() *systems.SystemManager {
-	return h.sm
-}
-
-// TESTING ONLY: GetPubkey returns the public key
-func (h *Hub) GetPubkey() string {
-	return h.pubKey
-}
-
-// TESTING ONLY: SetPubkey sets the public key
-func (h *Hub) SetPubkey(pubkey string) {
-	h.pubKey = pubkey
-}
--- a/beszel/internal/hub/systems/system.go
+++ b/beszel/internal/hub/systems/system.go
@@ -1,387 +0,0 @@
-package systems
-
-import (
-	"beszel"
-	"beszel/internal/entities/system"
-	"beszel/internal/hub/ws"
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"math/rand"
-	"net"
-	"strings"
-	"time"
-
-	"github.com/blang/semver"
-	"github.com/fxamacker/cbor/v2"
-	"github.com/pocketbase/pocketbase/core"
-	"golang.org/x/crypto/ssh"
-)
-
-type System struct {
-	Id           string               `db:"id"`
-	Host         string               `db:"host"`
-	Port         string               `db:"port"`
-	Status       string               `db:"status"`
-	manager      *SystemManager       // Manager that this system belongs to
-	client       *ssh.Client          // SSH client for fetching data
-	data         *system.CombinedData // system data from agent
-	ctx          context.Context      // Context for stopping the updater
-	cancel       context.CancelFunc   // Stops and removes system from updater
-	WsConn       *ws.WsConn           // Handler for agent WebSocket connection
-	agentVersion semver.Version       // Agent version
-	updateTicker *time.Ticker         // Ticker for updating the system
-}
-
-func (sm *SystemManager) NewSystem(systemId string) *System {
-	system := &System{
-		Id:   systemId,
-		data: &system.CombinedData{},
-	}
-	system.ctx, system.cancel = system.getContext()
-	return system
-}
-
-// StartUpdater starts the system updater.
-// It first fetches the data from the agent then updates the records.
-// If the data is not found or the system is down, it sets the system down.
-func (sys *System) StartUpdater() {
-	// Channel that can be used to set the system down. Currently only used to
-	// allow a short delay for reconnection after websocket connection is closed.
-	var downChan chan struct{}
-
-	// Add random jitter to first WebSocket connection to prevent
-	// clustering if all agents are started at the same time.
-	// SSH connections during hub startup are already staggered.
-	var jitter <-chan time.Time
-	if sys.WsConn != nil {
-		jitter = getJitter()
-		// use the websocket connection's down channel to set the system down
-		downChan = sys.WsConn.DownChan
-	} else {
-		// if the system does not have a websocket connection, wait before updating
-		// to allow the agent to connect via websocket (makes sure fingerprint is set).
-		time.Sleep(11 * time.Second)
-	}
-
-	// update immediately if system is not paused (only for ws connections)
-	// we'll wait a minute before connecting via SSH to prioritize ws connections
-	if sys.Status != paused && sys.ctx.Err() == nil {
-		if err := sys.update(); err != nil {
-			_ = sys.setDown(err)
-		}
-	}
-
-	sys.updateTicker = time.NewTicker(time.Duration(interval) * time.Millisecond)
-	// Go 1.23+ will automatically stop the ticker when the system is garbage collected, however we seem to need this or testing/synctest will block even if calling runtime.GC()
-	defer sys.updateTicker.Stop()
-
-	for {
-		select {
-		case <-sys.ctx.Done():
-			return
-		case <-sys.updateTicker.C:
-			if err := sys.update(); err != nil {
-				_ = sys.setDown(err)
-			}
-		case <-downChan:
-			sys.WsConn = nil
-			downChan = nil
-			_ = sys.setDown(nil)
-		case <-jitter:
-			sys.updateTicker.Reset(time.Duration(interval) * time.Millisecond)
-			if err := sys.update(); err != nil {
-				_ = sys.setDown(err)
-			}
-		}
-	}
-}
-
-// update updates the system data and records.
-func (sys *System) update() error {
-	if sys.Status == paused {
-		sys.handlePaused()
-		return nil
-	}
-	data, err := sys.fetchDataFromAgent()
-	if err == nil {
-		_, err = sys.createRecords(data)
-	}
-	return err
-}
-
-func (sys *System) handlePaused() {
-	if sys.WsConn == nil {
-		// if the system is paused and there's no websocket connection, remove the system
-		_ = sys.manager.RemoveSystem(sys.Id)
-	} else {
-		// Send a ping to the agent to keep the connection alive if the system is paused
-		if err := sys.WsConn.Ping(); err != nil {
-			sys.manager.hub.Logger().Warn("Failed to ping agent", "system", sys.Id, "err", err)
-			_ = sys.manager.RemoveSystem(sys.Id)
-		}
-	}
-}
-
-// createRecords updates the system record and adds system_stats and container_stats records
-func (sys *System) createRecords(data *system.CombinedData) (*core.Record, error) {
-	systemRecord, err := sys.getRecord()
-	if err != nil {
-		return nil, err
-	}
-	hub := sys.manager.hub
-	// add system_stats and container_stats records
-	systemStatsCollection, err := hub.FindCachedCollectionByNameOrId("system_stats")
-	if err != nil {
-		return nil, err
-	}
-
-	systemStatsRecord := core.NewRecord(systemStatsCollection)
-	systemStatsRecord.Set("system", systemRecord.Id)
-	systemStatsRecord.Set("stats", data.Stats)
-	systemStatsRecord.Set("type", "1m")
-	if err := hub.SaveNoValidate(systemStatsRecord); err != nil {
-		return nil, err
-	}
-	// add new container_stats record
-	if len(data.Containers) > 0 {
-		containerStatsCollection, err := hub.FindCachedCollectionByNameOrId("container_stats")
-		if err != nil {
-			return nil, err
-		}
-		containerStatsRecord := core.NewRecord(containerStatsCollection)
-		containerStatsRecord.Set("system", systemRecord.Id)
-		containerStatsRecord.Set("stats", data.Containers)
-		containerStatsRecord.Set("type", "1m")
-		if err := hub.SaveNoValidate(containerStatsRecord); err != nil {
-			return nil, err
-		}
-	}
-	// update system record (do this last because it triggers alerts and we need above records to be inserted first)
-	systemRecord.Set("status", up)
-
-	systemRecord.Set("info", data.Info)
-	if err := hub.SaveNoValidate(systemRecord); err != nil {
-		return nil, err
-	}
-	return systemRecord, nil
-}
-
-// getRecord retrieves the system record from the database.
-// If the record is not found, it removes the system from the manager.
-func (sys *System) getRecord() (*core.Record, error) {
-	record, err := sys.manager.hub.FindRecordById("systems", sys.Id)
-	if err != nil || record == nil {
-		_ = sys.manager.RemoveSystem(sys.Id)
-		return nil, err
-	}
-	return record, nil
-}
-
-// setDown marks a system as down in the database.
-// It takes the original error that caused the system to go down and returns any error
-// encountered during the process of updating the system status.
-func (sys *System) setDown(originalError error) error {
-	if sys.Status == down || sys.Status == paused {
-		return nil
-	}
-	record, err := sys.getRecord()
-	if err != nil {
-		return err
-	}
-	if originalError != nil {
-		sys.manager.hub.Logger().Error("System down", "system", record.GetString("name"), "err", originalError)
-	}
-	record.Set("status", down)
-	return sys.manager.hub.SaveNoValidate(record)
-}
-
-func (sys *System) getContext() (context.Context, context.CancelFunc) {
-	if sys.ctx == nil {
-		sys.ctx, sys.cancel = context.WithCancel(context.Background())
-	}
-	return sys.ctx, sys.cancel
-}
-
-// fetchDataFromAgent attempts to fetch data from the agent,
-// prioritizing WebSocket if available.
-func (sys *System) fetchDataFromAgent() (*system.CombinedData, error) {
-	if sys.data == nil {
-		sys.data = &system.CombinedData{}
-	}
-
-	if sys.WsConn != nil && sys.WsConn.IsConnected() {
-		wsData, err := sys.fetchDataViaWebSocket()
-		if err == nil {
-			return wsData, nil
-		}
-		// close the WebSocket connection if error and try SSH
-		sys.closeWebSocketConnection()
-	}
-
-	sshData, err := sys.fetchDataViaSSH()
-	if err != nil {
-		return nil, err
-	}
-	return sshData, nil
-}
-
-func (sys *System) fetchDataViaWebSocket() (*system.CombinedData, error) {
-	if sys.WsConn == nil || !sys.WsConn.IsConnected() {
-		return nil, errors.New("no websocket connection")
-	}
-	err := sys.WsConn.RequestSystemData(sys.data)
-	if err != nil {
-		return nil, err
-	}
-	return sys.data, nil
-}
-
-// fetchDataViaSSH handles fetching data using SSH.
-// This function encapsulates the original SSH logic.
-// It updates sys.data directly upon successful fetch.
-func (sys *System) fetchDataViaSSH() (*system.CombinedData, error) {
-	maxRetries := 1
-	for attempt := 0; attempt <= maxRetries; attempt++ {
-		if sys.client == nil || sys.Status == down {
-			if err := sys.createSSHClient(); err != nil {
-				return nil, err
-			}
-		}
-
-		session, err := sys.createSessionWithTimeout(4 * time.Second)
-		if err != nil {
-			if attempt >= maxRetries {
-				return nil, err
-			}
-			sys.manager.hub.Logger().Warn("Session closed. Retrying...", "host", sys.Host, "port", sys.Port, "err", err)
-			sys.closeSSHConnection()
-			// Reset format detection on connection failure - agent might have been upgraded
-			continue
-		}
-		defer session.Close()
-
-		stdout, err := session.StdoutPipe()
-		if err != nil {
-			return nil, err
-		}
-		if err := session.Shell(); err != nil {
-			return nil, err
-		}
-
-		*sys.data = system.CombinedData{}
-
-		if sys.agentVersion.GTE(beszel.MinVersionCbor) {
-			err = cbor.NewDecoder(stdout).Decode(sys.data)
-		} else {
-			err = json.NewDecoder(stdout).Decode(sys.data)
-		}
-
-		if err != nil {
-			sys.closeSSHConnection()
-			if attempt < maxRetries {
-				continue
-			}
-			return nil, err
-		}
-
-		// wait for the session to complete
-		if err := session.Wait(); err != nil {
-			return nil, err
-		}
-
-		return sys.data, nil
-	}
-
-	// this should never be reached due to the return in the loop
-	return nil, fmt.Errorf("failed to fetch data")
-}
-
-// createSSHClient creates a new SSH client for the system
-func (s *System) createSSHClient() error {
-	if s.manager.sshConfig == nil {
-		if err := s.manager.createSSHClientConfig(); err != nil {
-			return err
-		}
-	}
-	network := "tcp"
-	host := s.Host
-	if strings.HasPrefix(host, "/") {
-		network = "unix"
-	} else {
-		host = net.JoinHostPort(host, s.Port)
-	}
-	var err error
-	s.client, err = ssh.Dial(network, host, s.manager.sshConfig)
-	if err != nil {
-		return err
-	}
-	s.agentVersion, _ = extractAgentVersion(string(s.client.Conn.ServerVersion()))
-	return nil
-}
-
-// createSessionWithTimeout creates a new SSH session with a timeout to avoid hanging
-// in case of network issues
-func (sys *System) createSessionWithTimeout(timeout time.Duration) (*ssh.Session, error) {
-	if sys.client == nil {
-		return nil, fmt.Errorf("client not initialized")
-	}
-
-	ctx, cancel := context.WithTimeout(sys.ctx, timeout)
-	defer cancel()
-
-	sessionChan := make(chan *ssh.Session, 1)
-	errChan := make(chan error, 1)
-
-	go func() {
-		if session, err := sys.client.NewSession(); err != nil {
-			errChan <- err
-		} else {
-			sessionChan <- session
-		}
-	}()
-
-	select {
-	case session := <-sessionChan:
-		return session, nil
-	case err := <-errChan:
-		return nil, err
-	case <-ctx.Done():
-		return nil, fmt.Errorf("timeout")
-	}
-}
-
-// closeSSHConnection closes the SSH connection but keeps the system in the manager
-func (sys *System) closeSSHConnection() {
-	if sys.client != nil {
-		sys.client.Close()
-		sys.client = nil
-	}
-}
-
-// closeWebSocketConnection closes the WebSocket connection but keeps the system in the manager
-// to allow updating via SSH. It will be removed if the WS connection is re-established.
-// The system will be set as down a few seconds later if the connection is not re-established.
-func (sys *System) closeWebSocketConnection() {
-	if sys.WsConn != nil {
-		sys.WsConn.Close(nil)
-	}
-}
-
-// extractAgentVersion extracts the beszel version from SSH server version string
-func extractAgentVersion(versionString string) (semver.Version, error) {
-	_, after, _ := strings.Cut(versionString, "_")
-	return semver.Parse(after)
-}
-
-// getJitter returns a channel that will be triggered after a random delay
-// between 40% and 90% of the interval.
-// This is used to stagger the initial WebSocket connections to prevent clustering.
-func getJitter() <-chan time.Time {
-	minPercent := 40
-	maxPercent := 90
-	jitterRange := maxPercent - minPercent
-	msDelay := (interval * minPercent / 100) + rand.Intn(interval*jitterRange/100)
-	return time.After(time.Duration(msDelay) * time.Millisecond)
-}
--- a/beszel/internal/hub/systems/system_manager.go
+++ b/beszel/internal/hub/systems/system_manager.go
@@ -1,345 +0,0 @@
-package systems
-
-import (
-	"beszel"
-	"beszel/internal/common"
-	"beszel/internal/entities/system"
-	"beszel/internal/hub/ws"
-	"errors"
-	"fmt"
-	"time"
-
-	"github.com/blang/semver"
-	"github.com/pocketbase/pocketbase/core"
-	"github.com/pocketbase/pocketbase/tools/store"
-	"golang.org/x/crypto/ssh"
-)
-
-// System status constants
-const (
-	up      string = "up"      // System is online and responding
-	down    string = "down"    // System is offline or not responding
-	paused  string = "paused"  // System monitoring is paused
-	pending string = "pending" // System is waiting on initial connection result
-
-	// interval is the default update interval in milliseconds (60 seconds)
-	interval int = 60_000
-	// interval int = 10_000 // Debug interval for faster updates
-
-	// sessionTimeout is the maximum time to wait for SSH connections
-	sessionTimeout = 4 * time.Second
-)
-
-var (
-	// errSystemExists is returned when attempting to add a system that already exists
-	errSystemExists = errors.New("system exists")
-)
-
-// SystemManager manages a collection of monitored systems and their connections.
-// It handles system lifecycle, status updates, and maintains both SSH and WebSocket connections.
-type SystemManager struct {
-	hub       hubLike                       // Hub interface for database and alert operations
-	systems   *store.Store[string, *System] // Thread-safe store of active systems
-	sshConfig *ssh.ClientConfig             // SSH client configuration for system connections
-}
-
-// hubLike defines the interface requirements for the hub dependency.
-// It extends core.App with system-specific functionality.
-type hubLike interface {
-	core.App
-	GetSSHKey(dataDir string) (ssh.Signer, error)
-	HandleSystemAlerts(systemRecord *core.Record, data *system.CombinedData) error
-	HandleStatusAlerts(status string, systemRecord *core.Record) error
-}
-
-// NewSystemManager creates a new SystemManager instance with the provided hub.
-// The hub must implement the hubLike interface to provide database and alert functionality.
-func NewSystemManager(hub hubLike) *SystemManager {
-	return &SystemManager{
-		systems: store.New(map[string]*System{}),
-		hub:     hub,
-	}
-}
-
-// Initialize sets up the system manager by binding event hooks and starting existing systems.
-// It configures SSH client settings and begins monitoring all non-paused systems from the database.
-// Systems are started with staggered delays to prevent overwhelming the hub during startup.
-func (sm *SystemManager) Initialize() error {
-	sm.bindEventHooks()
-
-	// Initialize SSH client configuration
-	err := sm.createSSHClientConfig()
-	if err != nil {
-		return err
-	}
-
-	// Load existing systems from database (excluding paused ones)
-	var systems []*System
-	err = sm.hub.DB().NewQuery("SELECT id, host, port, status FROM systems WHERE status != 'paused'").All(&systems)
-	if err != nil || len(systems) == 0 {
-		return err
-	}
-
-	// Start systems in background with staggered timing
-	go func() {
-		// Calculate staggered delay between system starts (max 2 seconds per system)
-		delta := interval / max(1, len(systems))
-		delta = min(delta, 2_000)
-		sleepTime := time.Duration(delta) * time.Millisecond
-
-		for _, system := range systems {
-			time.Sleep(sleepTime)
-			_ = sm.AddSystem(system)
-		}
-	}()
-	return nil
-}
-
-// bindEventHooks registers event handlers for system and fingerprint record changes.
-// These hooks ensure the system manager stays synchronized with database changes.
-func (sm *SystemManager) bindEventHooks() {
-	sm.hub.OnRecordCreate("systems").BindFunc(sm.onRecordCreate)
-	sm.hub.OnRecordAfterCreateSuccess("systems").BindFunc(sm.onRecordAfterCreateSuccess)
-	sm.hub.OnRecordUpdate("systems").BindFunc(sm.onRecordUpdate)
-	sm.hub.OnRecordAfterUpdateSuccess("systems").BindFunc(sm.onRecordAfterUpdateSuccess)
-	sm.hub.OnRecordAfterDeleteSuccess("systems").BindFunc(sm.onRecordAfterDeleteSuccess)
-	sm.hub.OnRecordAfterUpdateSuccess("fingerprints").BindFunc(sm.onTokenRotated)
-}
-
-// onTokenRotated handles fingerprint token rotation events.
-// When a system's authentication token is rotated, any existing WebSocket connection
-// must be closed to force re-authentication with the new token.
-func (sm *SystemManager) onTokenRotated(e *core.RecordEvent) error {
-	systemID := e.Record.GetString("system")
-	system, ok := sm.systems.GetOk(systemID)
-	if !ok {
-		return e.Next()
-	}
-	// No need to close connection if not connected via websocket
-	if system.WsConn == nil {
-		return e.Next()
-	}
-	system.setDown(nil)
-	sm.RemoveSystem(systemID)
-	return e.Next()
-}
-
-// onRecordCreate is called before a new system record is committed to the database.
-// It initializes the record with default values: empty info and pending status.
-func (sm *SystemManager) onRecordCreate(e *core.RecordEvent) error {
-	e.Record.Set("info", system.Info{})
-	e.Record.Set("status", pending)
-	return e.Next()
-}
-
-// onRecordAfterCreateSuccess is called after a new system record is successfully created.
-// It adds the new system to the manager to begin monitoring.
-func (sm *SystemManager) onRecordAfterCreateSuccess(e *core.RecordEvent) error {
-	if err := sm.AddRecord(e.Record, nil); err != nil {
-		e.App.Logger().Error("Error adding record", "err", err)
-	}
-	return e.Next()
-}
-
-// onRecordUpdate is called before a system record is updated in the database.
-// It clears system info when the status is changed to paused.
-func (sm *SystemManager) onRecordUpdate(e *core.RecordEvent) error {
-	if e.Record.GetString("status") == paused {
-		e.Record.Set("info", system.Info{})
-	}
-	return e.Next()
-}
-
-// onRecordAfterUpdateSuccess handles system record updates after they're committed to the database.
-// It manages system lifecycle based on status changes and triggers appropriate alerts.
-// Status transitions are handled as follows:
-// - paused: Closes SSH connection and deactivates alerts
-// - pending: Starts monitoring (reuses WebSocket if available)
-// - up: Triggers system alerts
-// - down: Triggers status change alerts
-func (sm *SystemManager) onRecordAfterUpdateSuccess(e *core.RecordEvent) error {
-	newStatus := e.Record.GetString("status")
-	system, ok := sm.systems.GetOk(e.Record.Id)
-	if ok {
-		system.Status = newStatus
-	}
-
-	switch newStatus {
-	case paused:
-		if ok {
-			// Pause monitoring but keep system in manager for potential resume
-			system.closeSSHConnection()
-		}
-		_ = deactivateAlerts(e.App, e.Record.Id)
-		return e.Next()
-	case pending:
-		// Resume monitoring, preferring existing WebSocket connection
-		if ok && system.WsConn != nil {
-			go system.update()
-			return e.Next()
-		}
-		// Start new monitoring session
-		if err := sm.AddRecord(e.Record, nil); err != nil {
-			e.App.Logger().Error("Error adding record", "err", err)
-		}
-		return e.Next()
-	}
-
-	// Handle systems not in manager
-	if !ok {
-		return sm.AddRecord(e.Record, nil)
-	}
-
-	prevStatus := system.Status
-
-	// Trigger system alerts when system comes online
-	if newStatus == up {
-		if err := sm.hub.HandleSystemAlerts(e.Record, system.data); err != nil {
-			e.App.Logger().Error("Error handling system alerts", "err", err)
-		}
-	}
-
-	// Trigger status change alerts for up/down transitions
-	if (newStatus == down && prevStatus == up) || (newStatus == up && prevStatus == down) {
-		if err := sm.hub.HandleStatusAlerts(newStatus, e.Record); err != nil {
-			e.App.Logger().Error("Error handling status alerts", "err", err)
-		}
-	}
-	return e.Next()
-}
-
-// onRecordAfterDeleteSuccess is called after a system record is successfully deleted.
-// It removes the system from the manager and cleans up all associated resources.
-func (sm *SystemManager) onRecordAfterDeleteSuccess(e *core.RecordEvent) error {
-	sm.RemoveSystem(e.Record.Id)
-	return e.Next()
-}
-
-// AddSystem adds a system to the manager and starts monitoring it.
-// It validates required fields, initializes the system context, and starts the update goroutine.
-// Returns error if a system with the same ID already exists.
-func (sm *SystemManager) AddSystem(sys *System) error {
-	if sm.systems.Has(sys.Id) {
-		return errSystemExists
-	}
-	if sys.Id == "" || sys.Host == "" {
-		return errors.New("system missing required fields")
-	}
-
-	// Initialize system for monitoring
-	sys.manager = sm
-	sys.ctx, sys.cancel = sys.getContext()
-	sys.data = &system.CombinedData{}
-	sm.systems.Set(sys.Id, sys)
-
-	// Start monitoring in background
-	go sys.StartUpdater()
-	return nil
-}
-
-// RemoveSystem removes a system from the manager and cleans up all associated resources.
-// It cancels the system's context, closes all connections, and removes it from the store.
-// Returns an error if the system is not found.
-func (sm *SystemManager) RemoveSystem(systemID string) error {
-	system, ok := sm.systems.GetOk(systemID)
-	if !ok {
-		return errors.New("system not found")
-	}
-
-	// Stop the update goroutine
-	if system.cancel != nil {
-		system.cancel()
-	}
-
-	// Clean up all connections
-	system.closeSSHConnection()
-	system.closeWebSocketConnection()
-	sm.systems.Remove(systemID)
-	return nil
-}
-
-// AddRecord creates a System instance from a database record and adds it to the manager.
-// If a system with the same ID already exists, it's removed first to ensure clean state.
-// If no system instance is provided, a new one is created.
-// This method is typically called when systems are created or their status changes to pending.
-func (sm *SystemManager) AddRecord(record *core.Record, system *System) (err error) {
-	// Remove existing system to ensure clean state
-	if sm.systems.Has(record.Id) {
-		_ = sm.RemoveSystem(record.Id)
-	}
-
-	// Create new system if none provided
-	if system == nil {
-		system = sm.NewSystem(record.Id)
-	}
-
-	// Populate system from record
-	system.Status = record.GetString("status")
-	system.Host = record.GetString("host")
-	system.Port = record.GetString("port")
-
-	return sm.AddSystem(system)
-}
-
-// AddWebSocketSystem creates and adds a system with an established WebSocket connection.
-// This method is called when an agent connects via WebSocket with valid authentication.
-// The system is immediately added to monitoring with the provided connection and version info.
-func (sm *SystemManager) AddWebSocketSystem(systemId string, agentVersion semver.Version, wsConn *ws.WsConn) error {
-	systemRecord, err := sm.hub.FindRecordById("systems", systemId)
-	if err != nil {
-		return err
-	}
-
-	system := sm.NewSystem(systemId)
-	system.WsConn = wsConn
-	system.agentVersion = agentVersion
-
-	if err := sm.AddRecord(systemRecord, system); err != nil {
-		return err
-	}
-	return nil
-}
-
-// createSSHClientConfig initializes the SSH client configuration for connecting to an agent's server
-func (sm *SystemManager) createSSHClientConfig() error {
-	privateKey, err := sm.hub.GetSSHKey("")
-	if err != nil {
-		return err
-	}
-
-	sm.sshConfig = &ssh.ClientConfig{
-		User: "u",
-		Auth: []ssh.AuthMethod{
-			ssh.PublicKeys(privateKey),
-		},
-		Config: ssh.Config{
-			Ciphers:      common.DefaultCiphers,
-			KeyExchanges: common.DefaultKeyExchanges,
-			MACs:         common.DefaultMACs,
-		},
-		HostKeyCallback: ssh.InsecureIgnoreHostKey(),
-		ClientVersion:   fmt.Sprintf("SSH-2.0-%s_%s", beszel.AppName, beszel.Version),
-		Timeout:         sessionTimeout,
-	}
-	return nil
-}
-
-// deactivateAlerts finds all triggered alerts for a system and sets them to inactive.
-// This is called when a system is paused or goes offline to prevent continued alerts.
-func deactivateAlerts(app core.App, systemID string) error {
-	// Note: Direct SQL updates don't trigger SSE, so we use the PocketBase API
-	// _, err := app.DB().NewQuery(fmt.Sprintf("UPDATE alerts SET triggered = false WHERE system = '%s'", systemID)).Execute()
-
-	alerts, err := app.FindRecordsByFilter("alerts", fmt.Sprintf("system = '%s' && triggered = 1", systemID), "", -1, 0)
-	if err != nil {
-		return err
-	}
-
-	for _, alert := range alerts {
-		alert.Set("triggered", false)
-		if err := app.SaveNoValidate(alert); err != nil {
-			return err
-		}
-	}
-	return nil
-}
--- a/beszel/internal/hub/systems/systems.go
+++ b/beszel/internal/hub/systems/systems.go
@@ -0,0 +1,457 @@
+package systems
+
+import (
+	"beszel/internal/common"
+	"beszel/internal/entities/system"
+	"context"
+	"fmt"
+	"net"
+	"strings"
+	"time"
+
+	"github.com/goccy/go-json"
+	"github.com/pocketbase/pocketbase/core"
+	"github.com/pocketbase/pocketbase/tools/store"
+	"golang.org/x/crypto/ssh"
+)
+
+const (
+	up      string = "up"
+	down    string = "down"
+	paused  string = "paused"
+	pending string = "pending"
+
+	interval int = 60_000
+
+	sessionTimeout = 4 * time.Second
+)
+
+type SystemManager struct {
+	hub       hubLike
+	systems   *store.Store[string, *System]
+	sshConfig *ssh.ClientConfig
+}
+
+type System struct {
+	Id      string `db:"id"`
+	Host    string `db:"host"`
+	Port    string `db:"port"`
+	Status  string `db:"status"`
+	manager *SystemManager
+	client  *ssh.Client
+	data    *system.CombinedData
+	ctx     context.Context
+	cancel  context.CancelFunc
+}
+
+type hubLike interface {
+	core.App
+	GetSSHKey(dataDir string) (ssh.Signer, error)
+	HandleSystemAlerts(systemRecord *core.Record, data *system.CombinedData) error
+	HandleStatusAlerts(status string, systemRecord *core.Record) error
+}
+
+func NewSystemManager(hub hubLike) *SystemManager {
+	return &SystemManager{
+		systems: store.New(map[string]*System{}),
+		hub:     hub,
+	}
+}
+
+// Initialize initializes the system manager.
+// It binds the event hooks and starts updating existing systems.
+func (sm *SystemManager) Initialize() error {
+	sm.bindEventHooks()
+	// ssh setup
+	err := sm.createSSHClientConfig()
+	if err != nil {
+		return err
+	}
+	// start updating existing systems
+	var systems []*System
+	err = sm.hub.DB().NewQuery("SELECT id, host, port, status FROM systems WHERE status != 'paused'").All(&systems)
+	if err != nil || len(systems) == 0 {
+		return err
+	}
+	go func() {
+		// time between initial system updates
+		delta := interval / max(1, len(systems))
+		delta = min(delta, 2_000)
+		sleepTime := time.Duration(delta) * time.Millisecond
+		for _, system := range systems {
+			time.Sleep(sleepTime)
+			_ = sm.AddSystem(system)
+		}
+	}()
+	return nil
+}
+
+func (sm *SystemManager) bindEventHooks() {
+	sm.hub.OnRecordCreate("systems").BindFunc(sm.onRecordCreate)
+	sm.hub.OnRecordAfterCreateSuccess("systems").BindFunc(sm.onRecordAfterCreateSuccess)
+	sm.hub.OnRecordUpdate("systems").BindFunc(sm.onRecordUpdate)
+	sm.hub.OnRecordAfterUpdateSuccess("systems").BindFunc(sm.onRecordAfterUpdateSuccess)
+	sm.hub.OnRecordAfterDeleteSuccess("systems").BindFunc(sm.onRecordAfterDeleteSuccess)
+}
+
+// Runs before the record is committed to the database
+func (sm *SystemManager) onRecordCreate(e *core.RecordEvent) error {
+	e.Record.Set("info", system.Info{})
+	e.Record.Set("status", pending)
+	return e.Next()
+}
+
+// Runs after the record is committed to the database
+func (sm *SystemManager) onRecordAfterCreateSuccess(e *core.RecordEvent) error {
+	if err := sm.AddRecord(e.Record); err != nil {
+		e.App.Logger().Error("Error adding record", "err", err)
+	}
+	return e.Next()
+}
+
+// Runs before the record is updated
+func (sm *SystemManager) onRecordUpdate(e *core.RecordEvent) error {
+	if e.Record.GetString("status") == paused {
+		e.Record.Set("info", system.Info{})
+	}
+	return e.Next()
+}
+
+// Runs after the record is updated
+func (sm *SystemManager) onRecordAfterUpdateSuccess(e *core.RecordEvent) error {
+	newStatus := e.Record.GetString("status")
+	switch newStatus {
+	case paused:
+		_ = sm.RemoveSystem(e.Record.Id)
+		_ = deactivateAlerts(e.App, e.Record.Id)
+		return e.Next()
+	case pending:
+		if err := sm.AddRecord(e.Record); err != nil {
+			e.App.Logger().Error("Error adding record", "err", err)
+		}
+		return e.Next()
+	}
+	system, ok := sm.systems.GetOk(e.Record.Id)
+	if !ok {
+		return sm.AddRecord(e.Record)
+	}
+	prevStatus := system.Status
+	system.Status = newStatus
+	// system alerts if system is up
+	if system.Status == up {
+		if err := sm.hub.HandleSystemAlerts(e.Record, system.data); err != nil {
+			e.App.Logger().Error("Error handling system alerts", "err", err)
+		}
+	}
+	if (system.Status == down && prevStatus == up) || (system.Status == up && prevStatus == down) {
+		if err := sm.hub.HandleStatusAlerts(system.Status, e.Record); err != nil {
+			e.App.Logger().Error("Error handling status alerts", "err", err)
+		}
+	}
+	return e.Next()
+}
+
+// Runs after the record is deleted
+func (sm *SystemManager) onRecordAfterDeleteSuccess(e *core.RecordEvent) error {
+	sm.RemoveSystem(e.Record.Id)
+	return e.Next()
+}
+
+// AddSystem adds a system to the manager
+func (sm *SystemManager) AddSystem(sys *System) error {
+	if sm.systems.Has(sys.Id) {
+		return fmt.Errorf("system exists")
+	}
+	if sys.Id == "" || sys.Host == "" {
+		return fmt.Errorf("system is missing required fields")
+	}
+	sys.manager = sm
+	sys.ctx, sys.cancel = context.WithCancel(context.Background())
+	sys.data = &system.CombinedData{}
+	sm.systems.Set(sys.Id, sys)
+	go sys.StartUpdater()
+	return nil
+}
+
+// RemoveSystem removes a system from the manager
+func (sm *SystemManager) RemoveSystem(systemID string) error {
+	system, ok := sm.systems.GetOk(systemID)
+	if !ok {
+		return fmt.Errorf("system not found")
+	}
+	// cancel the context to signal stop
+	if system.cancel != nil {
+		system.cancel()
+	}
+	system.resetSSHClient()
+	sm.systems.Remove(systemID)
+	return nil
+}
+
+// AddRecord adds a record to the system manager.
+// It first removes any existing system with the same ID, then creates a new System
+// instance from the record data and adds it to the manager.
+// This function is typically called when a new system is created or when an existing
+// system's status changes to pending.
+func (sm *SystemManager) AddRecord(record *core.Record) (err error) {
+	_ = sm.RemoveSystem(record.Id)
+	system := &System{
+		Id:     record.Id,
+		Status: record.GetString("status"),
+		Host:   record.GetString("host"),
+		Port:   record.GetString("port"),
+	}
+	return sm.AddSystem(system)
+}
+
+// StartUpdater starts the system updater.
+// It first fetches the data from the agent then updates the records.
+// If the data is not found or the system is down, it sets the system down.
+func (sys *System) StartUpdater() {
+	if sys.data == nil {
+		sys.data = &system.CombinedData{}
+	}
+	if err := sys.update(); err != nil {
+		_ = sys.setDown(err)
+	}
+
+	c := time.Tick(time.Duration(interval) * time.Millisecond)
+
+	for {
+		select {
+		case <-sys.ctx.Done():
+			return
+		case <-c:
+			err := sys.update()
+			if err != nil {
+				_ = sys.setDown(err)
+			}
+		}
+	}
+}
+
+// update updates the system data and records.
+// It first fetches the data from the agent then updates the records.
+func (sys *System) update() error {
+	_, err := sys.fetchDataFromAgent()
+	if err == nil {
+		_, err = sys.createRecords()
+	}
+	return err
+}
+
+// createRecords updates the system record and adds system_stats and container_stats records
+func (sys *System) createRecords() (*core.Record, error) {
+	systemRecord, err := sys.getRecord()
+	if err != nil {
+		return nil, err
+	}
+	hub := sys.manager.hub
+	// add system_stats and container_stats records
+	systemStats, err := hub.FindCachedCollectionByNameOrId("system_stats")
+	if err != nil {
+		return nil, err
+	}
+	systemStatsRecord := core.NewRecord(systemStats)
+	systemStatsRecord.Set("system", systemRecord.Id)
+	systemStatsRecord.Set("stats", sys.data.Stats)
+	systemStatsRecord.Set("type", "1m")
+	if err := hub.SaveNoValidate(systemStatsRecord); err != nil {
+		return nil, err
+	}
+	// add new container_stats record
+	if len(sys.data.Containers) > 0 {
+		containerStats, err := hub.FindCachedCollectionByNameOrId("container_stats")
+		if err != nil {
+			return nil, err
+		}
+		containerStatsRecord := core.NewRecord(containerStats)
+		containerStatsRecord.Set("system", systemRecord.Id)
+		containerStatsRecord.Set("stats", sys.data.Containers)
+		containerStatsRecord.Set("type", "1m")
+		if err := hub.SaveNoValidate(containerStatsRecord); err != nil {
+			return nil, err
+		}
+	}
+	// update system record (do this last because it triggers alerts and we need above records to be inserted first)
+	systemRecord.Set("status", up)
+	systemRecord.Set("info", sys.data.Info)
+	if err := hub.SaveNoValidate(systemRecord); err != nil {
+		return nil, err
+	}
+	return systemRecord, nil
+}
+
+// getRecord retrieves the system record from the database.
+// If the record is not found or the system is paused, it removes the system from the manager.
+func (sys *System) getRecord() (*core.Record, error) {
+	record, err := sys.manager.hub.FindRecordById("systems", sys.Id)
+	if err != nil || record == nil {
+		_ = sys.manager.RemoveSystem(sys.Id)
+		return nil, err
+	}
+	return record, nil
+}
+
+// setDown marks a system as down in the database.
+// It takes the original error that caused the system to go down and returns any error
+// encountered during the process of updating the system status.
+func (sys *System) setDown(OriginalError error) error {
+	if sys.Status == down {
+		return nil
+	}
+	record, err := sys.getRecord()
+	if err != nil {
+		return err
+	}
+	sys.manager.hub.Logger().Error("System down", "system", record.GetString("name"), "err", OriginalError)
+	record.Set("status", down)
+	err = sys.manager.hub.SaveNoValidate(record)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+// fetchDataFromAgent fetches the data from the agent.
+// It first creates a new SSH client if it doesn't exist or the system is down.
+// Then it creates a new SSH session and fetches the data from the agent.
+// If the data is not found or the system is down, it sets the system down.
+func (sys *System) fetchDataFromAgent() (*system.CombinedData, error) {
+	maxRetries := 1
+	for attempt := 0; attempt <= maxRetries; attempt++ {
+		if sys.client == nil || sys.Status == down {
+			if err := sys.createSSHClient(); err != nil {
+				return nil, err
+			}
+		}
+
+		session, err := sys.createSessionWithTimeout(4 * time.Second)
+		if err != nil {
+			if attempt >= maxRetries {
+				return nil, err
+			}
+			sys.manager.hub.Logger().Warn("Session closed. Retrying...", "host", sys.Host, "port", sys.Port, "err", err)
+			sys.resetSSHClient()
+			continue
+		}
+		defer session.Close()
+
+		stdout, err := session.StdoutPipe()
+		if err != nil {
+			return nil, err
+		}
+		if err := session.Shell(); err != nil {
+			return nil, err
+		}
+
+		// this is initialized in startUpdater, should never be nil
+		*sys.data = system.CombinedData{}
+		if err := json.NewDecoder(stdout).Decode(sys.data); err != nil {
+			return nil, err
+		}
+		// wait for the session to complete
+		if err := session.Wait(); err != nil {
+			return nil, err
+		}
+		return sys.data, nil
+	}
+
+	// this should never be reached due to the return in the loop
+	return nil, fmt.Errorf("failed to fetch data")
+}
+
+// createSSHClientConfig initializes the ssh config for the system manager
+func (sm *SystemManager) createSSHClientConfig() error {
+	privateKey, err := sm.hub.GetSSHKey(sm.hub.DataDir())
+	if err != nil {
+		return err
+	}
+	sm.sshConfig = &ssh.ClientConfig{
+		User: "u",
+		Auth: []ssh.AuthMethod{
+			ssh.PublicKeys(privateKey),
+		},
+		Config: ssh.Config{
+			Ciphers:      common.DefaultCiphers,
+			KeyExchanges: common.DefaultKeyExchanges,
+			MACs:         common.DefaultMACs,
+		},
+		HostKeyCallback: ssh.InsecureIgnoreHostKey(),
+		Timeout:         sessionTimeout,
+	}
+	return nil
+}
+
+// createSSHClient creates a new SSH client for the system
+func (s *System) createSSHClient() error {
+	network := "tcp"
+	host := s.Host
+	if strings.HasPrefix(host, "/") {
+		network = "unix"
+	} else {
+		host = net.JoinHostPort(host, s.Port)
+	}
+	var err error
+	s.client, err = ssh.Dial(network, host, s.manager.sshConfig)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+// createSessionWithTimeout creates a new SSH session with a timeout to avoid hanging
+// in case of network issues
+func (sys *System) createSessionWithTimeout(timeout time.Duration) (*ssh.Session, error) {
+	if sys.client == nil {
+		return nil, fmt.Errorf("client not initialized")
+	}
+
+	ctx, cancel := context.WithTimeout(sys.ctx, timeout)
+	defer cancel()
+
+	sessionChan := make(chan *ssh.Session, 1)
+	errChan := make(chan error, 1)
+
+	go func() {
+		if session, err := sys.client.NewSession(); err != nil {
+			errChan <- err
+		} else {
+			sessionChan <- session
+		}
+	}()
+
+	select {
+	case session := <-sessionChan:
+		return session, nil
+	case err := <-errChan:
+		return nil, err
+	case <-ctx.Done():
+		return nil, fmt.Errorf("timeout")
+	}
+}
+
+// resetSSHClient closes the SSH connection and resets the client to nil
+func (sys *System) resetSSHClient() {
+	if sys.client != nil {
+		sys.client.Close()
+	}
+	sys.client = nil
+}
+
+// deactivateAlerts finds all triggered alerts for a system and sets them to false
+func deactivateAlerts(app core.App, systemID string) error {
+	// we can't use an UPDATE query because it doesn't work with realtime updates
+	// _, err := e.App.DB().NewQuery(fmt.Sprintf("UPDATE alerts SET triggered = false WHERE system = '%s'", e.Record.Id)).Execute()
+	alerts, err := app.FindRecordsByFilter("alerts", fmt.Sprintf("system = '%s' && triggered = 1", systemID), "", -1, 0)
+	if err != nil {
+		return err
+	}
+	for _, alert := range alerts {
+		alert.Set("triggered", false)
+		if err := app.SaveNoValidate(alert); err != nil {
+			return err
+		}
+	}
+	return nil
+}
--- a/beszel/internal/hub/systems/systems_test.go
+++ b/beszel/internal/hub/systems/systems_test.go
@@ -11,133 +11,70 @@ import (
 	"fmt"
 	"sync"
 	"testing"
-	"testing/synctest"
 	"time"

+	"github.com/pocketbase/dbx"
+	"github.com/pocketbase/pocketbase/core"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

-func TestSystemManagerNew(t *testing.T) {
-	hub, err := tests.NewTestHub(t.TempDir())
+// createTestSystem creates a test system record with a unique host name
+// and returns the created record and any error
+func createTestSystem(t *testing.T, hub *tests.TestHub, options map[string]any) (*core.Record, error) {
+	collection, err := hub.FindCachedCollectionByNameOrId("systems")
+	if err != nil {
+		return nil, err
+	}
+
+	// get user record
+	var firstUser *core.Record
+	users, err := hub.FindAllRecords("users", dbx.NewExp("id != ''"))
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(users) > 0 {
+		firstUser = users[0]
+	}
+	// Generate a unique host name to ensure we're adding a new system
+	uniqueHost := fmt.Sprintf("test-host-%d.example.com", time.Now().UnixNano())
+
+	// Create the record
+	record := core.NewRecord(collection)
+	record.Set("name", uniqueHost)
+	record.Set("host", uniqueHost)
+	record.Set("port", "45876")
+	record.Set("status", "pending")
+	record.Set("users", []string{firstUser.Id})
+
+	// Apply any custom options
+	for key, value := range options {
+		record.Set(key, value)
+	}
+
+	// Save the record to the database
+	err = hub.Save(record)
+	if err != nil {
+		return nil, err
+	}
+
+	return record, nil
+}
+
+func TestSystemManagerIntegration(t *testing.T) {
+	// Create a test hub
+	hub, err := tests.NewTestHub()
 	if err != nil {
 		t.Fatal(err)
 	}
 	defer hub.Cleanup()
-	sm := hub.GetSystemManager()

-	user, err := tests.CreateUser(hub, "test@test.com", "testtesttest")
-	require.NoError(t, err)
-
-	synctest.Run(func() {
-		sm.Initialize()
-
-		record, err := tests.CreateRecord(hub, "systems", map[string]any{
-			"name":  "it-was-coney-island",
-			"host":  "the-playground-of-the-world",
-			"port":  "33914",
-			"users": []string{user.Id},
-		})
-		require.NoError(t, err)
-
-		assert.Equal(t, "pending", record.GetString("status"), "System status should be 'pending'")
-		assert.Equal(t, "pending", sm.GetSystemStatusFromStore(record.Id), "System status should be 'pending'")
-
-		// Verify the system host and port
-		host, port := sm.GetSystemHostPort(record.Id)
-		assert.Equal(t, record.GetString("host"), host, "System host should match")
-		assert.Equal(t, record.GetString("port"), port, "System port should match")
-
-		time.Sleep(13 * time.Second)
-		synctest.Wait()
-
-		assert.Equal(t, "pending", record.Fresh().GetString("status"), "System status should be 'pending'")
-		// Verify the system was added by checking if it exists
-		assert.True(t, sm.HasSystem(record.Id), "System should exist in the store")
-
-		time.Sleep(10 * time.Second)
-		synctest.Wait()
-
-		// system should be set to down after 15 seconds (no websocket connection)
-		assert.Equal(t, "down", sm.GetSystemStatusFromStore(record.Id), "System status should be 'down'")
-		// make sure the system is down in the db
-		record, err = hub.FindRecordById("systems", record.Id)
-		require.NoError(t, err)
-		assert.Equal(t, "down", record.GetString("status"), "System status should be 'down'")
-
-		assert.Equal(t, 1, sm.GetSystemCount(), "System count should be 1")
-
-		err = sm.RemoveSystem(record.Id)
-		assert.NoError(t, err)
-
-		assert.Equal(t, 0, sm.GetSystemCount(), "System count should be 0")
-		assert.False(t, sm.HasSystem(record.Id), "System should not exist in the store after removal")
-
-		// let's also make sure a system is removed from the store when the record is deleted
-		record, err = tests.CreateRecord(hub, "systems", map[string]any{
-			"name":  "there-was-no-place-like-it",
-			"host":  "in-the-whole-world",
-			"port":  "33914",
-			"users": []string{user.Id},
-		})
-		require.NoError(t, err)
-
-		assert.True(t, sm.HasSystem(record.Id), "System should exist in the store after creation")
-
-		time.Sleep(8 * time.Second)
-		synctest.Wait()
-		assert.Equal(t, "pending", sm.GetSystemStatusFromStore(record.Id), "System status should be 'pending'")
-
-		sm.SetSystemStatusInDB(record.Id, "up")
-		time.Sleep(time.Second)
-		synctest.Wait()
-		assert.Equal(t, "up", sm.GetSystemStatusFromStore(record.Id), "System status should be 'up'")
-
-		// make sure the system switches to down after 11 seconds
-		sm.RemoveSystem(record.Id)
-		sm.AddRecord(record, nil)
-		assert.Equal(t, "pending", sm.GetSystemStatusFromStore(record.Id), "System status should be 'pending'")
-		time.Sleep(12 * time.Second)
-		synctest.Wait()
-		assert.Equal(t, "down", sm.GetSystemStatusFromStore(record.Id), "System status should be 'down'")
-
-		// sm.SetSystemStatusInDB(record.Id, "paused")
-		// time.Sleep(time.Second)
-		// synctest.Wait()
-		// assert.Equal(t, "paused", sm.GetSystemStatusFromStore(record.Id), "System status should be 'paused'")
-
-		// delete the record
-		err = hub.Delete(record)
-		require.NoError(t, err)
-		assert.False(t, sm.HasSystem(record.Id), "System should not exist in the store after deletion")
-
-		testOld(t, hub)
-
-		time.Sleep(time.Second)
-		synctest.Wait()
-
-		for _, systemId := range sm.GetAllSystemIDs() {
-			err = sm.RemoveSystem(systemId)
-			require.NoError(t, err)
-			assert.False(t, sm.HasSystem(systemId), "System should not exist in the store after deletion")
-		}
-
-		assert.Equal(t, 0, sm.GetSystemCount(), "System count should be 0")
-
-		// TODO: test with websocket client
-	})
-}
-
-func testOld(t *testing.T, hub *tests.TestHub) {
-	user, err := tests.CreateUser(hub, "test@testy.com", "testtesttest")
-	require.NoError(t, err)
-
-	sm := hub.GetSystemManager()
+	// Create independent system manager
+	sm := systems.NewSystemManager(hub)
 	assert.NotNil(t, sm)

-	// error expected when creating a user with a duplicate email
-	_, err = tests.CreateUser(hub, "test@test.com", "testtesttest")
-	require.Error(t, err)
+	// Test initialization
+	sm.Initialize()

 	// Test collection existence. todo: move to hub package tests
 	t.Run("CollectionExistence", func(t *testing.T) {
@@ -155,17 +92,81 @@ func testOld(t *testing.T, hub *tests.TestHub) {
 		assert.NotNil(t, containerStats)
 	})

+	// Test adding a system record
+	t.Run("AddRecord", func(t *testing.T) {
+		var wg sync.WaitGroup
+		wg.Add(2)
+
+		// Get the count before adding the system
+		countBefore := sm.GetSystemCount()
+
+		// record should be pending on create
+		hub.OnRecordCreate("systems").BindFunc(func(e *core.RecordEvent) error {
+			record := e.Record
+			if record.GetString("name") == "welcometoarcoampm" {
+				assert.Equal(t, "pending", e.Record.GetString("status"), "System status should be 'pending'")
+				wg.Done()
+			}
+			return e.Next()
+		})
+
+		// record should be down on update
+		hub.OnRecordAfterUpdateSuccess("systems").BindFunc(func(e *core.RecordEvent) error {
+			record := e.Record
+			if record.GetString("name") == "welcometoarcoampm" {
+				assert.Equal(t, "down", e.Record.GetString("status"), "System status should be 'pending'")
+				wg.Done()
+			}
+			return e.Next()
+		})
+		// Create a test system with the first user assigned
+		record, err := createTestSystem(t, hub, map[string]any{
+			"name": "welcometoarcoampm",
+			"host": "localhost",
+			"port": "33914",
+		})
+		require.NoError(t, err)
+
+		wg.Wait()
+
+		// system should be down if grabbed from the store
+		assert.Equal(t, "down", sm.GetSystemStatusFromStore(record.Id), "System status should be 'down'")
+
+		// Check that the system count increased
+		countAfter := sm.GetSystemCount()
+		assert.Equal(t, countBefore+1, countAfter, "System count should increase after adding a system via event hook")
+
+		// Verify the system was added by checking if it exists
+		assert.True(t, sm.HasSystem(record.Id), "System should exist in the store")
+
+		// Verify the system host and port
+		host, port := sm.GetSystemHostPort(record.Id)
+		assert.Equal(t, record.Get("host"), host, "System host should match")
+		assert.Equal(t, record.Get("port"), port, "System port should match")
+
+		// Verify the system is in the list of all system IDs
+		ids := sm.GetAllSystemIDs()
+		assert.Contains(t, ids, record.Id, "System ID should be in the list of all system IDs")
+
+		// Verify the system was added by checking if removing it works
+		err = sm.RemoveSystem(record.Id)
+		assert.NoError(t, err, "System should exist and be removable")
+
+		// Verify the system no longer exists
+		assert.False(t, sm.HasSystem(record.Id), "System should not exist in the store after removal")
+
+		// Verify the system is not in the list of all system IDs
+		newIds := sm.GetAllSystemIDs()
+		assert.NotContains(t, newIds, record.Id, "System ID should not be in the list of all system IDs after removal")
+
+	})
+
 	t.Run("RemoveSystem", func(t *testing.T) {
 		// Get the count before adding the system
 		countBefore := sm.GetSystemCount()

 		// Create a test system record
-		record, err := tests.CreateRecord(hub, "systems", map[string]any{
-			"name":  "i-even-got-lost-at-coney-island",
-			"host":  "but-they-found-me",
-			"port":  "33914",
-			"users": []string{user.Id},
-		})
+		record, err := createTestSystem(t, hub, map[string]any{})
 		require.NoError(t, err)

 		// Verify the system count increased
@@ -201,16 +202,11 @@ func testOld(t *testing.T, hub *tests.TestHub) {

 	t.Run("NewRecordPending", func(t *testing.T) {
 		// Create a test system
-		record, err := tests.CreateRecord(hub, "systems", map[string]any{
-			"name":  "and-you-know",
-			"host":  "i-feel-very-bad",
-			"port":  "33914",
-			"users": []string{user.Id},
-		})
+		record, err := createTestSystem(t, hub, map[string]any{})
 		require.NoError(t, err)

 		// Add the record to the system manager
-		err = sm.AddRecord(record, nil)
+		err = sm.AddRecord(record)
 		require.NoError(t, err)

 		// Test filtering records by status - should be "pending" now
@@ -222,16 +218,11 @@ func testOld(t *testing.T, hub *tests.TestHub) {

 	t.Run("SystemStatusUpdate", func(t *testing.T) {
 		// Create a test system record
-		record, err := tests.CreateRecord(hub, "systems", map[string]any{
-			"name":  "we-used-to-sleep-on-the-beach",
-			"host":  "sleep-overnight-here",
-			"port":  "33914",
-			"users": []string{user.Id},
-		})
+		record, err := createTestSystem(t, hub, map[string]any{})
 		require.NoError(t, err)

 		// Add the record to the system manager
-		err = sm.AddRecord(record, nil)
+		err = sm.AddRecord(record)
 		require.NoError(t, err)

 		// Test status changes
@@ -253,12 +244,7 @@ func testOld(t *testing.T, hub *tests.TestHub) {

 	t.Run("HandleSystemData", func(t *testing.T) {
 		// Create a test system record
-		record, err := tests.CreateRecord(hub, "systems", map[string]any{
-			"name":  "things-changed-you-know",
-			"host":  "they-dont-sleep-anymore-on-the-beach",
-			"port":  "33914",
-			"users": []string{user.Id},
-		})
+		record, err := createTestSystem(t, hub, map[string]any{})
 		require.NoError(t, err)

 		// Create test system data
@@ -309,14 +295,54 @@ func testOld(t *testing.T, hub *tests.TestHub) {
 		assert.Error(t, err)
 	})

+	t.Run("DeleteRecord", func(t *testing.T) {
+		var wg sync.WaitGroup
+		wg.Add(2)
+
+		runs := 0
+
+		hub.OnRecordUpdate("systems").BindFunc(func(e *core.RecordEvent) error {
+			runs++
+			record := e.Record
+			if record.GetString("name") == "deadflagblues" {
+				if runs == 1 {
+					assert.Equal(t, "up", e.Record.GetString("status"), "System status should be 'up'")
+					wg.Done()
+				} else if runs == 2 {
+					assert.Equal(t, "paused", e.Record.GetString("status"), "System status should be 'paused'")
+					wg.Done()
+				}
+			}
+			return e.Next()
+		})
+
+		// Create a test system record
+		record, err := createTestSystem(t, hub, map[string]any{
+			"name": "deadflagblues",
+		})
+		require.NoError(t, err)
+
+		// Verify the system exists
+		assert.True(t, sm.HasSystem(record.Id), "System should exist in the store")
+
+		// set the status manually to up
+		sm.SetSystemStatusInDB(record.Id, "up")
+
+		// verify the status is up
+		assert.Equal(t, "up", sm.GetSystemStatusFromStore(record.Id), "System status should be 'up'")
+
+		// Set the status to "paused" which should cause it to be deleted from the store
+		sm.SetSystemStatusInDB(record.Id, "paused")
+
+		wg.Wait()
+
+		// Verify the system no longer exists
+		assert.False(t, sm.HasSystem(record.Id), "System should not exist in the store after deletion")
+	})
+
 	t.Run("ConcurrentOperations", func(t *testing.T) {
 		// Create a test system
-		record, err := tests.CreateRecord(hub, "systems", map[string]any{
-			"name":  "jfkjahkfajs",
-			"host":  "localhost",
-			"port":  "33914",
-			"users": []string{user.Id},
-		})
+		record, err := createTestSystem(t, hub, map[string]any{})
 		require.NoError(t, err)

 		// Run concurrent operations
@@ -351,12 +377,7 @@ func testOld(t *testing.T, hub *tests.TestHub) {

 	t.Run("ContextCancellation", func(t *testing.T) {
 		// Create a test system record
-		record, err := tests.CreateRecord(hub, "systems", map[string]any{
-			"name":  "lkhsdfsjf",
-			"host":  "localhost",
-			"port":  "33914",
-			"users": []string{user.Id},
-		})
+		record, err := createTestSystem(t, hub, map[string]any{})
 		require.NoError(t, err)

 		// Verify the system exists in the store
@@ -399,7 +420,7 @@ func testOld(t *testing.T, hub *tests.TestHub) {
 		assert.Error(t, err, "RemoveSystem should fail for non-existent system")

 		// Add the system back
-		err = sm.AddRecord(record, nil)
+		err = sm.AddRecord(record)
 		require.NoError(t, err, "AddRecord should succeed")

 		// Verify the system is back in the store
--- a/beszel/internal/hub/systems/systems_test_helpers.go
+++ b/beszel/internal/hub/systems/systems_test_helpers.go
@@ -9,17 +9,17 @@ import (
 	"fmt"
 )

-// TESTING ONLY: GetSystemCount returns the number of systems in the store
+// GetSystemCount returns the number of systems in the store
 func (sm *SystemManager) GetSystemCount() int {
 	return sm.systems.Length()
 }

-// TESTING ONLY: HasSystem checks if a system with the given ID exists in the store
+// HasSystem checks if a system with the given ID exists in the store
 func (sm *SystemManager) HasSystem(systemID string) bool {
 	return sm.systems.Has(systemID)
 }

-// TESTING ONLY: GetSystemStatusFromStore returns the status of a system with the given ID
+// GetSystemStatusFromStore returns the status of a system with the given ID
 // Returns an empty string if the system doesn't exist
 func (sm *SystemManager) GetSystemStatusFromStore(systemID string) string {
 	sys, ok := sm.systems.GetOk(systemID)
@@ -29,7 +29,7 @@ func (sm *SystemManager) GetSystemStatusFromStore(systemID string) string {
 	return sys.Status
 }

-// TESTING ONLY: GetSystemContextFromStore returns the context and cancel function for a system
+// GetSystemContextFromStore returns the context and cancel function for a system
 func (sm *SystemManager) GetSystemContextFromStore(systemID string) (context.Context, context.CancelFunc, error) {
 	sys, ok := sm.systems.GetOk(systemID)
 	if !ok {
@@ -38,7 +38,7 @@ func (sm *SystemManager) GetSystemContextFromStore(systemID string) (context.Con
 	return sys.ctx, sys.cancel, nil
 }

-// TESTING ONLY: GetSystemFromStore returns a store from the system
+// GetSystemFromStore returns a store from the system
 func (sm *SystemManager) GetSystemFromStore(systemID string) (*System, error) {
 	sys, ok := sm.systems.GetOk(systemID)
 	if !ok {
@@ -47,7 +47,7 @@ func (sm *SystemManager) GetSystemFromStore(systemID string) (*System, error) {
 	return sys, nil
 }

-// TESTING ONLY: GetAllSystemIDs returns a slice of all system IDs in the store
+// GetAllSystemIDs returns a slice of all system IDs in the store
 func (sm *SystemManager) GetAllSystemIDs() []string {
 	data := sm.systems.GetAll()
 	ids := make([]string, 0, len(data))
@@ -57,7 +57,7 @@ func (sm *SystemManager) GetAllSystemIDs() []string {
 	return ids
 }

-// TESTING ONLY: GetSystemData returns the combined data for a system with the given ID
+// GetSystemData returns the combined data for a system with the given ID
 // Returns nil if the system doesn't exist
 // This method is intended for testing
 func (sm *SystemManager) GetSystemData(systemID string) *entities.CombinedData {
@@ -68,7 +68,7 @@ func (sm *SystemManager) GetSystemData(systemID string) *entities.CombinedData {
 	return sys.data
 }

-// TESTING ONLY: GetSystemHostPort returns the host and port for a system with the given ID
+// GetSystemHostPort returns the host and port for a system with the given ID
 // Returns empty strings if the system doesn't exist
 func (sm *SystemManager) GetSystemHostPort(systemID string) (string, string) {
 	sys, ok := sm.systems.GetOk(systemID)
@@ -78,7 +78,22 @@ func (sm *SystemManager) GetSystemHostPort(systemID string) (string, string) {
 	return sys.Host, sys.Port
 }

-// TESTING ONLY: SetSystemStatusInDB sets the status of a system directly and updates the database record
+// DisableAutoUpdater disables the automatic updater for a system
+// This is intended for testing
+// Returns false if the system doesn't exist
+// func (sm *SystemManager) DisableAutoUpdater(systemID string) bool {
+// 	sys, ok := sm.systems.GetOk(systemID)
+// 	if !ok {
+// 		return false
+// 	}
+// 	if sys.cancel != nil {
+// 		sys.cancel()
+// 		sys.cancel = nil
+// 	}
+// 	return true
+// }
+
+// SetSystemStatusInDB sets the status of a system directly and updates the database record
 // This is intended for testing
 // Returns false if the system doesn't exist
 func (sm *SystemManager) SetSystemStatusInDB(systemID string, status string) bool {
--- a/beszel/internal/hub/ws/ws.go
+++ b/beszel/internal/hub/ws/ws.go
@@ -1,177 +0,0 @@
-package ws
-
-import (
-	"beszel/internal/common"
-	"beszel/internal/entities/system"
-	"errors"
-	"time"
-	"weak"
-
-	"github.com/fxamacker/cbor/v2"
-	"github.com/lxzan/gws"
-	"golang.org/x/crypto/ssh"
-)
-
-const (
-	deadline = 70 * time.Second
-)
-
-// Handler implements the WebSocket event handler for agent connections.
-type Handler struct {
-	gws.BuiltinEventHandler
-}
-
-// WsConn represents a WebSocket connection to an agent.
-type WsConn struct {
-	conn         *gws.Conn
-	responseChan chan *gws.Message
-	DownChan     chan struct{}
-}
-
-// FingerprintRecord is fingerprints collection record data in the hub
-type FingerprintRecord struct {
-	Id          string `db:"id"`
-	SystemId    string `db:"system"`
-	Fingerprint string `db:"fingerprint"`
-	Token       string `db:"token"`
-}
-
-var upgrader *gws.Upgrader
-
-// GetUpgrader returns a singleton WebSocket upgrader instance.
-func GetUpgrader() *gws.Upgrader {
-	if upgrader != nil {
-		return upgrader
-	}
-	handler := &Handler{}
-	upgrader = gws.NewUpgrader(handler, &gws.ServerOption{})
-	return upgrader
-}
-
-// NewWsConnection creates a new WebSocket connection wrapper.
-func NewWsConnection(conn *gws.Conn) *WsConn {
-	return &WsConn{
-		conn:         conn,
-		responseChan: make(chan *gws.Message, 1),
-		DownChan:     make(chan struct{}, 1),
-	}
-}
-
-// OnOpen sets a deadline for the WebSocket connection.
-func (h *Handler) OnOpen(conn *gws.Conn) {
-	conn.SetDeadline(time.Now().Add(deadline))
-}
-
-// OnMessage routes incoming WebSocket messages to the response channel.
-func (h *Handler) OnMessage(conn *gws.Conn, message *gws.Message) {
-	conn.SetDeadline(time.Now().Add(deadline))
-	if message.Opcode != gws.OpcodeBinary || message.Data.Len() == 0 {
-		return
-	}
-	wsConn, ok := conn.Session().Load("wsConn")
-	if !ok {
-		_ = conn.WriteClose(1000, nil)
-		return
-	}
-	select {
-	case wsConn.(*WsConn).responseChan <- message:
-	default:
-		// close if the connection is not expecting a response
-		wsConn.(*WsConn).Close(nil)
-	}
-}
-
-// OnClose handles WebSocket connection closures and triggers system down status after delay.
-func (h *Handler) OnClose(conn *gws.Conn, err error) {
-	wsConn, ok := conn.Session().Load("wsConn")
-	if !ok {
-		return
-	}
-	wsConn.(*WsConn).conn = nil
-	// wait 5 seconds to allow reconnection before setting system down
-	// use a weak pointer to avoid keeping references if the system is removed
-	go func(downChan weak.Pointer[chan struct{}]) {
-		time.Sleep(5 * time.Second)
-		downChanValue := downChan.Value()
-		if downChanValue != nil {
-			*downChanValue <- struct{}{}
-		}
-	}(weak.Make(&wsConn.(*WsConn).DownChan))
-}
-
-// Close terminates the WebSocket connection gracefully.
-func (ws *WsConn) Close(msg []byte) {
-	if ws.IsConnected() {
-		ws.conn.WriteClose(1000, msg)
-	}
-}
-
-// Ping sends a ping frame to keep the connection alive.
-func (ws *WsConn) Ping() error {
-	ws.conn.SetDeadline(time.Now().Add(deadline))
-	return ws.conn.WritePing(nil)
-}
-
-// sendMessage encodes data to CBOR and sends it as a binary message to the agent.
-func (ws *WsConn) sendMessage(data common.HubRequest[any]) error {
-	bytes, err := cbor.Marshal(data)
-	if err != nil {
-		return err
-	}
-	return ws.conn.WriteMessage(gws.OpcodeBinary, bytes)
-}
-
-// RequestSystemData requests system metrics from the agent and unmarshals the response.
-func (ws *WsConn) RequestSystemData(data *system.CombinedData) error {
-	var message *gws.Message
-
-	ws.sendMessage(common.HubRequest[any]{
-		Action: common.GetData,
-	})
-	select {
-	case <-time.After(10 * time.Second):
-		ws.Close(nil)
-		return gws.ErrConnClosed
-	case message = <-ws.responseChan:
-	}
-	defer message.Close()
-	return cbor.Unmarshal(message.Data.Bytes(), data)
-}
-
-// GetFingerprint authenticates with the agent using SSH signature and returns the agent's fingerprint.
-func (ws *WsConn) GetFingerprint(token string, signer ssh.Signer, needSysInfo bool) (common.FingerprintResponse, error) {
-	var clientFingerprint common.FingerprintResponse
-	challenge := []byte(token)
-
-	signature, err := signer.Sign(nil, challenge)
-	if err != nil {
-		return clientFingerprint, err
-	}
-
-	err = ws.sendMessage(common.HubRequest[any]{
-		Action: common.CheckFingerprint,
-		Data: common.FingerprintRequest{
-			Signature:   signature.Blob,
-			NeedSysInfo: needSysInfo,
-		},
-	})
-	if err != nil {
-		return clientFingerprint, err
-	}
-
-	var message *gws.Message
-	select {
-	case message = <-ws.responseChan:
-	case <-time.After(10 * time.Second):
-		return clientFingerprint, errors.New("request expired")
-	}
-	defer message.Close()
-
-	err = cbor.Unmarshal(message.Data.Bytes(), &clientFingerprint)
-	return clientFingerprint, err
-}
-
-// IsConnected returns true if the WebSocket connection is active.
-func (ws *WsConn) IsConnected() bool {
-	return ws.conn != nil
-}
--- a/beszel/internal/records/records.go
+++ b/beszel/internal/records/records.go
@@ -4,13 +4,13 @@ package records
 import (
 	"beszel/internal/entities/container"
 	"beszel/internal/entities/system"
-	"encoding/json"
 	"fmt"
 	"log"
 	"math"
 	"strings"
 	"time"

+	"github.com/goccy/go-json"
 	"github.com/pocketbase/dbx"
 	"github.com/pocketbase/pocketbase/core"
 )
@@ -26,26 +26,14 @@ type LongerRecordData struct {
 	minShorterRecords  int
 }

-type RecordIds []struct {
-	Id string `db:"id"`
+type RecordStats []struct {
+	Stats []byte `db:"stats"`
 }

 func NewRecordManager(app core.App) *RecordManager {
 	return &RecordManager{app}
 }

-type StatsRecord struct {
-	Stats []byte `db:"stats"`
-}
-
-// global variables for reusing allocations
-var statsRecord StatsRecord
-var containerStats []container.Stats
-var sumStats system.Stats
-var tempStats system.Stats
-var queryParams = make(dbx.Params, 1)
-var containerSums = make(map[string]*container.Stats)
-
 // Create longer records by averaging shorter records
 func (rm *RecordManager) CreateLongerRecords() {
 	// start := time.Now()
@@ -88,10 +76,11 @@ func (rm *RecordManager) CreateLongerRecords() {
 		if err != nil {
 			return err
 		}
-		var systems RecordIds
-		db := txApp.DB()
+		var systems []struct {
+			Id string `db:"id"`
+		}

-		db.NewQuery("SELECT id FROM systems WHERE status='up'").All(&systems)
+		txApp.DB().NewQuery("SELECT id FROM systems WHERE status='up'").All(&systems)

 		// loop through all active systems, time periods, and collections
 		for _, system := range systems {
@@ -107,23 +96,22 @@ func (rm *RecordManager) CreateLongerRecords() {
 				for _, collection := range collections {
 					// check creation time of last longer record if not 10m, since 10m is created every run
 					if recordData.longerType != "10m" {
-						count, err := txApp.CountRecords(
+						lastLongerRecord, err := txApp.FindFirstRecordByFilter(
 							collection.Id,
-							dbx.NewExp(
-								"system = {:system} AND type = {:type} AND created > {:created}",
-								dbx.Params{"type": recordData.longerType, "system": system.Id, "created": longerRecordPeriod},
-							),
+							"system = {:system} && type = {:type} && created > {:created}",
+							dbx.Params{"type": recordData.longerType, "system": system.Id, "created": longerRecordPeriod},
 						)
 						// continue if longer record exists
-						if err != nil || count > 0 {
+						if err == nil || lastLongerRecord != nil {
+							// log.Println("longer record found. continuing")
 							continue
 						}
 					}
 					// get shorter records from the past x minutes
-					var recordIds RecordIds
+					var stats RecordStats

 					err := txApp.DB().
-						Select("id").
+						Select("stats").
 						From(collection.Name).
 						AndWhere(dbx.NewExp(
 							"system={:system} AND type={:type} AND created > {:created}",
@@ -133,10 +121,10 @@ func (rm *RecordManager) CreateLongerRecords() {
 								"created": shorterRecordPeriod,
 							},
 						)).
-						All(&recordIds)
+						All(&stats)

 					// continue if not enough shorter records
-					if err != nil || len(recordIds) < recordData.minShorterRecords {
+					if err != nil || len(stats) < recordData.minShorterRecords {
 						continue
 					}
 					// average the shorter records and create longer record
@@ -145,10 +133,9 @@ func (rm *RecordManager) CreateLongerRecords() {
 					longerRecord.Set("type", recordData.longerType)
 					switch collection.Name {
 					case "system_stats":
-						longerRecord.Set("stats", rm.AverageSystemStats(db, recordIds))
+						longerRecord.Set("stats", rm.AverageSystemStats(stats))
 					case "container_stats":
-
-						longerRecord.Set("stats", rm.AverageContainerStats(db, recordIds))
+						longerRecord.Set("stats", rm.AverageContainerStats(stats))
 					}
 					if err := txApp.SaveNoValidate(longerRecord); err != nil {
 						log.Println("failed to save longer record", "err", err)
@@ -160,34 +147,24 @@ func (rm *RecordManager) CreateLongerRecords() {
 		return nil
 	})

-	statsRecord.Stats = statsRecord.Stats[:0]
-
 	// log.Println("finished creating longer records", "time (ms)", time.Since(start).Milliseconds())
 }

 // Calculate the average stats of a list of system_stats records without reflect
-func (rm *RecordManager) AverageSystemStats(db dbx.Builder, records RecordIds) *system.Stats {
-	// Clear/reset global structs for reuse
-	sumStats = system.Stats{}
-	tempStats = system.Stats{}
-	sum := &sumStats
-	stats := &tempStats
-
+func (rm *RecordManager) AverageSystemStats(records RecordStats) *system.Stats {
+	sum := &system.Stats{}
 	count := float64(len(records))
 	tempCount := float64(0)

-	// Accumulate totals
-	for _, record := range records {
-		id := record.Id
-		// clear global statsRecord for reuse
-		statsRecord.Stats = statsRecord.Stats[:0]
+	// Temporary struct for unmarshaling
+	stats := &system.Stats{}

-		queryParams["id"] = id
-		db.NewQuery("SELECT stats FROM system_stats WHERE id = {:id}").Bind(queryParams).One(&statsRecord)
-		if err := json.Unmarshal(statsRecord.Stats, stats); err != nil {
+	// Accumulate totals
+	for i := range records {
+		*stats = system.Stats{} // Reset tempStats for unmarshaling
+		if err := json.Unmarshal(records[i].Stats, stats); err != nil {
 			continue
 		}
-
 		sum.Cpu += stats.Cpu
 		sum.Mem += stats.Mem
 		sum.MemUsed += stats.MemUsed
@@ -316,24 +293,14 @@ func (rm *RecordManager) AverageSystemStats(db dbx.Builder, records RecordIds) *
 }

 // Calculate the average stats of a list of container_stats records
-func (rm *RecordManager) AverageContainerStats(db dbx.Builder, records RecordIds) []container.Stats {
-	// Clear global map for reuse
-	for k := range containerSums {
-		delete(containerSums, k)
-	}
-	sums := containerSums
+func (rm *RecordManager) AverageContainerStats(records RecordStats) []container.Stats {
+	sums := make(map[string]*container.Stats)
 	count := float64(len(records))
-
+	containerStats := make([]container.Stats, 0, 50)
 	for i := range records {
-		id := records[i].Id
-		// clear global statsRecord and containerStats for reuse
-		statsRecord.Stats = statsRecord.Stats[:0]
+		// reset slice
 		containerStats = containerStats[:0]
-
-		queryParams["id"] = id
-		db.NewQuery("SELECT stats FROM container_stats WHERE id = {:id}").Bind(queryParams).One(&statsRecord)
-
-		if err := json.Unmarshal(statsRecord.Stats, &containerStats); err != nil {
+		if err := json.Unmarshal(records[i].Stats, &containerStats); err != nil {
 			return []container.Stats{}
 		}
 		for i := range containerStats {
@@ -364,7 +331,7 @@ func (rm *RecordManager) AverageContainerStats(db dbx.Builder, records RecordIds
 // Deletes records older than what is displayed in the UI
 func (rm *RecordManager) DeleteOldRecords() {
 	// Define the collections to process
-	collections := [2]string{"system_stats", "container_stats"}
+	collections := []string{"system_stats", "container_stats"}

 	// Define record types and their retention periods
 	type RecordDeletionData struct {
@@ -379,19 +346,17 @@ func (rm *RecordManager) DeleteOldRecords() {
 		{recordType: "480m", retention: 30 * 24 * time.Hour}, // 30 days
 	}

-	now := time.Now().UTC()
-
+	// Process each collection
 	for _, collection := range collections {
 		// Build the WHERE clause dynamically
 		var conditionParts []string
 		var params dbx.Params = make(map[string]any)

-		for i := range recordData {
-			rd := recordData[i]
+		for i, rd := range recordData {
 			// Create parameterized condition for this record type
 			dateParam := fmt.Sprintf("date%d", i)
 			conditionParts = append(conditionParts, fmt.Sprintf("(type = '%s' AND created < {:%s})", rd.recordType, dateParam))
-			params[dateParam] = now.Add(-rd.retention)
+			params[dateParam] = time.Now().UTC().Add(-rd.retention)
 		}

 		// Combine conditions with OR
--- a/beszel/internal/tests/hub.go
+++ b/beszel/internal/tests/hub.go
@@ -1,6 +1,3 @@
-//go:build testing
-// +build testing
-
 // Package tests provides helpers for testing the application.
 package tests

@@ -59,30 +56,3 @@ func NewTestHubWithConfig(config core.BaseAppConfig) (*TestHub, error) {

 	return t, nil
 }
-
-// Helper function to create a test user for config tests
-func CreateUser(app core.App, email string, password string) (*core.Record, error) {
-	userCollection, err := app.FindCachedCollectionByNameOrId("users")
-	if err != nil {
-		return nil, err
-	}
-
-	user := core.NewRecord(userCollection)
-	user.Set("email", email)
-	user.Set("password", password)
-
-	return user, app.Save(user)
-}
-
-// Helper function to create a test record
-func CreateRecord(app core.App, collectionName string, fields map[string]any) (*core.Record, error) {
-	collection, err := app.FindCachedCollectionByNameOrId(collectionName)
-	if err != nil {
-		return nil, err
-	}
-
-	record := core.NewRecord(collection)
-	record.Load(fields)
-
-	return record, app.Save(record)
-}
--- a/beszel/internal/users/users.go
+++ b/beszel/internal/users/users.go
@@ -17,9 +17,7 @@ type UserSettings struct {
 	ChartTime            string   `json:"chartTime"`
 	NotificationEmails   []string `json:"emails"`
 	NotificationWebhooks []string `json:"webhooks"`
-	// UnitTemp             uint8    `json:"unitTemp"` // 0 for Celsius, 1 for Fahrenheit
-	// UnitNet              uint8    `json:"unitNet"`  // 0 for bytes, 1 for bits
-	// UnitDisk             uint8    `json:"unitDisk"` // 0 for bytes, 1 for bits
+	// Language             string   `json:"lang"`
 }

 func NewUserManager(app core.App) *UserManager {
@@ -41,6 +39,7 @@ func (um *UserManager) InitializeUserSettings(e *core.RecordEvent) error {
 	record := e.Record
 	// intialize settings with defaults
 	settings := UserSettings{
+		// Language:             "en",
 		ChartTime:            "1h",
 		NotificationEmails:   []string{},
 		NotificationWebhooks: []string{},
--- a/beszel/migrations/1_collections_snapshot_0_12_0.go
+++ b/beszel/migrations/1_collections_snapshot_0_12_0.go
@@ -1,14 +1,23 @@
 package migrations

 import (
-	"github.com/google/uuid"
 	"github.com/pocketbase/pocketbase/core"
 	m "github.com/pocketbase/pocketbase/migrations"
 )

 func init() {
 	m.Register(func(app core.App) error {
-		// update collections
+		// delete duplicate alerts
+		app.DB().NewQuery(`
+		DELETE FROM alerts
+		WHERE rowid NOT IN (
+				SELECT MAX(rowid)
+				FROM alerts
+				GROUP BY user, system, name
+		);
+	`).Execute()
+
+		// import collections
 		jsonData := `[
 	{
 		"id": "elngm8x1l60zi2v",
@@ -75,10 +84,7 @@ func init() {
 					"Memory",
 					"Disk",
 					"Temperature",
-					"Bandwidth",
-					"LoadAvg1",
-					"LoadAvg5",
-					"LoadAvg15"
+					"Bandwidth"
 				]
 			},
 			{
@@ -230,88 +236,6 @@ func init() {
 		],
 		"system": false
 	},
-	{
-		"id": "pbc_3663931638",
-		"listRule": "@request.auth.id != \"\" && system.users.id ?= @request.auth.id",
-		"viewRule": "@request.auth.id != \"\" && system.users.id ?= @request.auth.id",
-		"createRule": "@request.auth.id != \"\" && system.users.id ?= @request.auth.id && @request.auth.role != \"readonly\"",
-		"updateRule": "@request.auth.id != \"\" && system.users.id ?= @request.auth.id && @request.auth.role != \"readonly\"",
-		"deleteRule": null,
-		"name": "fingerprints",
-		"type": "base",
-		"fields": [
-			{
-				"autogeneratePattern": "[a-z0-9]{9}",
-				"hidden": false,
-				"id": "text3208210256",
-				"max": 15,
-				"min": 9,
-				"name": "id",
-				"pattern": "^[a-z0-9]+$",
-				"presentable": false,
-				"primaryKey": true,
-				"required": true,
-				"system": true,
-				"type": "text"
-			},
-			{
-				"cascadeDelete": true,
-				"collectionId": "2hz5ncl8tizk5nx",
-				"hidden": false,
-				"id": "relation3377271179",
-				"maxSelect": 1,
-				"minSelect": 0,
-				"name": "system",
-				"presentable": false,
-				"required": true,
-				"system": false,
-				"type": "relation"
-			},
-			{
-				"autogeneratePattern": "[a-zA-Z9-9]{20}",
-				"hidden": false,
-				"id": "text1597481275",
-				"max": 255,
-				"min": 9,
-				"name": "token",
-				"pattern": "",
-				"presentable": false,
-				"primaryKey": false,
-				"required": true,
-				"system": false,
-				"type": "text"
-			},
-			{
-				"autogeneratePattern": "",
-				"hidden": false,
-				"id": "text4228609354",
-				"max": 255,
-				"min": 9,
-				"name": "fingerprint",
-				"pattern": "",
-				"presentable": false,
-				"primaryKey": false,
-				"required": false,
-				"system": false,
-				"type": "text"
-			},
-			{
-				"hidden": false,
-				"id": "autodate3332085495",
-				"name": "updated",
-				"onCreate": true,
-				"onUpdate": true,
-				"presentable": false,
-				"system": false,
-				"type": "autodate"
-			}
-		],
-		"indexes": [
-			"CREATE INDEX ` + "`" + `idx_p9qZlu26po` + "`" + ` ON ` + "`" + `fingerprints` + "`" + ` (` + "`" + `token` + "`" + `)",
-			"CREATE UNIQUE INDEX ` + "`" + `idx_ngboulGMYw` + "`" + ` ON ` + "`" + `fingerprints` + "`" + ` (` + "`" + `system` + "`" + `)"
-		],
-		"system": false
-	},
 	{
 		"id": "ej9oowivz8b2mht",
 		"listRule": "@request.auth.id != \"\"",
@@ -745,38 +669,7 @@ func init() {
 	}
 ]`

-		err := app.ImportCollectionsByMarshaledJSON([]byte(jsonData), false)
-		if err != nil {
-			return err
-		}
-
-		// Get all systems that don't have fingerprint records
-		var systemIds []string
-		err = app.DB().NewQuery(`
-			SELECT s.id FROM systems s
-			LEFT JOIN fingerprints f ON s.id = f.system
-			WHERE f.system IS NULL
-		`).Column(&systemIds)
-
-		if err != nil {
-			return err
-		}
-		// Create fingerprint records with unique UUID tokens for each system
-		for _, systemId := range systemIds {
-			token := uuid.New().String()
-			_, err = app.DB().NewQuery(`
-				INSERT INTO fingerprints (system, token)
-				VALUES ({:system}, {:token})
-			`).Bind(map[string]any{
-				"system": systemId,
-				"token":  token,
-			}).Execute()
-			if err != nil {
-				return err
-			}
-		}
-
-		return nil
+		return app.ImportCollectionsByMarshaledJSON([]byte(jsonData), false)
 	}, func(app core.App) error {
 		return nil
 	})
--- a/beszel/migrations/initial-settings.go
+++ b/beszel/migrations/initial-settings.go
@@ -5,7 +5,7 @@ import (
 	m "github.com/pocketbase/pocketbase/migrations"
 )

-const (
+var (
 	TempAdminEmail = "_@b.b"
 )

--- a/beszel/site/bun.lockb
+++ b/beszel/site/bun.lockb
--- a/beszel/site/index.html
+++ b/beszel/site/index.html
@@ -9,8 +9,7 @@
 		<script>
 			globalThis.BESZEL = {
 				BASE_PATH: "%BASE_URL%",
-				HUB_VERSION: "{{V}}",
-				HUB_URL: "{{HUB_URL}}"
+				HUB_VERSION: "{{V}}"
 			}
 		</script>
 	</head>
--- a/beszel/site/package-lock.json
+++ b/beszel/site/package-lock.json
--- a/beszel/site/package.json
+++ b/beszel/site/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "beszel",
 	"private": true,
-	"version": "0.12.0-beta2",
+	"version": "0.11.1",
 	"type": "module",
 	"scripts": {
 		"dev": "vite",
@@ -13,54 +13,54 @@
 	"dependencies": {
 		"@henrygd/queue": "^1.0.7",
 		"@henrygd/semaphore": "^0.0.2",
-		"@lingui/detect-locale": "^5.3.2",
-		"@lingui/macro": "^5.3.2",
-		"@lingui/react": "^5.3.2",
+		"@lingui/detect-locale": "^5.2.0",
+		"@lingui/macro": "^5.2.0",
+		"@lingui/react": "^5.2.0",
 		"@nanostores/react": "^0.7.3",
 		"@nanostores/router": "^0.11.0",
-		"@radix-ui/react-alert-dialog": "^1.1.14",
-		"@radix-ui/react-checkbox": "^1.3.2",
-		"@radix-ui/react-dialog": "^1.1.14",
-		"@radix-ui/react-direction": "^1.1.1",
-		"@radix-ui/react-dropdown-menu": "^2.1.15",
-		"@radix-ui/react-label": "^2.1.7",
-		"@radix-ui/react-select": "^2.2.5",
-		"@radix-ui/react-separator": "^1.1.7",
-		"@radix-ui/react-slider": "^1.3.5",
-		"@radix-ui/react-slot": "^1.2.3",
-		"@radix-ui/react-switch": "^1.2.5",
-		"@radix-ui/react-tabs": "^1.1.12",
-		"@radix-ui/react-toast": "^1.2.14",
-		"@radix-ui/react-tooltip": "^1.2.7",
-		"@tanstack/react-table": "^8.21.3",
+		"@radix-ui/react-alert-dialog": "^1.1.6",
+		"@radix-ui/react-checkbox": "^1.1.4",
+		"@radix-ui/react-dialog": "^1.1.6",
+		"@radix-ui/react-direction": "^1.1.0",
+		"@radix-ui/react-dropdown-menu": "^2.1.6",
+		"@radix-ui/react-label": "^2.1.2",
+		"@radix-ui/react-select": "^2.1.6",
+		"@radix-ui/react-separator": "^1.1.2",
+		"@radix-ui/react-slider": "^1.2.3",
+		"@radix-ui/react-slot": "^1.1.2",
+		"@radix-ui/react-switch": "^1.1.3",
+		"@radix-ui/react-tabs": "^1.1.3",
+		"@radix-ui/react-toast": "^1.2.6",
+		"@radix-ui/react-tooltip": "^1.1.8",
+		"@tanstack/react-table": "^8.21.2",
 		"class-variance-authority": "^0.7.1",
 		"clsx": "^2.1.1",
-		"cmdk": "^1.1.1",
+		"cmdk": "^1.0.4",
 		"d3-time": "^3.1.0",
 		"lucide-react": "^0.452.0",
 		"nanostores": "^0.11.4",
-		"pocketbase": "^0.26.0",
+		"pocketbase": "^0.25.2",
 		"react": "^18.3.1",
 		"react-dom": "^18.3.1",
-		"recharts": "^2.15.3",
+		"recharts": "^2.15.1",
 		"tailwind-merge": "^2.6.0",
 		"tailwindcss-animate": "^1.0.7",
-		"valibot": "^0.42.1"
+		"valibot": "^0.42.0"
 	},
 	"devDependencies": {
-		"@lingui/cli": "^5.3.2",
-		"@lingui/swc-plugin": "^5.5.2",
-		"@lingui/vite-plugin": "^5.3.2",
-		"@types/bun": "^1.2.15",
-		"@types/react": "^18.3.23",
-		"@types/react-dom": "^18.3.7",
-		"@vitejs/plugin-react-swc": "^3.10.1",
-		"autoprefixer": "^10.4.21",
-		"postcss": "^8.5.4",
+		"@lingui/cli": "^5.2.0",
+		"@lingui/swc-plugin": "^5.5.0",
+		"@lingui/vite-plugin": "^5.2.0",
+		"@types/bun": "^1.2.4",
+		"@types/react": "^18.3.1",
+		"@types/react-dom": "^18.3.1",
+		"@vitejs/plugin-react-swc": "^3.8.0",
+		"autoprefixer": "^10.4.20",
+		"postcss": "^8.5.3",
 		"tailwindcss": "^3.4.17",
 		"tailwindcss-rtl": "^0.9.0",
-		"typescript": "^5.8.3",
-		"vite": "^6.3.5"
+		"typescript": "^5.8.2",
+		"vite": "^6.2.0"
 	},
 	"overrides": {
 		"@nanostores/router": {
--- a/beszel/site/src/components/add-system.tsx
+++ b/beszel/site/src/components/add-system.tsx
@@ -11,27 +11,20 @@ import {
 	DialogTrigger,
 } from "@/components/ui/dialog"
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip"
+
 import { Input } from "@/components/ui/input"
 import { Label } from "@/components/ui/label"
 import { $publicKey, pb } from "@/lib/stores"
-import { cn, generateToken, isReadOnlyUser, tokenMap, useLocalStorage } from "@/lib/utils"
+import { cn, copyToClipboard, isReadOnlyUser, useLocalStorage } from "@/lib/utils"
+import { i18n } from "@lingui/core"
 import { useStore } from "@nanostores/react"
-import { ChevronDownIcon, ExternalLinkIcon, PlusIcon } from "lucide-react"
-import { memo, useEffect, useRef, useState } from "react"
-import { $router, basePath, Link, navigate } from "./router"
+import { ChevronDownIcon, Copy, ExternalLinkIcon, PlusIcon } from "lucide-react"
+import { memo, useRef, useState } from "react"
+import { basePath, navigate } from "./router"
+import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from "./ui/dropdown-menu"
 import { SystemRecord } from "@/types"
 import { AppleIcon, DockerIcon, TuxIcon, WindowsIcon } from "./ui/icons"
-import { InputCopy } from "./ui/input-copy"
-import { getPagePath } from "@nanostores/router"
-import {
-	copyDockerCompose,
-	copyDockerRun,
-	copyLinuxCommand,
-	copyWindowsCommand,
-	DropdownItem,
-	InstallDropdown,
-} from "./install-dropdowns"
-import { DropdownMenu, DropdownMenuTrigger } from "./ui/dropdown-menu"

 export function AddSystemButton({ className }: { className?: string }) {
 	const [open, setOpen] = useState(false)
@@ -58,11 +51,44 @@ export function AddSystemButton({ className }: { className?: string }) {
 	)
 }

-/**
- * Token to be used for the next system.
- * Prevents token changing if user copies config, then closes dialog and opens again.
- */
-let nextSystemToken: string | null = null
+function copyDockerCompose(port = "45876", publicKey: string) {
+	copyToClipboard(`services:
+  beszel-agent:
+    image: "henrygd/beszel-agent"
+    container_name: "beszel-agent"
+    restart: unless-stopped
+    network_mode: host
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+      # monitor other disks / partitions by mounting a folder in /extra-filesystems
+      # - /mnt/disk/.beszel:/extra-filesystems/sda1:ro
+    environment:
+      LISTEN: ${port}
+      KEY: "${publicKey}"`)
+}
+
+function copyDockerRun(port = "45876", publicKey: string) {
+	copyToClipboard(
+		`docker run -d --name beszel-agent --network host --restart unless-stopped -v /var/run/docker.sock:/var/run/docker.sock:ro -e KEY="${publicKey}" -e LISTEN=${port} henrygd/beszel-agent:latest`
+	)
+}
+
+function copyLinuxCommand(port = "45876", publicKey: string, brew = false) {
+	let cmd = `curl -sL https://get.beszel.dev${
+		brew ? "/brew" : ""
+	} -o /tmp/install-agent.sh && chmod +x /tmp/install-agent.sh && /tmp/install-agent.sh -p ${port} -k "${publicKey}"`
+	// brew script does not support --china-mirrors
+	if (!brew && (i18n.locale + navigator.language).includes("zh-CN")) {
+		cmd += ` --china-mirrors`
+	}
+	copyToClipboard(cmd)
+}
+
+function copyWindowsCommand(port = "45876", publicKey: string) {
+	copyToClipboard(
+		`& iwr -useb https://get.beszel.dev -OutFile "$env:TEMP\\install-agent.ps1"; & Powershell -ExecutionPolicy Bypass -File "$env:TEMP\\install-agent.ps1" -Key "${publicKey}" -Port ${port}`
+	)
+}

 /**
 * SystemDialog component for adding or editing a system.
@@ -70,32 +96,12 @@ let nextSystemToken: string | null = null
 * @param {function} props.setOpen - Function to set the open state of the dialog.
 * @param {SystemRecord} [props.system] - Optional system record for editing an existing system.
 */
-export const SystemDialog = ({ setOpen, system }: { setOpen: (open: boolean) => void; system?: SystemRecord }) => {
+export const SystemDialog = memo(({ setOpen, system }: { setOpen: (open: boolean) => void; system?: SystemRecord }) => {
 	const publicKey = useStore($publicKey)
 	const port = useRef<HTMLInputElement>(null)
 	const [hostValue, setHostValue] = useState(system?.host ?? "")
 	const isUnixSocket = hostValue.startsWith("/")
 	const [tab, setTab] = useLocalStorage("as-tab", "docker")
-	const [token, setToken] = useState(system?.token ?? "")
-
-	useEffect(() => {
-		;(async () => {
-			// if no system, generate a new token
-			if (!system) {
-				nextSystemToken ||= generateToken()
-				return setToken(nextSystemToken)
-			}
-			// if system exists,get the token from the fingerprint record
-			if (tokenMap.has(system.id)) {
-				return setToken(tokenMap.get(system.id)!)
-			}
-			const { token } = await pb.collection("fingerprints").getFirstListItem(`system = "${system.id}"`, {
-				fields: "token",
-			})
-			tokenMap.set(system.id, token)
-			setToken(token)
-		})()
-	}, [system?.id])

 	async function handleSubmit(e: SubmitEvent) {
 		e.preventDefault()
@@ -107,18 +113,12 @@ export const SystemDialog = ({ setOpen, system }: { setOpen: (open: boolean) =>
 			if (system) {
 				await pb.collection("systems").update(system.id, { ...data, status: "pending" })
 			} else {
-				const createdSystem = await pb.collection("systems").create(data)
-				await pb.collection("fingerprints").create({
-					system: createdSystem.id,
-					token,
-				})
-				// Reset the current token after successful system
-				// creation so next system gets a new token
-				nextSystemToken = null
+				await pb.collection("systems").create(data)
 			}
 			navigate(basePath)
+			// console.log(record)
 		} catch (e) {
-			console.error(e)
+			console.log(e)
 		}
 	}

@@ -143,37 +143,18 @@ export const SystemDialog = ({ setOpen, system }: { setOpen: (open: boolean) =>
 				</DialogHeader>
 				{/* Docker (set tab index to prevent auto focusing content in edit system dialog) */}
 				<TabsContent value="docker" tabIndex={-1}>
-					<DialogDescription className="mb-3 leading-relaxed w-0 min-w-full">
+					<DialogDescription className="mb-4 leading-normal w-0 min-w-full">
 						<Trans>
-							Copy the
-							<code className="bg-muted px-1 rounded-sm leading-3">docker-compose.yml</code> content for the agent
-							below, or register agents automatically with a{" "}
-							<Link
-								onClick={() => setOpen(false)}
-								href={getPagePath($router, "settings", { name: "tokens" })}
-								className="link"
-							>
-								universal token
-							</Link>
-							.
+							The agent must be running on the system to connect. Copy the
+							<code className="bg-muted px-1 rounded-sm leading-3">docker-compose.yml</code> for the agent below.
 						</Trans>
 					</DialogDescription>
 				</TabsContent>
 				{/* Binary */}
 				<TabsContent value="binary" tabIndex={-1}>
-					<DialogDescription className="mb-3 leading-relaxed w-0 min-w-full">
+					<DialogDescription className="mb-4 leading-normal w-0 min-w-full">
 						<Trans>
-							Copy the installation command for the agent below, or register agents automatically with a{" "}
-							<Link
-								onClick={() => {
-									setOpen(false)
-								}}
-								href={getPagePath($router, "settings", { name: "tokens" })}
-								className="link"
-							>
-								universal token
-							</Link>
-							.
+							The agent must be running on the system to connect. Copy the installation command for the agent below.
 						</Trans>
 					</DialogDescription>
 				</TabsContent>
@@ -209,27 +190,46 @@ export const SystemDialog = ({ setOpen, system }: { setOpen: (open: boolean) =>
 						<Label htmlFor="pkey" className="xs:text-end whitespace-pre">
 							<Trans comment="Use 'Key' if your language requires many more characters">Public Key</Trans>
 						</Label>
-						<InputCopy value={publicKey} id="pkey" name="pkey" />
-						<Label htmlFor="tkn" className="xs:text-end whitespace-pre">
-							<Trans>Token</Trans>
-						</Label>
-						<InputCopy value={token} id="tkn" name="tkn" />
+						<div className="relative">
+							<Input readOnly id="pkey" value={publicKey} required></Input>
+							<div
+								className={
+									"h-6 w-24 bg-gradient-to-r rtl:bg-gradient-to-l from-transparent to-background to-65% absolute top-2 end-1 pointer-events-none"
+								}
+							></div>
+							<TooltipProvider delayDuration={100}>
+								<Tooltip>
+									<TooltipTrigger asChild>
+										<Button
+											type="button"
+											variant={"link"}
+											className="absolute end-0 top-0"
+											onClick={() => copyToClipboard(publicKey)}
+										>
+											<Copy className="size-4" />
+										</Button>
+									</TooltipTrigger>
+									<TooltipContent>
+										<p>
+											<Trans>Click to copy</Trans>
+										</p>
+									</TooltipContent>
+								</Tooltip>
+							</TooltipProvider>
+						</div>
 					</div>
 					<DialogFooter className="flex justify-end gap-x-2 gap-y-3 flex-col mt-5">
 						{/* Docker */}
 						<TabsContent value="docker" className="contents">
 							<CopyButton
 								text={t({ message: "Copy docker compose", context: "Button to copy docker compose file content" })}
-								onClick={async () =>
-									copyDockerCompose(isUnixSocket ? hostValue : port.current?.value, publicKey, token)
-								}
+								onClick={() => copyDockerCompose(isUnixSocket ? hostValue : port.current?.value, publicKey)}
 								icon={<DockerIcon className="size-4 -me-0.5" />}
 								dropdownItems={[
 									{
 										text: t({ message: "Copy docker run", context: "Button to copy docker run command" }),
-										onClick: async () =>
-											copyDockerRun(isUnixSocket ? hostValue : port.current?.value, publicKey, token),
-										icons: [DockerIcon],
+										onClick: () => copyDockerRun(isUnixSocket ? hostValue : port.current?.value, publicKey),
+										icons: [<DockerIcon className="size-4" />],
 									},
 								]}
 							/>
@@ -239,24 +239,22 @@ export const SystemDialog = ({ setOpen, system }: { setOpen: (open: boolean) =>
 							<CopyButton
 								text={t`Copy Linux command`}
 								icon={<TuxIcon className="size-4" />}
-								onClick={async () => copyLinuxCommand(isUnixSocket ? hostValue : port.current?.value, publicKey, token)}
+								onClick={() => copyLinuxCommand(isUnixSocket ? hostValue : port.current?.value, publicKey)}
 								dropdownItems={[
 									{
 										text: t({ message: "Homebrew command", context: "Button to copy install command" }),
-										onClick: async () =>
-											copyLinuxCommand(isUnixSocket ? hostValue : port.current?.value, publicKey, token, true),
-										icons: [AppleIcon, TuxIcon],
+										onClick: () => copyLinuxCommand(isUnixSocket ? hostValue : port.current?.value, publicKey, true),
+										icons: [<AppleIcon className="size-4" />, <TuxIcon className="w-4 h-4" />],
 									},
 									{
 										text: t({ message: "Windows command", context: "Button to copy install command" }),
-										onClick: async () =>
-											copyWindowsCommand(isUnixSocket ? hostValue : port.current?.value, publicKey, token),
-										icons: [WindowsIcon],
+										onClick: () => copyWindowsCommand(isUnixSocket ? hostValue : port.current?.value, publicKey),
+										icons: [<WindowsIcon className="size-4" />],
 									},
 									{
 										text: t`Manual setup instructions`,
 										url: "https://beszel.dev/guide/agent-installation#binary",
-										icons: [ExternalLinkIcon],
+										icons: [<ExternalLinkIcon className="size-4" />],
 									},
 								]}
 							/>
@@ -268,13 +266,20 @@ export const SystemDialog = ({ setOpen, system }: { setOpen: (open: boolean) =>
 			</Tabs>
 		</DialogContent>
 	)
+})
+
+interface DropdownItem {
+	text: string
+	onClick?: () => void
+	url?: string
+	icons?: React.ReactNode[]
 }

 interface CopyButtonProps {
 	text: string
 	onClick: () => void
 	dropdownItems: DropdownItem[]
-	icon?: React.ReactElement
+	icon?: React.ReactNode
 }

 const CopyButton = memo((props: CopyButtonProps) => {
@@ -295,7 +300,22 @@ const CopyButton = memo((props: CopyButtonProps) => {
 						<ChevronDownIcon />
 					</Button>
 				</DropdownMenuTrigger>
-				<InstallDropdown items={props.dropdownItems} />
+				<DropdownMenuContent align="end">
+					{props.dropdownItems.map((item, index) => {
+						const className = "cursor-pointer flex items-center gap-1.5"
+						return item.url ? (
+							<DropdownMenuItem key={index} asChild>
+								<a href={item.url} className={className} target="_blank" rel="noopener noreferrer">
+									{item.text} {item.icons?.map((icon) => icon)}
+								</a>
+							</DropdownMenuItem>
+						) : (
+							<DropdownMenuItem key={index} onClick={item.onClick} className={className}>
+								{item.text} {item.icons?.map((icon) => icon)}
+							</DropdownMenuItem>
+						)
+					})}
+				</DropdownMenuContent>
 			</DropdownMenu>
 		</div>
 	)
--- a/beszel/site/src/components/alerts/alert-button.tsx
+++ b/beszel/site/src/components/alerts/alert-button.tsx
@@ -11,14 +11,13 @@ import {
 	DialogHeader,
 	DialogTitle,
 } from "@/components/ui/dialog"
-import { BellIcon, GlobeIcon, ServerIcon, HourglassIcon } from "lucide-react"
+import { BellIcon, GlobeIcon, ServerIcon } from "lucide-react"
 import { alertInfo, cn } from "@/lib/utils"
 import { Button } from "@/components/ui/button"
 import { AlertRecord, SystemRecord } from "@/types"
 import { $router, Link } from "../router"
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"
 import { Checkbox } from "../ui/checkbox"
-import { Collapsible } from "../ui/collapsible"
 import { SystemAlert, SystemAlertGlobal } from "./alerts-system"
 import { getPagePath } from "@nanostores/router"

@@ -40,33 +39,13 @@ export default memo(function AlertsButton({ system }: { system: SystemRecord })
 						/>
 					</Button>
 				</DialogTrigger>
-				<DialogContent className="max-h-full sm:max-h-[95svh] overflow-auto max-w-[37rem]">
+				<DialogContent className="max-h-full overflow-auto max-w-[35rem]">
 					{opened && <AlertDialogContent system={system} />}
 				</DialogContent>
 			</Dialog>
 		),
 		[opened, hasAlert]
 	)
-
-	// return useMemo(
-	// 	() => (
-	// 		<Sheet>
-	// 			<SheetTrigger asChild>
-	// 				<Button variant="ghost" size="icon" aria-label={t`Alerts`} data-nolink onClick={() => setOpened(true)}>
-	// 					<BellIcon
-	// 						className={cn("h-[1.2em] w-[1.2em] pointer-events-none", {
-	// 							"fill-primary": hasAlert,
-	// 						})}
-	// 					/>
-	// 				</Button>
-	// 			</SheetTrigger>
-	// 			<SheetContent className="max-h-full overflow-auto w-[35em] p-4 sm:p-5">
-	// 				{opened && <AlertDialogContent system={system} />}
-	// 			</SheetContent>
-	// 		</Sheet>
-	// 	),
-	// 	[opened, hasAlert]
-	// )
 })

 function AlertDialogContent({ system }: { system: SystemRecord }) {
--- a/beszel/site/src/components/alerts/alerts-system.tsx
+++ b/beszel/site/src/components/alerts/alerts-system.tsx
@@ -217,7 +217,7 @@ function AlertContent({ data }: { data: AlertData }) {

 	const [checked, setChecked] = useState(data.checked || false)
 	const [min, setMin] = useState(data.min || 10)
-	const [value, setValue] = useState(data.val || (singleDescription ? 0 : data.alert.start ?? 80))
+	const [value, setValue] = useState(data.val || (singleDescription ? 0 : 80))

 	const Icon = alertInfo[name].icon

@@ -268,8 +268,7 @@ function AlertContent({ data }: { data: AlertData }) {
 										onValueChange={(val) => {
 											setValue(val[0])
 										}}
-										step={data.alert.step ?? 1}
-										min={data.alert.min ?? 1}
+										min={1}
 										max={alertInfo[name].max ?? 99}
 									/>
 								</div>
--- a/beszel/site/src/components/charts/area-chart.tsx
+++ b/beszel/site/src/components/charts/area-chart.tsx
@@ -2,7 +2,14 @@ import { t } from "@lingui/core/macro"

 import { Area, AreaChart, CartesianGrid, YAxis } from "recharts"
 import { ChartContainer, ChartTooltip, ChartTooltipContent, xAxis } from "@/components/ui/chart"
-import { useYAxisWidth, cn, formatShortDate, chartMargin } from "@/lib/utils"
+import {
+	useYAxisWidth,
+	cn,
+	formatShortDate,
+	toFixedWithoutTrailingZeros,
+	decimalString,
+	chartMargin,
+} from "@/lib/utils"
 // import Spinner from '../spinner'
 import { ChartData } from "@/types"
 import { memo, useMemo } from "react"
@@ -23,6 +30,7 @@ const getNestedValue = (path: string, max = false, data: any): number | null =>

 export default memo(function AreaChartDefault({
 	maxToggled = false,
+	unit = " MB/s",
 	chartName,
 	chartData,
 	max,
@@ -30,11 +38,12 @@ export default memo(function AreaChartDefault({
 	contentFormatter,
 }: {
 	maxToggled?: boolean
+	unit?: string
 	chartName: string
 	chartData: ChartData
 	max?: number
-	tickFormatter: (value: number) => string
-	contentFormatter: ({ value }: { value: number }) => string
+	tickFormatter?: (value: number) => string
+	contentFormatter?: (value: number) => string
 }) {
 	const { yAxisWidth, updateYAxisWidth } = useYAxisWidth()
 	const { i18n } = useLingui()
@@ -89,7 +98,15 @@ export default memo(function AreaChartDefault({
 						className="tracking-tighter"
 						width={yAxisWidth}
 						domain={[0, max ?? "auto"]}
-						tickFormatter={(value) => updateYAxisWidth(tickFormatter(value))}
+						tickFormatter={(value) => {
+							let val: string
+							if (tickFormatter) {
+								val = tickFormatter(value)
+							} else {
+								val = toFixedWithoutTrailingZeros(value, 2) + unit
+							}
+							return updateYAxisWidth(val)
+						}}
 						tickLine={false}
 						axisLine={false}
 					/>
@@ -100,7 +117,12 @@ export default memo(function AreaChartDefault({
 						content={
 							<ChartTooltipContent
 								labelFormatter={(_, data) => formatShortDate(data[0].payload.created)}
-								contentFormatter={contentFormatter}
+								contentFormatter={({ value }) => {
+									if (contentFormatter) {
+										return contentFormatter(value)
+									}
+									return decimalString(value) + unit
+								}}
 								// indicator="line"
 							/>
 						}
--- a/beszel/site/src/components/charts/container-chart.tsx
+++ b/beszel/site/src/components/charts/container-chart.tsx
@@ -1,13 +1,22 @@
 import { Area, AreaChart, CartesianGrid, YAxis } from "recharts"
 import { ChartConfig, ChartContainer, ChartTooltip, ChartTooltipContent, xAxis } from "@/components/ui/chart"
 import { memo, useMemo } from "react"
-import { useYAxisWidth, cn, formatShortDate, chartMargin, toFixedFloat, formatBytes, decimalString } from "@/lib/utils"
+import {
+	useYAxisWidth,
+	cn,
+	formatShortDate,
+	decimalString,
+	chartMargin,
+	toFixedFloat,
+	getSizeAndUnit,
+	toFixedWithoutTrailingZeros,
+} from "@/lib/utils"
 // import Spinner from '../spinner'
 import { useStore } from "@nanostores/react"
-import { $containerFilter, $userSettings } from "@/lib/stores"
+import { $containerFilter } from "@/lib/stores"
 import { ChartData } from "@/types"
 import { Separator } from "../ui/separator"
-import { ChartType, Unit } from "@/lib/enums"
+import { ChartType } from "@/lib/enums"

 export default memo(function ContainerChart({
 	dataKey,
@@ -21,7 +30,6 @@ export default memo(function ContainerChart({
 	unit?: string
 }) {
 	const filter = useStore($containerFilter)
-	const userSettings = useStore($userSettings)
 	const { yAxisWidth, updateYAxisWidth } = useYAxisWidth()

 	const { containerData } = chartData
@@ -76,14 +84,13 @@ export default memo(function ContainerChart({
 		// tick formatter
 		if (chartType === ChartType.CPU) {
 			obj.tickFormatter = (value) => {
-				const val = toFixedFloat(value, 2) + unit
+				const val = toFixedWithoutTrailingZeros(value, 2) + unit
 				return updateYAxisWidth(val)
 			}
 		} else {
-			const chartUnit = isNetChart ? userSettings.unitNet : Unit.Bytes
-			obj.tickFormatter = (val) => {
-				const { value, unit } = formatBytes(val, isNetChart, chartUnit, true)
-				return updateYAxisWidth(toFixedFloat(value, value >= 10 ? 0 : 1) + " " + unit)
+			obj.tickFormatter = (value) => {
+				const { v, u } = getSizeAndUnit(value, false)
+				return updateYAxisWidth(`${toFixedFloat(v, 2)}${u}${isNetChart ? "/s" : ""}`)
 			}
 		}
 		// tooltip formatter
@@ -92,14 +99,12 @@ export default memo(function ContainerChart({
 				try {
 					const sent = item?.payload?.[key]?.ns ?? 0
 					const received = item?.payload?.[key]?.nr ?? 0
-					const { value: receivedValue, unit: receivedUnit } = formatBytes(received, true, userSettings.unitNet, true)
-					const { value: sentValue, unit: sentUnit } = formatBytes(sent, true, userSettings.unitNet, true)
 					return (
 						<span className="flex">
-							{decimalString(receivedValue)} {receivedUnit}
+							{decimalString(received)} MB/s
 							<span className="opacity-70 ms-0.5"> rx </span>
 							<Separator orientation="vertical" className="h-3 mx-1.5 bg-primary/40" />
-							{decimalString(sentValue)} {sentUnit}
+							{decimalString(sent)} MB/s
 							<span className="opacity-70 ms-0.5"> tx</span>
 						</span>
 					)
@@ -109,8 +114,8 @@ export default memo(function ContainerChart({
 			}
 		} else if (chartType === ChartType.Memory) {
 			obj.toolTipFormatter = (item: any) => {
-				const { value, unit } = formatBytes(item.value, false, Unit.Bytes, true)
-				return decimalString(value) + " " + unit
+				const { v, u } = getSizeAndUnit(item.value, false)
+				return decimalString(v, 2) + u
 			}
 		} else {
 			obj.toolTipFormatter = (item: any) => decimalString(item.value) + unit
--- a/beszel/site/src/components/charts/disk-chart.tsx
+++ b/beszel/site/src/components/charts/disk-chart.tsx
@@ -1,10 +1,17 @@
 import { Area, AreaChart, CartesianGrid, YAxis } from "recharts"
 import { ChartContainer, ChartTooltip, ChartTooltipContent, xAxis } from "@/components/ui/chart"
-import { useYAxisWidth, cn, formatShortDate, decimalString, chartMargin, formatBytes, toFixedFloat } from "@/lib/utils"
+import {
+	useYAxisWidth,
+	cn,
+	formatShortDate,
+	decimalString,
+	toFixedFloat,
+	chartMargin,
+	getSizeAndUnit,
+} from "@/lib/utils"
 import { ChartData } from "@/types"
 import { memo } from "react"
 import { useLingui } from "@lingui/react/macro"
-import { Unit } from "@/lib/enums"

 export default memo(function DiskChart({
 	dataKey,
@@ -46,9 +53,9 @@ export default memo(function DiskChart({
 						minTickGap={6}
 						tickLine={false}
 						axisLine={false}
-						tickFormatter={(val) => {
-							const { value, unit } = formatBytes(val * 1024, false, Unit.Bytes, true)
-							return updateYAxisWidth(toFixedFloat(value, value >= 10 ? 0 : 1) + " " + unit)
+						tickFormatter={(value) => {
+							const { v, u } = getSizeAndUnit(value)
+							return updateYAxisWidth(toFixedFloat(v, 2) + u)
 						}}
 					/>
 					{xAxis(chartData)}
@@ -59,8 +66,8 @@ export default memo(function DiskChart({
 							<ChartTooltipContent
 								labelFormatter={(_, data) => formatShortDate(data[0].payload.created)}
 								contentFormatter={({ value }) => {
-									const { value: convertedValue, unit } = formatBytes(value * 1024, false, Unit.Bytes, true)
-									return decimalString(convertedValue) + " " + unit
+									const { v, u } = getSizeAndUnit(value)
+									return decimalString(v) + u
 								}}
 							/>
 						}
--- a/beszel/site/src/components/charts/gpu-power-chart.tsx
+++ b/beszel/site/src/components/charts/gpu-power-chart.tsx
@@ -8,7 +8,14 @@ import {
 	ChartTooltipContent,
 	xAxis,
 } from "@/components/ui/chart"
-import { useYAxisWidth, cn, formatShortDate, toFixedFloat, decimalString, chartMargin } from "@/lib/utils"
+import {
+	useYAxisWidth,
+	cn,
+	formatShortDate,
+	toFixedWithoutTrailingZeros,
+	decimalString,
+	chartMargin,
+} from "@/lib/utils"
 import { ChartData } from "@/types"
 import { memo, useMemo } from "react"

@@ -65,7 +72,7 @@ export default memo(function GpuPowerChart({ chartData }: { chartData: ChartData
 						domain={[0, "auto"]}
 						width={yAxisWidth}
 						tickFormatter={(value) => {
-							const val = toFixedFloat(value, 2)
+							const val = toFixedWithoutTrailingZeros(value, 2)
 							return updateYAxisWidth(val + "W")
 						}}
 						tickLine={false}
--- a/beszel/site/src/components/charts/load-average-chart.tsx
+++ b/beszel/site/src/components/charts/load-average-chart.tsx
@@ -1,123 +0,0 @@
-import { CartesianGrid, Line, LineChart, YAxis } from "recharts"
-
-import {
-	ChartContainer,
-	ChartLegend,
-	ChartLegendContent,
-	ChartTooltip,
-	ChartTooltipContent,
-	xAxis,
-} from "@/components/ui/chart"
-import {
-	useYAxisWidth,
-	cn,
-	formatShortDate,
-	toFixedWithoutTrailingZeros,
-	decimalString,
-	chartMargin,
-} from "@/lib/utils"
-import { ChartData } from "@/types"
-import { memo, useMemo } from "react"
-import { t } from "@lingui/core/macro"
-
-export default memo(function LoadAverageChart({ chartData }: { chartData: ChartData }) {
-	const { yAxisWidth, updateYAxisWidth } = useYAxisWidth()
-
-	if (chartData.systemStats.length === 0) {
-		return null
-	}
-
-	/** Format load average data for chart */
-	const newChartData = useMemo(() => {
-		const newChartData = { data: [], colors: {} } as {
-			data: Record<string, number | string>[]
-			colors: Record<string, string>
-		}
-		
-		// Define colors for the three load average lines
-		const colors = {
-			"1m": "hsl(25, 95%, 53%)",   // Orange for 1-minute
-			"5m": "hsl(217, 91%, 60%)",  // Blue for 5-minute  
-			"15m": "hsl(271, 81%, 56%)", // Purple for 15-minute
-		}
-
-		for (let data of chartData.systemStats) {
-			let newData = { created: data.created } as Record<string, number | string>
-			
-			// Add load average values if they exist and stats is not null
-			if (data.stats && data.stats.l1 !== undefined) {
-				newData["1m"] = data.stats.l1
-			}
-			if (data.stats && data.stats.l5 !== undefined) {
-				newData["5m"] = data.stats.l5
-			}
-			if (data.stats && data.stats.l15 !== undefined) {
-				newData["15m"] = data.stats.l15
-			}
-			
-			newChartData.data.push(newData)
-		}
-		
-		newChartData.colors = colors
-		return newChartData
-	}, [chartData])
-
-	const loadKeys = ["1m", "5m", "15m"].filter(key => 
-		newChartData.data.some(data => data[key] !== undefined)
-	)
-
-	// console.log('rendered at', new Date())
-
-	return (
-		<div>
-			<ChartContainer
-				className={cn("h-full w-full absolute aspect-auto bg-card opacity-0 transition-opacity", {
-					"opacity-100": yAxisWidth,
-				})}
-			>
-				<LineChart accessibilityLayer data={newChartData.data} margin={chartMargin}>
-					<CartesianGrid vertical={false} />
-					<YAxis
-						direction="ltr"
-						orientation={chartData.orientation}
-						className="tracking-tighter"
-						domain={[0, "auto"]}
-						width={yAxisWidth}
-						tickFormatter={(value) => {
-							const val = toFixedWithoutTrailingZeros(value, 2)
-							return updateYAxisWidth(val)
-						}}
-						tickLine={false}
-						axisLine={false}
-					/>
-					{xAxis(chartData)}
-					<ChartTooltip
-						animationEasing="ease-out"
-						animationDuration={150}
-						// @ts-ignore
-						itemSorter={(a, b) => b.value - a.value}
-						content={
-							<ChartTooltipContent
-								labelFormatter={(_, data) => formatShortDate(data[0].payload.created)}
-								contentFormatter={(item) => decimalString(item.value)}
-							/>
-						}
-					/>
-					{loadKeys.map((key) => (
-						<Line
-							key={key}
-							dataKey={key}
-							name={key === "1m" ? t`1 min` : key === "5m" ? t`5 min` : t`15 min`}
-							type="monotoneX"
-							dot={false}
-							strokeWidth={1.5}
-							stroke={newChartData.colors[key]}
-							isAnimationActive={false}
-						/>
-					))}
-					<ChartLegend content={<ChartLegendContent />} />
-				</LineChart>
-			</ChartContainer>
-		</div>
-	)
-}) 
--- a/beszel/site/src/components/charts/mem-chart.tsx
+++ b/beszel/site/src/components/charts/mem-chart.tsx
@@ -1,10 +1,9 @@
 import { Area, AreaChart, CartesianGrid, YAxis } from "recharts"
 import { ChartContainer, ChartTooltip, ChartTooltipContent, xAxis } from "@/components/ui/chart"
-import { useYAxisWidth, cn, decimalString, formatShortDate, chartMargin, formatBytes, toFixedFloat } from "@/lib/utils"
+import { useYAxisWidth, cn, toFixedFloat, decimalString, formatShortDate, chartMargin } from "@/lib/utils"
 import { memo } from "react"
 import { ChartData } from "@/types"
 import { useLingui } from "@lingui/react/macro"
-import { Unit } from "@/lib/enums"

 export default memo(function MemChart({ chartData }: { chartData: ChartData }) {
 	const { yAxisWidth, updateYAxisWidth } = useYAxisWidth()
@@ -40,8 +39,8 @@ export default memo(function MemChart({ chartData }: { chartData: ChartData }) {
 							tickLine={false}
 							axisLine={false}
 							tickFormatter={(value) => {
-								const { value: convertedValue, unit } = formatBytes(value * 1024, false, Unit.Bytes, true)
-								return updateYAxisWidth(toFixedFloat(convertedValue, value >= 10 ? 0 : 1) + " " + unit)
+								const val = toFixedFloat(value, 1)
+								return updateYAxisWidth(val + " GB")
 							}}
 						/>
 					)}
@@ -55,11 +54,8 @@ export default memo(function MemChart({ chartData }: { chartData: ChartData }) {
 								// @ts-ignore
 								itemSorter={(a, b) => a.order - b.order}
 								labelFormatter={(_, data) => formatShortDate(data[0].payload.created)}
-								contentFormatter={({ value }) => {
-									// mem values are supplied as GB
-									const { value: convertedValue, unit } = formatBytes(value * 1024, false, Unit.Bytes, true)
-									return decimalString(convertedValue, convertedValue >= 100 ? 1 : 2) + " " + unit
-								}}
+								contentFormatter={(item) => decimalString(item.value) + " GB"}
+								// indicator="line"
 							/>
 						}
 					/>
--- a/beszel/site/src/components/charts/swap-chart.tsx
+++ b/beszel/site/src/components/charts/swap-chart.tsx
@@ -1,16 +1,20 @@
-import { t } from "@lingui/core/macro"
+import { t } from "@lingui/core/macro";

 import { Area, AreaChart, CartesianGrid, YAxis } from "recharts"
 import { ChartContainer, ChartTooltip, ChartTooltipContent, xAxis } from "@/components/ui/chart"
-import { useYAxisWidth, cn, formatShortDate, decimalString, chartMargin, formatBytes, toFixedFloat } from "@/lib/utils"
+import {
+	useYAxisWidth,
+	cn,
+	formatShortDate,
+	toFixedWithoutTrailingZeros,
+	decimalString,
+	chartMargin,
+} from "@/lib/utils"
 import { ChartData } from "@/types"
 import { memo } from "react"
-import { $userSettings } from "@/lib/stores"
-import { useStore } from "@nanostores/react"

 export default memo(function SwapChart({ chartData }: { chartData: ChartData }) {
 	const { yAxisWidth, updateYAxisWidth } = useYAxisWidth()
-	const userSettings = useStore($userSettings)

 	if (chartData.systemStats.length === 0) {
 		return null
@@ -29,14 +33,11 @@ export default memo(function SwapChart({ chartData }: { chartData: ChartData })
 						direction="ltr"
 						orientation={chartData.orientation}
 						className="tracking-tighter"
-						domain={[0, () => toFixedFloat(chartData.systemStats.at(-1)?.stats.s ?? 0.04, 2)]}
+						domain={[0, () => toFixedWithoutTrailingZeros(chartData.systemStats.at(-1)?.stats.s ?? 0.04, 2)]}
 						width={yAxisWidth}
 						tickLine={false}
 						axisLine={false}
-						tickFormatter={(value) => {
-							const { value: convertedValue, unit } = formatBytes(value * 1024, false, userSettings.unitDisk, true)
-							return updateYAxisWidth(toFixedFloat(convertedValue, value >= 10 ? 0 : 1) + " " + unit)
-						}}
+						tickFormatter={(value) => updateYAxisWidth(value + " GB")}
 					/>
 					{xAxis(chartData)}
 					<ChartTooltip
@@ -45,11 +46,7 @@ export default memo(function SwapChart({ chartData }: { chartData: ChartData })
 						content={
 							<ChartTooltipContent
 								labelFormatter={(_, data) => formatShortDate(data[0].payload.created)}
-								contentFormatter={({ value }) => {
-									// mem values are supplied as GB
-									const { value: convertedValue, unit } = formatBytes(value * 1024, false, userSettings.unitDisk, true)
-									return decimalString(convertedValue, convertedValue >= 100 ? 1 : 2) + " " + unit
-								}}
+								contentFormatter={(item) => decimalString(item.value) + " GB"}
 								// indicator="line"
 							/>
 						}
--- a/beszel/site/src/components/charts/temperature-chart.tsx
+++ b/beszel/site/src/components/charts/temperature-chart.tsx
@@ -12,19 +12,17 @@ import {
 	useYAxisWidth,
 	cn,
 	formatShortDate,
-	toFixedFloat,
-	chartMargin,
-	formatTemperature,
+	toFixedWithoutTrailingZeros,
 	decimalString,
+	chartMargin,
 } from "@/lib/utils"
 import { ChartData } from "@/types"
 import { memo, useMemo } from "react"
-import { $temperatureFilter, $userSettings } from "@/lib/stores"
+import { $temperatureFilter } from "@/lib/stores"
 import { useStore } from "@nanostores/react"

 export default memo(function TemperatureChart({ chartData }: { chartData: ChartData }) {
 	const filter = useStore($temperatureFilter)
-	const userSettings = useStore($userSettings)
 	const { yAxisWidth, updateYAxisWidth } = useYAxisWidth()

 	if (chartData.systemStats.length === 0) {
@@ -74,9 +72,9 @@ export default memo(function TemperatureChart({ chartData }: { chartData: ChartD
 						className="tracking-tighter"
 						domain={[0, "auto"]}
 						width={yAxisWidth}
-						tickFormatter={(val) => {
-							const { value, unit } = formatTemperature(val, userSettings.unitTemp)
-							return updateYAxisWidth(toFixedFloat(value, 2) + " " + unit)
+						tickFormatter={(value) => {
+							const val = toFixedWithoutTrailingZeros(value, 2)
+							return updateYAxisWidth(val + " °C")
 						}}
 						tickLine={false}
 						axisLine={false}
@@ -90,10 +88,7 @@ export default memo(function TemperatureChart({ chartData }: { chartData: ChartD
 						content={
 							<ChartTooltipContent
 								labelFormatter={(_, data) => formatShortDate(data[0].payload.created)}
-								contentFormatter={(item) => {
-									const { value, unit } = formatTemperature(item.value, userSettings.unitTemp)
-									return decimalString(value) + " " + unit
-								}}
+								contentFormatter={(item) => decimalString(item.value) + " °C"}
 								filter={filter}
 							/>
 						}
--- a/beszel/site/src/components/command-palette.tsx
+++ b/beszel/site/src/components/command-palette.tsx
@@ -1,7 +1,6 @@
 import {
 	BookIcon,
 	DatabaseBackupIcon,
-	FingerprintIcon,
 	LayoutDashboard,
 	LogsIcon,
 	MailIcon,
@@ -41,16 +40,6 @@ export default memo(function CommandPalette({ open, setOpen }: { open: boolean;

 	return useMemo(() => {
 		const systems = $systems.get()
-		const SettingsShortcut = (
-			<CommandShortcut>
-				<Trans>Settings</Trans>
-			</CommandShortcut>
-		)
-		const AdminShortcut = (
-			<CommandShortcut>
-				<Trans>Admin</Trans>
-			</CommandShortcut>
-		)
 		return (
 			<CommandDialog open={open} onOpenChange={setOpen}>
 				<CommandInput placeholder={t`Search for systems or settings...`} />
@@ -104,7 +93,9 @@ export default memo(function CommandPalette({ open, setOpen }: { open: boolean;
 							<span>
 								<Trans>Settings</Trans>
 							</span>
-							{SettingsShortcut}
+							<CommandShortcut>
+								<Trans>Settings</Trans>
+							</CommandShortcut>
 						</CommandItem>
 						<CommandItem
 							keywords={["alerts"]}
@@ -117,19 +108,9 @@ export default memo(function CommandPalette({ open, setOpen }: { open: boolean;
 							<span>
 								<Trans>Notifications</Trans>
 							</span>
-							{SettingsShortcut}
-						</CommandItem>
-						<CommandItem
-							onSelect={() => {
-								navigate(getPagePath($router, "settings", { name: "tokens" }))
-								setOpen(false)
-							}}
-						>
-							<FingerprintIcon className="me-2 h-4 w-4" />
-							<span>
-								<Trans>Tokens & Fingerprints</Trans>
-							</span>
-							{SettingsShortcut}
+							<CommandShortcut>
+								<Trans>Settings</Trans>
+							</CommandShortcut>
 						</CommandItem>
 						<CommandItem
 							keywords={["help", "oauth", "oidc"]}
@@ -159,7 +140,9 @@ export default memo(function CommandPalette({ open, setOpen }: { open: boolean;
 									<span>
 										<Trans>Users</Trans>
 									</span>
-									{AdminShortcut}
+									<CommandShortcut>
+										<Trans>Admin</Trans>
+									</CommandShortcut>
 								</CommandItem>
 								<CommandItem
 									onSelect={() => {
@@ -171,7 +154,9 @@ export default memo(function CommandPalette({ open, setOpen }: { open: boolean;
 									<span>
 										<Trans>Logs</Trans>
 									</span>
-									{AdminShortcut}
+									<CommandShortcut>
+										<Trans>Admin</Trans>
+									</CommandShortcut>
 								</CommandItem>
 								<CommandItem
 									onSelect={() => {
@@ -183,7 +168,9 @@ export default memo(function CommandPalette({ open, setOpen }: { open: boolean;
 									<span>
 										<Trans>Backups</Trans>
 									</span>
-									{AdminShortcut}
+									<CommandShortcut>
+										<Trans>Admin</Trans>
+									</CommandShortcut>
 								</CommandItem>
 								<CommandItem
 									keywords={["email"]}
@@ -196,7 +183,9 @@ export default memo(function CommandPalette({ open, setOpen }: { open: boolean;
 									<span>
 										<Trans>SMTP settings</Trans>
 									</span>
-									{AdminShortcut}
+									<CommandShortcut>
+										<Trans>Admin</Trans>
+									</CommandShortcut>
 								</CommandItem>
 							</CommandGroup>
 						</>
--- a/beszel/site/src/components/install-dropdowns.tsx
+++ b/beszel/site/src/components/install-dropdowns.tsx
@@ -1,97 +0,0 @@
-import { memo } from "react"
-import { DropdownMenuContent, DropdownMenuItem } from "./ui/dropdown-menu"
-import { copyToClipboard, getHubURL } from "@/lib/utils"
-import { i18n } from "@lingui/core"
-
-const isBeta = BESZEL.HUB_VERSION.includes("beta")
-const imageTag = isBeta ? ":edge" : ""
-
-/**
- * Get the URL of the script to install the agent.
- * @param path - The path to the script (e.g. "/brew").
- * @returns The URL for the script.
- */
-const getScriptUrl = (path: string = "") => {
-	const url = new URL("https://get.beszel.dev")
-	url.pathname = path
-	if (isBeta) {
-		url.searchParams.set("beta", "1")
-	}
-	return url.toString()
-}
-
-export function copyDockerCompose(port = "45876", publicKey: string, token: string) {
-	copyToClipboard(`services:
-  beszel-agent:
-    image: henrygd/beszel-agent${imageTag}
-    container_name: beszel-agent
-    restart: unless-stopped
-    network_mode: host
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-      - ./beszel_agent_data:/var/lib/beszel-agent
-      # monitor other disks / partitions by mounting a folder in /extra-filesystems
-      # - /mnt/disk/.beszel:/extra-filesystems/sda1:ro
-    environment:
-      LISTEN: ${port}
-      KEY: '${publicKey}'
-      TOKEN: ${token}
-      HUB_URL: ${getHubURL()}`)
-}
-
-export function copyDockerRun(port = "45876", publicKey: string, token: string) {
-	copyToClipboard(
-		`docker run -d --name beszel-agent --network host --restart unless-stopped -v /var/run/docker.sock:/var/run/docker.sock:ro -v ./beszel_agent_data:/var/lib/beszel-agent -e KEY="${publicKey}" -e LISTEN=${port} -e TOKEN="${token}" -e HUB_URL="${getHubURL()}" henrygd/beszel-agent${imageTag}`
-	)
-}
-
-export function copyLinuxCommand(port = "45876", publicKey: string, token: string, brew = false) {
-	let cmd = `curl -sL ${getScriptUrl(
-		brew ? "/brew" : ""
-	)} -o /tmp/install-agent.sh && chmod +x /tmp/install-agent.sh && /tmp/install-agent.sh -p ${port} -k "${publicKey}" -t "${token}" -url "${getHubURL()}"`
-	// brew script does not support --china-mirrors
-	if (!brew && (i18n.locale + navigator.language).includes("zh-CN")) {
-		cmd += ` --china-mirrors`
-	}
-	copyToClipboard(cmd)
-}
-
-export function copyWindowsCommand(port = "45876", publicKey: string, token: string) {
-	copyToClipboard(
-		`& iwr -useb ${getScriptUrl()} -OutFile "$env:TEMP\\install-agent.ps1"; & Powershell -ExecutionPolicy Bypass -File "$env:TEMP\\install-agent.ps1" -Key "${publicKey}" -Port ${port} -Token "${token}" -Url "${getHubURL()}"`
-	)
-}
-
-export interface DropdownItem {
-	text: string
-	onClick?: () => void
-	url?: string
-	icons?: React.ComponentType<React.SVGProps<SVGSVGElement>>[]
-}
-
-export const InstallDropdown = memo(({ items }: { items: DropdownItem[] }) => {
-	return (
-		<DropdownMenuContent align="end">
-			{items.map((item, index) => {
-				const className = "cursor-pointer flex items-center gap-1.5"
-				return item.url ? (
-					<DropdownMenuItem key={index} asChild>
-						<a href={item.url} className={className} target="_blank" rel="noopener noreferrer">
-							{item.text}{" "}
-							{item.icons?.map((Icon, iconIndex) => (
-								<Icon key={iconIndex} className="size-4" />
-							))}
-						</a>
-					</DropdownMenuItem>
-				) : (
-					<DropdownMenuItem key={index} onClick={item.onClick} className={className}>
-						{item.text}{" "}
-						{item.icons?.map((Icon, iconIndex) => (
-							<Icon key={iconIndex} className="size-4" />
-						))}
-					</DropdownMenuItem>
-				)
-			})}
-		</DropdownMenuContent>
-	)
-})
--- a/beszel/site/src/components/router.tsx
+++ b/beszel/site/src/components/router.tsx
@@ -11,7 +11,7 @@ const routes = {
 * The base path of the application.
 * This is used to prepend the base path to all routes.
 */
-export const basePath = BESZEL?.BASE_PATH || ""
+export const basePath = globalThis.BESZEL.BASE_PATH || ""

 /**
 * Prepends the base path to the given path.
@@ -41,12 +41,5 @@ function onClick(e: React.MouseEvent<HTMLAnchorElement, MouseEvent>) {
 }

 export const Link = (props: React.AnchorHTMLAttributes<HTMLAnchorElement>) => {
-	let clickFn = onClick
-	if (props.onClick) {
-		clickFn = (e) => {
-			onClick(e)
-			props.onClick?.(e)
-		}
-	}
-	return <a {...props} onClick={clickFn}></a>
+	return <a onClick={onClick} {...props}></a>
 }
--- a/beszel/site/src/components/routes/settings/general.tsx
+++ b/beszel/site/src/components/routes/settings/general.tsx
@@ -11,7 +11,7 @@ import { useState } from "react"
 import languages from "@/lib/languages"
 import { dynamicActivate } from "@/lib/i18n"
 import { useLingui } from "@lingui/react/macro"
-import { Unit } from "@/lib/enums"
+// import { setLang } from "@/lib/i18n"

 export default function SettingsProfilePage({ userSettings }: { userSettings: UserSettings }) {
 	const [isLoading, setIsLoading] = useState(false)
@@ -101,87 +101,6 @@ export default function SettingsProfilePage({ userSettings }: { userSettings: Us
 					</p>
 				</div>
 				<Separator />
-				<div className="space-y-2">
-					<div className="mb-4">
-						<h3 className="mb-1 text-lg font-medium">
-							<Trans>Unit preferences</Trans>
-						</h3>
-						<p className="text-sm text-muted-foreground leading-relaxed">
-							<Trans>Change display units for metrics.</Trans>
-						</p>
-					</div>
-					<div className="grid sm:grid-cols-3 gap-4">
-						<div className="space-y-2">
-							<Label className="block" htmlFor="unitTemp">
-								<Trans>Temperature unit</Trans>
-							</Label>
-							<Select
-								name="unitTemp"
-								key={userSettings.unitTemp}
-								defaultValue={userSettings.unitTemp?.toString() || String(Unit.Celsius)}
-							>
-								<SelectTrigger id="unitTemp">
-									<SelectValue />
-								</SelectTrigger>
-								<SelectContent>
-									<SelectItem value={String(Unit.Celsius)}>
-										<Trans>Celsius (°C)</Trans>
-									</SelectItem>
-									<SelectItem value={String(Unit.Fahrenheit)}>
-										<Trans>Fahrenheit (°F)</Trans>
-									</SelectItem>
-								</SelectContent>
-							</Select>
-						</div>
-
-						<div className="space-y-2">
-							<Label className="block" htmlFor="unitNet">
-								<Trans>Network unit</Trans>
-							</Label>
-							<Select
-								name="unitNet"
-								key={userSettings.unitNet}
-								defaultValue={userSettings.unitNet?.toString() ?? String(Unit.Bytes)}
-							>
-								<SelectTrigger id="unitNet">
-									<SelectValue />
-								</SelectTrigger>
-								<SelectContent>
-									<SelectItem value={String(Unit.Bytes)}>
-										<Trans>Bytes (KB/s, MB/s, GB/s)</Trans>
-									</SelectItem>
-									<SelectItem value={String(Unit.Bits)}>
-										<Trans>Bits (Kbps, Mbps, Gbps)</Trans>
-									</SelectItem>
-								</SelectContent>
-							</Select>
-						</div>
-
-						<div className="space-y-2">
-							<Label className="block" htmlFor="unitDisk">
-								<Trans>Disk unit</Trans>
-							</Label>
-							<Select
-								name="unitDisk"
-								key={userSettings.unitDisk}
-								defaultValue={userSettings.unitDisk?.toString() ?? String(Unit.Bytes)}
-							>
-								<SelectTrigger id="unitDisk">
-									<SelectValue />
-								</SelectTrigger>
-								<SelectContent>
-									<SelectItem value={String(Unit.Bytes)}>
-										<Trans>Bytes (KB/s, MB/s, GB/s)</Trans>
-									</SelectItem>
-									<SelectItem value={String(Unit.Bits)}>
-										<Trans>Bits (Kbps, Mbps, Gbps)</Trans>
-									</SelectItem>
-								</SelectContent>
-							</Select>
-						</div>
-					</div>
-				</div>
-				<Separator />
 				<Button type="submit" className="flex items-center gap-1.5 disabled:opacity-100" disabled={isLoading}>
 					{isLoading ? <LoaderCircleIcon className="h-4 w-4 animate-spin" /> : <SaveIcon className="h-4 w-4" />}
 					<Trans>Save Settings</Trans>
--- a/beszel/site/src/components/routes/settings/layout.tsx
+++ b/beszel/site/src/components/routes/settings/layout.tsx
@@ -7,7 +7,7 @@ import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/com
 import { useStore } from "@nanostores/react"
 import { $router } from "@/components/router.tsx"
 import { getPagePath, redirectPage } from "@nanostores/router"
-import { BellIcon, FileSlidersIcon, FingerprintIcon, SettingsIcon } from "lucide-react"
+import { BellIcon, FileSlidersIcon, SettingsIcon } from "lucide-react"
 import { $userSettings, pb } from "@/lib/stores.ts"
 import { toast } from "@/components/ui/use-toast.ts"
 import { UserSettings } from "@/types.js"
@@ -15,7 +15,6 @@ import General from "./general.tsx"
 import Notifications from "./notifications.tsx"
 import ConfigYaml from "./config-yaml.tsx"
 import { useLingui } from "@lingui/react/macro"
-import Fingerprints from "./tokens-fingerprints.tsx"

 export async function saveSettings(newSettings: Partial<UserSettings>) {
 	try {
@@ -59,12 +58,6 @@ export default function SettingsLayout() {
 			href: getPagePath($router, "settings", { name: "notifications" }),
 			icon: BellIcon,
 		},
-		{
-			title: t`Tokens & Fingerprints`,
-			href: getPagePath($router, "settings", { name: "tokens" }),
-			icon: FingerprintIcon,
-			noReadOnly: true,
-		},
 		{
 			title: t`YAML Config`,
 			href: getPagePath($router, "settings", { name: "config" }),
@@ -84,7 +77,7 @@ export default function SettingsLayout() {
 	}, [])

 	return (
-		<Card className="pt-5 px-4 pb-8 min-h-96 sm:pt-6 sm:px-7">
+		<Card className="pt-5 px-4 pb-8 sm:pt-6 sm:px-7">
 			<CardHeader className="p-0">
 				<CardTitle className="mb-1">
 					<Trans>Settings</Trans>
@@ -95,11 +88,11 @@ export default function SettingsLayout() {
 			</CardHeader>
 			<CardContent className="p-0">
 				<Separator className="hidden md:block my-5" />
-				<div className="flex flex-col gap-3.5 md:flex-row md:gap-5 lg:gap-12">
-					<aside className="md:max-w-52 min-w-40">
+				<div className="flex flex-col gap-3.5 md:flex-row md:gap-5 lg:gap-10">
+					<aside className="md:w-48 w-full">
 						<SidebarNav items={sidebarNavItems} />
 					</aside>
-					<div className="flex-1 min-w-0">
+					<div className="flex-1">
 						{/* @ts-ignore */}
 						<SettingsContent name={page?.params?.name ?? "general"} />
 					</div>
@@ -119,7 +112,5 @@ function SettingsContent({ name }: { name: string }) {
 			return <Notifications userSettings={userSettings} />
 		case "config":
 			return <ConfigYaml />
-		case "tokens":
-			return <Fingerprints />
 	}
 }
--- a/beszel/site/src/components/routes/settings/sidebar-nav.tsx
+++ b/beszel/site/src/components/routes/settings/sidebar-nav.tsx
@@ -1,5 +1,5 @@
 import React from "react"
-import { cn, isAdmin, isReadOnlyUser } from "@/lib/utils"
+import { cn, isAdmin } from "@/lib/utils"
 import { buttonVariants } from "../../ui/button"
 import { $router, Link, navigate } from "../../router"
 import { useStore } from "@nanostores/react"
@@ -12,7 +12,6 @@ interface SidebarNavProps extends React.HTMLAttributes<HTMLElement> {
 		title: string
 		icon?: React.FC<React.SVGProps<SVGSVGElement>>
 		admin?: boolean
-		noReadOnly?: boolean
 	}[]
 }

@@ -32,9 +31,9 @@ export function SidebarNav({ className, items, ...props }: SidebarNavProps) {
 							if (item.admin && !isAdmin()) return null
 							return (
 								<SelectItem key={item.href} value={item.href}>
-									<span className="flex items-center gap-2 truncate">
+									<span className="flex items-center gap-2">
 										{item.icon && <item.icon className="h-4 w-4" />}
-										<span className="truncate">{item.title}</span>
+										{item.title}
 									</span>
 								</SelectItem>
 							)
@@ -47,7 +46,7 @@ export function SidebarNav({ className, items, ...props }: SidebarNavProps) {
 			{/* Desktop View */}
 			<nav className={cn("hidden md:grid gap-1", className)} {...props}>
 				{items.map((item) => {
-					if ((item.admin && !isAdmin()) || (item.noReadOnly && isReadOnlyUser())) {
+					if (item.admin && !isAdmin()) {
 						return null
 					}
 					return (
@@ -56,12 +55,13 @@ export function SidebarNav({ className, items, ...props }: SidebarNavProps) {
 							href={item.href}
 							className={cn(
 								buttonVariants({ variant: "ghost" }),
-								"flex items-center gap-3 justify-start truncate",
-								page?.path === item.href ? "bg-muted hover:bg-muted" : "hover:bg-muted/50"
+								"flex items-center gap-3",
+								page?.path === item.href ? "bg-muted hover:bg-muted" : "hover:bg-muted/50",
+								"justify-start"
 							)}
 						>
-							{item.icon && <item.icon className="h-4 w-4 shrink-0" />}
-							<span className="truncate">{item.title}</span>
+							{item.icon && <item.icon className="h-4 w-4" />}
+							{item.title}
 						</Link>
 					)
 				})}
--- a/beszel/site/src/components/routes/settings/tokens-fingerprints.tsx
+++ b/beszel/site/src/components/routes/settings/tokens-fingerprints.tsx
@@ -1,360 +0,0 @@
-import { Trans, useLingui } from "@lingui/react/macro"
-import { t } from "@lingui/core/macro"
-import { $publicKey, pb } from "@/lib/stores"
-import { memo, useEffect, useMemo, useState } from "react"
-import { Table, TableCell, TableHead, TableBody, TableRow, TableHeader } from "@/components/ui/table"
-import { FingerprintRecord } from "@/types"
-import {
-	CopyIcon,
-	FingerprintIcon,
-	KeyIcon,
-	MoreHorizontalIcon,
-	RotateCwIcon,
-	ServerIcon,
-	Trash2Icon,
-} from "lucide-react"
-import { toast } from "@/components/ui/use-toast"
-import { cn, copyToClipboard, generateToken, getHubURL, isReadOnlyUser, tokenMap } from "@/lib/utils"
-import {
-	DropdownMenu,
-	DropdownMenuContent,
-	DropdownMenuItem,
-	DropdownMenuSeparator,
-	DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu"
-import { Button } from "@/components/ui/button"
-import { Separator } from "@/components/ui/separator"
-import { Switch } from "@/components/ui/switch"
-import {
-	copyDockerCompose,
-	copyDockerRun,
-	copyLinuxCommand,
-	copyWindowsCommand,
-	DropdownItem,
-	InstallDropdown,
-} from "@/components/install-dropdowns"
-import { AppleIcon, DockerIcon, TuxIcon, WindowsIcon } from "@/components/ui/icons"
-import { redirectPage } from "@nanostores/router"
-import { $router } from "@/components/router"
-
-const pbFingerprintOptions = {
-	expand: "system",
-	fields: "id,fingerprint,token,system,expand.system.name",
-}
-
-const SettingsFingerprintsPage = memo(() => {
-	if (isReadOnlyUser()) {
-		redirectPage($router, "settings", { name: "general" })
-	}
-	const [fingerprints, setFingerprints] = useState<FingerprintRecord[]>([])
-
-	// Get fingerprint records on mount
-	useEffect(() => {
-		pb.collection("fingerprints")
-			.getFullList(pbFingerprintOptions)
-			// @ts-ignore
-			.then(setFingerprints)
-	}, [])
-
-	// Subscribe to fingerprint updates
-	useEffect(() => {
-		let unsubscribe: (() => void) | undefined
-		;(async () => {
-			// subscribe to fingerprint updates
-			unsubscribe = await pb.collection("fingerprints").subscribe(
-				"*",
-				(res) => {
-					setFingerprints((currentFingerprints) => {
-						if (res.action === "create") {
-							return [...currentFingerprints, res.record as FingerprintRecord]
-						}
-						if (res.action === "update") {
-							return currentFingerprints.map((fingerprint) => {
-								if (fingerprint.id === res.record.id) {
-									return { ...fingerprint, ...res.record } as FingerprintRecord
-								}
-								return fingerprint
-							})
-						}
-						if (res.action === "delete") {
-							return currentFingerprints.filter((fingerprint) => fingerprint.id !== res.record.id)
-						}
-						return currentFingerprints
-					})
-				},
-				pbFingerprintOptions
-			)
-		})()
-		// unsubscribe on unmount
-		return () => unsubscribe?.()
-	}, [])
-
-	// Update token map whenever fingerprints change
-	useEffect(() => {
-		for (const fingerprint of fingerprints) {
-			tokenMap.set(fingerprint.system, fingerprint.token)
-		}
-	}, [fingerprints])
-
-	return (
-		<>
-			<SectionIntro />
-			<Separator className="my-4" />
-			<SectionUniversalToken />
-			<Separator className="my-4" />
-			<SectionTable fingerprints={fingerprints} />
-		</>
-	)
-})
-
-const SectionIntro = memo(() => {
-	return (
-		<div>
-			<h3 className="text-xl font-medium mb-2">
-				<Trans>Tokens & Fingerprints</Trans>
-			</h3>
-			<p className="text-sm text-muted-foreground leading-relaxed">
-				<Trans>Tokens and fingerprints are used to authenticate WebSocket connections to the hub.</Trans>
-			</p>
-			<p className="text-sm text-muted-foreground leading-relaxed mt-1.5">
-				<Trans>
-					Tokens allow agents to connect and register. Fingerprints are stable identifiers unique to each system, set on
-					first connection.
-				</Trans>
-			</p>
-		</div>
-	)
-})
-
-const SectionUniversalToken = memo(() => {
-	const [token, setToken] = useState("")
-	const [isLoading, setIsLoading] = useState(true)
-	const [checked, setChecked] = useState(false)
-
-	async function updateToken(enable: number = -1) {
-		// enable: 0 for disable, 1 for enable, -1 (unset) for get current state
-		const data = await pb.send(`/api/beszel/universal-token`, {
-			query: {
-				token,
-				enable,
-			},
-		})
-		setToken(data.token)
-		setChecked(data.active)
-		setIsLoading(false)
-	}
-
-	useEffect(() => {
-		updateToken()
-	}, [])
-
-	return (
-		<div>
-			<h3 className="text-lg font-medium mb-2">
-				<Trans>Universal token</Trans>
-			</h3>
-			<p className="text-sm text-muted-foreground leading-relaxed">
-				<Trans>
-					When enabled, this token allows agents to self-register without prior system creation. Expires after one hour
-					or on hub restart.
-				</Trans>
-			</p>
-			<div className="min-h-16 overflow-auto max-w-full inline-flex items-center gap-5 mt-3 border py-2 pl-5 pr-4 rounded-md">
-				{!isLoading && (
-					<>
-						<Switch
-							defaultChecked={checked}
-							onCheckedChange={(checked) => {
-								updateToken(checked ? 1 : 0)
-							}}
-						/>
-						<span
-							className={cn(
-								"text-sm text-primary opacity-60 transition-opacity",
-								checked ? "opacity-100" : "select-none"
-							)}
-						>
-							{token}
-						</span>
-						<ActionsButtonUniversalToken token={token} checked={checked} />
-					</>
-				)}
-			</div>
-		</div>
-	)
-})
-
-const ActionsButtonUniversalToken = memo(({ token, checked }: { token: string; checked: boolean }) => {
-	const { t } = useLingui()
-	const publicKey = $publicKey.get()
-	const port = "45876"
-
-	const dropdownItems: DropdownItem[] = [
-		{
-			text: t({ message: "Copy docker compose", context: "Button to copy docker compose file content" }),
-			onClick: () => copyDockerCompose(port, publicKey, token),
-			icons: [DockerIcon],
-		},
-		{
-			text: t({ message: "Copy docker run", context: "Button to copy docker run command" }),
-			onClick: () => copyDockerRun(port, publicKey, token),
-			icons: [DockerIcon],
-		},
-		{
-			text: t`Copy Linux command`,
-			onClick: () => copyLinuxCommand(port, publicKey, token),
-			icons: [TuxIcon],
-		},
-		{
-			text: t({ message: "Homebrew command", context: "Button to copy install command" }),
-			onClick: () => copyLinuxCommand(port, publicKey, token, true),
-			icons: [TuxIcon, AppleIcon],
-		},
-		{
-			text: t({ message: "Windows command", context: "Button to copy install command" }),
-			onClick: () => copyWindowsCommand(port, publicKey, token),
-			icons: [WindowsIcon],
-		},
-	]
-	return (
-		<div className="flex items-center gap-2">
-			<DropdownMenu>
-				<DropdownMenuTrigger asChild>
-					<Button
-						variant="ghost"
-						size="icon"
-						disabled={!checked}
-						className={cn("transition-opacity", !checked && "opacity-50")}
-					>
-						<span className="sr-only">
-							<Trans>Open menu</Trans>
-						</span>
-						<MoreHorizontalIcon className="w-5" />
-					</Button>
-				</DropdownMenuTrigger>
-				<InstallDropdown items={dropdownItems} />
-			</DropdownMenu>
-		</div>
-	)
-})
-
-const SectionTable = memo(({ fingerprints = [] }: { fingerprints: FingerprintRecord[] }) => {
-	const { t } = useLingui()
-	const isReadOnly = isReadOnlyUser()
-
-	const headerCols = useMemo(
-		() => [
-			{
-				label: t`System`,
-				Icon: ServerIcon,
-				w: "11em",
-			},
-			{
-				label: t`Token`,
-				Icon: KeyIcon,
-				w: "20em",
-			},
-			{
-				label: t`Fingerprint`,
-				Icon: FingerprintIcon,
-				w: "20em",
-			},
-		],
-		[t]
-	)
-	return (
-		<div className="rounded-md border overflow-hidden w-full mt-4">
-			<Table>
-				<TableHeader>
-					<TableRow>
-						{headerCols.map((col) => (
-							<TableHead key={col.label} style={{ minWidth: col.w }}>
-								<span className="flex items-center gap-2">
-									<col.Icon className="size-4" />
-									{col.label}
-								</span>
-							</TableHead>
-						))}
-						{!isReadOnly && (
-							<TableHead className="w-0">
-								<span className="sr-only">
-									<Trans>Actions</Trans>
-								</span>
-							</TableHead>
-						)}
-					</TableRow>
-				</TableHeader>
-				<TableBody className="whitespace-pre">
-					{fingerprints.map((fingerprint, i) => (
-						<TableRow key={i}>
-							<TableCell className="font-medium ps-5 py-2.5">{fingerprint.expand.system.name}</TableCell>
-							<TableCell className="font-mono text-[0.95em] py-2.5">{fingerprint.token}</TableCell>
-							<TableCell className="font-mono text-[0.95em] py-2.5">{fingerprint.fingerprint}</TableCell>
-							{!isReadOnly && (
-								<TableCell className="py-2.5 px-4 xl:px-2">
-									<ActionsButtonTable fingerprint={fingerprint} />
-								</TableCell>
-							)}
-						</TableRow>
-					))}
-				</TableBody>
-			</Table>
-		</div>
-	)
-})
-
-async function updateFingerprint(fingerprint: FingerprintRecord, rotateToken = false) {
-	try {
-		await pb.collection("fingerprints").update(fingerprint.id, {
-			fingerprint: "",
-			token: rotateToken ? generateToken() : fingerprint.token,
-		})
-	} catch (error: any) {
-		toast({
-			title: t`Error`,
-			description: error.message,
-		})
-	}
-}
-
-const ActionsButtonTable = memo(({ fingerprint }: { fingerprint: FingerprintRecord }) => {
-	const envVar = `HUB_URL=${getHubURL()}\nTOKEN=${fingerprint.token}`
-	const copyEnv = () => copyToClipboard(envVar)
-	const copyYaml = () => copyToClipboard(envVar.replaceAll("=", ": "))
-
-	return (
-		<DropdownMenu>
-			<DropdownMenuTrigger asChild>
-				<Button variant="ghost" size={"icon"} data-nolink>
-					<span className="sr-only">
-						<Trans>Open menu</Trans>
-					</span>
-					<MoreHorizontalIcon className="w-5" />
-				</Button>
-			</DropdownMenuTrigger>
-			<DropdownMenuContent align="end">
-				<DropdownMenuItem onClick={copyYaml}>
-					<CopyIcon className="me-2.5 size-4" />
-					<Trans>Copy YAML</Trans>
-				</DropdownMenuItem>
-				<DropdownMenuItem onClick={copyEnv}>
-					<CopyIcon className="me-2.5 size-4" />
-					<Trans context="Environment variables">Copy env</Trans>
-				</DropdownMenuItem>
-				<DropdownMenuSeparator />
-				<DropdownMenuItem onSelect={() => updateFingerprint(fingerprint, true)}>
-					<RotateCwIcon className="me-2.5 size-4" />
-					<Trans>Rotate token</Trans>
-				</DropdownMenuItem>
-				{fingerprint.fingerprint && (
-					<DropdownMenuItem onSelect={() => updateFingerprint(fingerprint)}>
-						<Trash2Icon className="me-2.5 size-4" />
-						<Trans>Delete fingerprint</Trans>
-					</DropdownMenuItem>
-				)}
-			</DropdownMenuContent>
-		</DropdownMenu>
-	)
-})
-
-export default SettingsFingerprintsPage
--- a/beszel/site/src/components/routes/system.tsx
+++ b/beszel/site/src/components/routes/system.tsx
@@ -11,7 +11,7 @@ import {
 	$temperatureFilter,
 } from "@/lib/stores"
 import { ChartData, ChartTimes, ContainerStatsRecord, GPUData, SystemRecord, SystemStatsRecord } from "@/types"
-import { ChartType, Unit, Os } from "@/lib/enums"
+import { ChartType, Os } from "@/lib/enums"
 import React, { lazy, memo, useCallback, useEffect, useMemo, useRef, useState } from "react"
 import { Card, CardHeader, CardTitle, CardDescription } from "../ui/card"
 import { useStore } from "@nanostores/react"
@@ -21,10 +21,9 @@ import ChartTimeSelect from "../charts/chart-time-select"
 import {
 	chartTimeData,
 	cn,
-	decimalString,
-	formatBytes,
 	getHostDisplayValue,
 	getPbTimestamp,
+	getSizeAndUnit,
 	listen,
 	toFixedFloat,
 	useLocalStorage,
@@ -36,10 +35,12 @@ import { Input } from "../ui/input"
 import { ChartAverage, ChartMax, Rows, TuxIcon, WindowsIcon, AppleIcon, FreeBsdIcon } from "../ui/icons"
 import { useIntersectionObserver } from "@/lib/use-intersection-observer"
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "../ui/select"
+import { Tabs, TabsContent, TabsList, TabsTrigger } from "../ui/tabs"
 import { timeTicks } from "d3-time"
 import { useLingui } from "@lingui/react/macro"
 import { $router, navigate } from "../router"
 import { getPagePath } from "@nanostores/router"
+import DisksTab from "../tabs/disks-tab"

 const AreaChartDefault = lazy(() => import("../charts/area-chart"))
 const ContainerChart = lazy(() => import("../charts/container-chart"))
@@ -48,7 +49,6 @@ const DiskChart = lazy(() => import("../charts/disk-chart"))
 const SwapChart = lazy(() => import("../charts/swap-chart"))
 const TemperatureChart = lazy(() => import("../charts/temperature-chart"))
 const GpuPowerChart = lazy(() => import("../charts/gpu-power-chart"))
-const LoadAverageChart = lazy(() => import("../charts/load-average-chart"))

 const cache = new Map<string, any>()

@@ -133,7 +133,6 @@ export default function SystemDetail({ name }: { name: string }) {
 	const [bottomSpacing, setBottomSpacing] = useState(0)
 	const [chartLoading, setChartLoading] = useState(true)
 	const isLongerChart = chartTime !== "1h"
-	const userSettings = $userSettings.get()

 	useEffect(() => {
 		document.title = `${name} / Beszel`
@@ -466,6 +465,14 @@ export default function SystemDetail({ name }: { name: string }) {
 					</div>
 				</Card>

+				{/* tabs for different views */}
+				<Tabs defaultValue="systems" className="w-full">
+					<TabsList>
+						<TabsTrigger value="systems">Systems</TabsTrigger>
+						<TabsTrigger value="disks">Disks</TabsTrigger>
+					</TabsList>
+					
+					<TabsContent value="systems" className="mt-4">
 				{/* main charts */}
 				<div className="grid xl:grid-cols-2 gap-4">
 					<ChartCard
@@ -475,27 +482,9 @@ export default function SystemDetail({ name }: { name: string }) {
 						description={t`Average system-wide CPU utilization`}
 						cornerEl={maxValSelect}
 					>
-						<AreaChartDefault
-							chartData={chartData}
-							chartName="CPU Usage"
-							maxToggled={maxValues}
-							tickFormatter={(val) => toFixedFloat(val, 2) + "%"}
-							contentFormatter={({ value }) => decimalString(value) + "%"}
-						/>
+						<AreaChartDefault chartData={chartData} chartName="CPU Usage" maxToggled={maxValues} unit="%" />
 					</ChartCard>

-					{/* Load Average chart */}
-					{(systemStats.at(-1)?.stats.l1 !== undefined || systemStats.at(-1)?.stats.l5 !== undefined || systemStats.at(-1)?.stats.l15 !== undefined) && (
-						<ChartCard
-							empty={dataEmpty}
-							grid={grid}
-							title={t`Load Average`}
-							description={t`System load averages over time`}
-						>
-							<LoadAverageChart chartData={chartData} />
-						</ChartCard>
-					)}
-
 					{containerFilterBar && (
 						<ChartCard
 							empty={dataEmpty}
@@ -540,19 +529,7 @@ export default function SystemDetail({ name }: { name: string }) {
 						description={t`Throughput of root filesystem`}
 						cornerEl={maxValSelect}
 					>
-						<AreaChartDefault
-							chartData={chartData}
-							chartName="dio"
-							maxToggled={maxValues}
-							tickFormatter={(val) => {
-								const { value, unit } = formatBytes(val, true, userSettings.unitDisk, true)
-								return toFixedFloat(value, value >= 10 ? 0 : 1) + " " + unit
-							}}
-							contentFormatter={({ value }) => {
-								const { value: convertedValue, unit } = formatBytes(value, true, userSettings.unitDisk, true)
-								return decimalString(convertedValue, convertedValue >= 100 ? 1 : 2) + " " + unit
-							}}
-						/>
+						<AreaChartDefault chartData={chartData} chartName="dio" maxToggled={maxValues} />
 					</ChartCard>

 					<ChartCard
@@ -562,19 +539,7 @@ export default function SystemDetail({ name }: { name: string }) {
 						cornerEl={maxValSelect}
 						description={t`Network traffic of public interfaces`}
 					>
-						<AreaChartDefault
-							chartData={chartData}
-							chartName="bw"
-							maxToggled={maxValues}
-							tickFormatter={(val) => {
-								let { value, unit } = formatBytes(val, true, userSettings.unitNet, true)
-								return toFixedFloat(value, value >= 10 ? 0 : 1) + " " + unit
-							}}
-							contentFormatter={({ value }) => {
-								const { value: convertedValue, unit } = formatBytes(value, true, userSettings.unitNet, true)
-								return decimalString(convertedValue, convertedValue >= 100 ? 1 : 2) + " " + unit
-							}}
-						/>
+						<AreaChartDefault chartData={chartData} chartName="bw" maxToggled={maxValues} />
 					</ChartCard>

 					{containerFilterBar && containerData.length > 0 && (
@@ -639,6 +604,10 @@ export default function SystemDetail({ name }: { name: string }) {
 					<div className="grid xl:grid-cols-2 gap-4">
 						{Object.keys(systemStats.at(-1)?.stats.g ?? {}).map((id) => {
 							const gpu = systemStats.at(-1)?.stats.g?.[id] as GPUData
+							const sizeFormatter = (value: number, decimals?: number) => {
+								const { v, u } = getSizeAndUnit(value, false)
+								return toFixedFloat(v, decimals || 1) + u
+							}
 							return (
 								<div key={id} className="contents">
 									<ChartCard
@@ -647,12 +616,7 @@ export default function SystemDetail({ name }: { name: string }) {
 										title={`${gpu.n} ${t`Usage`}`}
 										description={t`Average utilization of ${gpu.n}`}
 									>
-										<AreaChartDefault
-											chartData={chartData}
-											chartName={`g.${id}.u`}
-											tickFormatter={(val) => toFixedFloat(val, 2) + "%"}
-											contentFormatter={({ value }) => decimalString(value) + "%"}
-										/>
+										<AreaChartDefault chartData={chartData} chartName={`g.${id}.u`} unit="%" />
 									</ChartCard>
 									<ChartCard
 										empty={dataEmpty}
@@ -664,14 +628,8 @@ export default function SystemDetail({ name }: { name: string }) {
 											chartData={chartData}
 											chartName={`g.${id}.mu`}
 											max={gpu.mt}
-											tickFormatter={(val) => {
-												const { value, unit } = formatBytes(val, false, Unit.Bytes, true)
-												return toFixedFloat(value, value >= 10 ? 0 : 1) + " " + unit
-											}}
-											contentFormatter={({ value }) => {
-												const { value: convertedValue, unit } = formatBytes(value, false, Unit.Bytes, true)
-												return decimalString(convertedValue) + " " + unit
-											}}
+											tickFormatter={sizeFormatter}
+											contentFormatter={(value) => sizeFormatter(value, 2)}
 										/>
 									</ChartCard>
 								</div>
@@ -705,25 +663,19 @@ export default function SystemDetail({ name }: { name: string }) {
 										description={t`Throughput of ${extraFsName}`}
 										cornerEl={maxValSelect}
 									>
-										<AreaChartDefault
-											chartData={chartData}
-											chartName={`efs.${extraFsName}`}
-											maxToggled={maxValues}
-											tickFormatter={(val) => {
-												const { value, unit } = formatBytes(val, true, userSettings.unitDisk, true)
-												return toFixedFloat(value, value >= 10 ? 0 : 1) + " " + unit
-											}}
-											contentFormatter={({ value }) => {
-												const { value: convertedValue, unit } = formatBytes(value, true, userSettings.unitDisk, true)
-												return decimalString(convertedValue, convertedValue >= 100 ? 1 : 2) + " " + unit
-											}}
-										/>
+										<AreaChartDefault chartData={chartData} chartName={`efs.${extraFsName}`} maxToggled={maxValues} />
 									</ChartCard>
 								</div>
 							)
 						})}
 					</div>
 				)}
+					</TabsContent>
+					
+					<TabsContent value="disks" className="mt-4">
+						<DisksTab smartData={systemStats.at(-1)?.stats.sm} />
+					</TabsContent>
+				</Tabs>
 			</div>

 			{/* add space for tooltip if more than 12 containers */}
--- a/beszel/site/src/components/systems-table/systems-table.tsx
+++ b/beszel/site/src/components/systems-table/systems-table.tsx
@@ -63,20 +63,12 @@ import {
 	PenBoxIcon,
 } from "lucide-react"
 import { memo, useEffect, useMemo, useRef, useState } from "react"
-import { $systems, $userSettings, pb } from "@/lib/stores"
+import { $systems, pb } from "@/lib/stores"
 import { useStore } from "@nanostores/react"
-import {
-	cn,
-	copyToClipboard,
-	isReadOnlyUser,
-	useLocalStorage,
-	formatTemperature,
-	decimalString,
-	formatBytes,
-} from "@/lib/utils"
+import { cn, copyToClipboard, decimalString, isReadOnlyUser, useLocalStorage } from "@/lib/utils"
 import AlertsButton from "../alerts/alert-button"
 import { $router, Link, navigate } from "../router"
-import { EthernetIcon, GpuIcon, HourglassIcon, ThermometerIcon } from "../ui/icons"
+import { EthernetIcon, GpuIcon, ThermometerIcon } from "../ui/icons"
 import { useLingui, Trans } from "@lingui/react/macro"
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "../ui/card"
 import { Input } from "../ui/input"
@@ -84,7 +76,6 @@ import { ClassValue } from "clsx"
 import { getPagePath } from "@nanostores/router"
 import { SystemDialog } from "../add-system"
 import { Dialog } from "../ui/dialog"
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "../ui/tooltip"

 type ViewMode = "table" | "grid"

@@ -92,8 +83,8 @@ function CellFormatter(info: CellContext<SystemRecord, unknown>) {
 	const val = (info.getValue() as number) || 0
 	return (
 		<div className="flex gap-2 items-center tabular-nums tracking-tight">
-			<span className="min-w-8">{decimalString(val, 1)}%</span>
-			<span className="grow min-w-8 block bg-muted h-[1em] relative rounded-sm overflow-hidden">
+			<span className="min-w-[3.3em]">{decimalString(val, 1)}%</span>
+			<span className="grow min-w-10 block bg-muted h-[1em] relative rounded-sm overflow-hidden">
 				<span
 					className={cn(
 						"absolute inset-0 w-full h-full origin-left",
@@ -153,6 +144,7 @@ export default function SystemsTable() {
 		}
 		return [
 			{
+				// size: 200,
 				size: 200,
 				minSize: 0,
 				accessorKey: "name",
@@ -171,7 +163,6 @@ export default function SystemsTable() {
 					return false
 				},
 				enableHiding: false,
-				invertSorting: false,
 				Icon: ServerIcon,
 				cell: (info) => (
 					<span className="flex gap-0.5 items-center text-base md:pe-5">
@@ -190,26 +181,28 @@ export default function SystemsTable() {
 				header: sortableHeader,
 			},
 			{
-				accessorFn: (originalRow) => originalRow.info.cpu,
+				accessorKey: "info.cpu",
 				id: "cpu",
 				name: () => t`CPU`,
+				invertSorting: true,
 				cell: CellFormatter,
 				Icon: CpuIcon,
 				header: sortableHeader,
 			},
 			{
-				// accessorKey: "info.mp",
-				accessorFn: (originalRow) => originalRow.info.mp,
+				accessorKey: "info.mp",
 				id: "memory",
 				name: () => t`Memory`,
+				invertSorting: true,
 				cell: CellFormatter,
 				Icon: MemoryStickIcon,
 				header: sortableHeader,
 			},
 			{
-				accessorFn: (originalRow) => originalRow.info.dp,
+				accessorKey: "info.dp",
 				id: "disk",
 				name: () => t`Disk`,
+				invertSorting: true,
 				cell: CellFormatter,
 				Icon: HardDriveIcon,
 				header: sortableHeader,
@@ -218,6 +211,8 @@ export default function SystemsTable() {
 				accessorFn: (originalRow) => originalRow.info.g,
 				id: "gpu",
 				name: () => "GPU",
+				invertSorting: true,
+				sortUndefined: -1,
 				cell: CellFormatter,
 				Icon: GpuIcon,
 				header: sortableHeader,
@@ -226,81 +221,29 @@ export default function SystemsTable() {
 				accessorFn: (originalRow) => originalRow.info.b || 0,
 				id: "net",
 				name: () => t`Net`,
-				size: 0,
+				invertSorting: true,
+				size: 50,
 				Icon: EthernetIcon,
 				header: sortableHeader,
 				cell(info) {
-					const userSettings = useStore($userSettings)
-					const { value, unit } = formatBytes(info.getValue() as number, true, userSettings.unitNet, true)
+					const val = info.getValue() as number
 					return (
-						<span className="tabular-nums whitespace-nowrap">
-							{decimalString(value, value >= 100 ? 1 : 2)} {unit}
+						<span
+							className={cn("tabular-nums whitespace-nowrap", {
+								"ps-1": viewMode === "table",
+							})}
+						>
+							{decimalString(val, val >= 100 ? 1 : 2)} MB/s
 						</span>
 					)
 				},
 			},
-			{
-				id: "loadAverage",
-				name: () => t`Load Average`,
-				size: 0,
-				hideSort: true,
-				Icon: HourglassIcon,
-				header: sortableHeader,
-				cell(info: CellContext<SystemRecord, unknown>) {
-					const system = info.row.original;
-					const l1 = system.info?.l1;
-					const l5 = system.info?.l5;
-					const l15 = system.info?.l15;
-					const cores = system.info?.c || 1;
-
-					// If no load average data, return null
-					if (!l1 && !l5 && !l15) return null;
-
-					const loadAverages = [
-						{ name: "1m", value: l1 },
-						{ name: "5m", value: l5 },
-						{ name: "15m", value: l15 }
-					].filter(la => la.value !== undefined);
-
-					if (!loadAverages.length) return null;
-
-					function getDotColor(value: number) {
-						const normalized = value / cores;
-						if (normalized < 0.7) return "bg-green-500";
-						if (normalized < 1.0) return "bg-orange-500";
-						return "bg-red-600";
-					}
-
-					return (
-						<div className="flex items-center gap-2 w-full">
-							{loadAverages.map((la, idx) => (
-								<TooltipProvider key={la.name}>
-									<Tooltip>
-										<TooltipTrigger asChild>
-											<span className="flex items-center cursor-pointer">
-												<span className={cn("inline-block w-2 h-2 rounded-full mr-1", getDotColor(la.value || 0))} />
-												<span className="tabular-nums">
-													{decimalString(la.value || 0, 2)}
-												</span>
-												{idx < loadAverages.length - 1 && <span className="mx-1 text-muted-foreground">/</span>}
-											</span>
-										</TooltipTrigger>
-										<TooltipContent side="top">
-											<div className="text-center">
-												<div className="font-medium">{t`${la.name}`}</div>
-											</div>
-										</TooltipContent>
-									</Tooltip>
-								</TooltipProvider>
-							))}
-						</div>
-					);
-				},
-			},
 			{
 				accessorFn: (originalRow) => originalRow.info.dt,
 				id: "temp",
 				name: () => t({ message: "Temp", comment: "Temperature label in systems table" }),
+				invertSorting: true,
+				sortUndefined: -1,
 				size: 50,
 				hideSort: true,
 				Icon: ThermometerIcon,
@@ -310,20 +253,22 @@ export default function SystemsTable() {
 					if (!val) {
 						return null
 					}
-					const userSettings = useStore($userSettings)
-					const { value, unit } = formatTemperature(val, userSettings.unitTemp)
 					return (
-						<span className={cn("tabular-nums whitespace-nowrap", viewMode === "table" && "ps-0.5")}>
-							{decimalString(value, value >= 100 ? 1 : 2)} {unit}
+						<span
+							className={cn("tabular-nums whitespace-nowrap", {
+								"ps-1.5": viewMode === "table",
+							})}
+						>
+							{decimalString(val)} °C
 						</span>
 					)
 				},
 			},
 			{
-				accessorFn: (originalRow) => originalRow.info.v,
+				accessorKey: "info.v",
 				id: "agent",
 				name: () => t`Agent`,
-				// invertSorting: true,
+				invertSorting: true,
 				size: 50,
 				Icon: WifiIcon,
 				hideSort: true,
@@ -335,7 +280,11 @@ export default function SystemsTable() {
 					}
 					const system = info.row.original
 					return (
-						<span className={cn("flex gap-2 items-center md:pe-5 tabular-nums", viewMode === "table" && "ps-0.5")}>
+						<span
+							className={cn("flex gap-2 items-center md:pe-5 tabular-nums", {
+								"ps-1": viewMode === "table",
+							})}
+						>
 							<IndicatorDot
 								system={system}
 								className={
@@ -344,7 +293,7 @@ export default function SystemsTable() {
 									"bg-yellow-500"
 								}
 							/>
-							<span className="truncate max-w-14">{info.getValue() as string}</span>
+							<span>{info.getValue() as string}</span>
 						</span>
 					)
 				},
@@ -355,7 +304,7 @@ export default function SystemsTable() {
 				name: () => t({ message: "Actions", comment: "Table column" }),
 				size: 50,
 				cell: ({ row }) => (
-					<div className="flex justify-end items-center gap-1 -ms-3">
+					<div className="flex justify-end items-center gap-1">
 						<AlertsButton system={row.original} />
 						<ActionsButton system={row.original} />
 					</div>
@@ -379,9 +328,6 @@ export default function SystemsTable() {
 			columnVisibility,
 		},
 		defaultColumn: {
-			// sortDescFirst: true,
-			invertSorting: true,
-			sortUndefined: "last",
 			minSize: 0,
 			size: 900,
 			maxSize: 900,
@@ -565,7 +511,7 @@ function SystemsTableHead({ table, colLength }: { table: TableType<SystemRecord>
 					<TableRow key={headerGroup.id}>
 						{headerGroup.headers.map((header) => {
 							return (
-								<TableHead className="px-1" key={header.id}>
+								<TableHead className="px-2" key={header.id}>
 									{flexRender(header.column.columnDef.header, header.getContext())}
 								</TableHead>
 							)
--- a/beszel/site/src/components/tabs/disks-tab.tsx
+++ b/beszel/site/src/components/tabs/disks-tab.tsx
@@ -0,0 +1,631 @@
+"use client"
+
+import * as React from "react"
+import {
+	ColumnDef,
+	ColumnFiltersState,
+	flexRender,
+	getCoreRowModel,
+	getFilteredRowModel,
+	getPaginationRowModel,
+	getSortedRowModel,
+	SortingState,
+	useReactTable,
+	VisibilityState,
+} from "@tanstack/react-table"
+import { Activity, Box, Binary, Container, ChevronDown, Clock, HardDrive, Thermometer, Tags, MoreHorizontal } from "lucide-react"
+
+import { Button } from "../ui/button"
+import { Card, CardHeader, CardTitle, CardDescription } from "../ui/card"
+import {
+	Dialog,
+	DialogContent,
+	DialogDescription,
+	DialogHeader,
+	DialogTitle,
+	DialogTrigger,
+} from "../ui/dialog"
+import {
+	DropdownMenu,
+	DropdownMenuCheckboxItem,
+	DropdownMenuContent,
+	DropdownMenuItem,
+	DropdownMenuLabel,
+	DropdownMenuSeparator,
+	DropdownMenuTrigger,
+} from "../ui/dropdown-menu"
+import { Input } from "../ui/input"
+import {
+	Table,
+	TableBody,
+	TableCell,
+	TableHead,
+	TableHeader,
+	TableRow,
+} from "../ui/table"
+import { Badge } from "../ui/badge"
+import { SmartData, SmartAttribute } from "@/types"
+
+
+// Column definition for S.M.A.R.T. attributes table
+export const smartColumns: ColumnDef<SmartAttribute>[] = [
+	{
+		accessorKey: "id",
+		header: "ID",
+		cell: ({ row }) => {
+			const id = row.getValue("id") as number | undefined
+			return <div className="font-medium">{id || ""}</div>
+		},
+		enableSorting: false,
+	},
+	{
+		accessorKey: "n",
+		header: "Name",
+		cell: ({ row }) => (
+			<div className="font-medium">{row.getValue("n")}</div>
+		),
+		enableSorting: false,
+	},
+	{
+		accessorKey: "rs",
+		header: "Value",
+		cell: ({ row }) => {
+			// if raw string is not empty, use it, otherwise use raw value
+			const rawString = row.getValue("rs") as string | undefined
+			const rawValue = row.original.rv
+			const displayValue = rawString || rawValue?.toString() || "-"
+			return <div className="font-mono text-sm">{displayValue}</div>
+		},
+		enableSorting: false,
+	},
+	{
+		accessorKey: "v",
+		header: "Normalized",
+		cell: ({ row }) => (
+			<div className="font-medium">{row.getValue("v")}</div>
+		),
+		enableSorting: false,
+	},
+	{
+		accessorKey: "w",
+		header: "Worst",
+		cell: ({ row }) => {
+			const worst = row.getValue("w") as number | undefined
+			return <div>{worst || ""}</div>
+		},
+		enableSorting: false,
+	},
+	{
+		accessorKey: "t",
+		header: "Threshold",
+		cell: ({ row }) => {
+			const threshold = row.getValue("t") as number | undefined
+			return <div>{threshold || ""}</div>
+		},
+		enableSorting: false,
+	},
+	{
+		accessorKey: "f",
+		header: "Flags",
+		cell: ({ row }) => {
+			const flags = row.getValue("f") as string | undefined
+			return <div className="font-mono text-sm">{flags || ""}</div>
+		},
+		enableSorting: false,
+	},
+	{
+		accessorKey: "wf",
+		header: "Failing",
+		cell: ({ row }) => {
+			const whenFailed = row.getValue("wf") as string | undefined
+			return <div className="font-mono text-sm">{whenFailed || ""}</div>
+		},
+		enableSorting: false,
+	},
+]
+
+export type DiskInfo = {
+	device: string
+	model: string
+	serialNumber: string
+	firmwareVersion: string
+	capacity: string
+	status: string
+	temperature: number
+	deviceType: string
+	powerOnHours?: number
+	powerCycles?: number
+}
+
+// Function to format capacity display
+function formatCapacity(bytes: number): string {
+	const units = [
+		{ name: 'PB', size: 1024 ** 5 },
+		{ name: 'TB', size: 1024 ** 4 },
+		{ name: 'GB', size: 1024 ** 3 },
+		{ name: 'MB', size: 1024 ** 2 },
+		{ name: 'KB', size: 1024 ** 1 },
+		{ name: 'B', size: 1 }
+	]
+	
+	for (const unit of units) {
+		if (bytes >= unit.size) {
+			const value = bytes / unit.size
+			// For bytes, don't show decimals; for other units show one decimal place
+			const decimals = unit.name === 'B' ? 0 : 1
+			return `${value.toFixed(decimals)} ${unit.name}`
+		}
+	}
+	
+	return '0 B'
+}
+
+// Function to convert SmartData to DiskInfo
+function convertSmartDataToDiskInfo(smartDataRecord: Record<string, SmartData>): DiskInfo[] {
+	return Object.entries(smartDataRecord).map(([key, smartData]) => ({
+		device: smartData.dn || key,
+		model: smartData.mn || "Unknown",
+		serialNumber: smartData.sn || "Unknown",
+		firmwareVersion: smartData.fv || "Unknown",
+		capacity: smartData.c ? formatCapacity(smartData.c) : "Unknown",
+		status: smartData.s || "Unknown",
+		temperature: smartData.t || 0,
+		deviceType: smartData.dt || "Unknown",
+		// These fields need to be extracted from SmartAttribute if available
+		powerOnHours: smartData.a?.find(attr => attr.n.toLowerCase().includes("poweronhours") || attr.n.toLowerCase().includes("power_on_hours"))?.rv,
+		powerCycles: smartData.a?.find(attr => attr.n.toLowerCase().includes("power") && attr.n.toLowerCase().includes("cycle"))?.rv,
+	}))
+}
+
+// S.M.A.R.T. details dialog component
+function SmartDialog({ disk, smartData }: { disk: DiskInfo; smartData?: SmartData }) {
+	const [open, setOpen] = React.useState(false)
+	
+	const smartAttributes = smartData?.a || []
+	
+	// Find all attributes where when failed is not empty
+	const failedAttributes = smartAttributes.filter(attr => attr.wf && attr.wf.trim() !== '')
+	
+	const table = useReactTable({
+		data: smartAttributes,
+		columns: smartColumns,
+		getCoreRowModel: getCoreRowModel(),
+		enableSorting: false,
+	})
+
+	return (
+		<Dialog open={open} onOpenChange={setOpen}>
+			<DialogTrigger asChild>
+				<DropdownMenuItem onSelect={(e) => e.preventDefault()}>
+					View S.M.A.R.T.
+				</DropdownMenuItem>
+			</DialogTrigger>
+			<DialogContent className="max-w-4xl max-h-[80vh] overflow-hidden flex flex-col">
+				<DialogHeader>
+					<DialogTitle>S.M.A.R.T. Details - {disk.device}</DialogTitle>
+					<DialogDescription>
+						S.M.A.R.T. attributes for {disk.model} ({disk.serialNumber})
+					</DialogDescription>
+				</DialogHeader>
+				{smartData?.s && (
+					<div className={`p-4 rounded-md ${
+						smartData.s === "PASSED" 
+							? "bg-green-100 dark:bg-green-900 border border-green-200 dark:border-green-800" 
+							: "bg-red-100 dark:bg-red-900 border border-red-200 dark:border-red-800"
+					}`}>
+						<h4 className={`font-semibold ${
+							smartData.s === "PASSED" 
+								? "text-green-800 dark:text-green-200" 
+								: "text-red-800 dark:text-red-200"
+						}`}>
+							S.M.A.R.T. Self-Test: {smartData.s}
+						</h4>
+						{failedAttributes.length > 0 && (
+							<p className="mt-2 text-red-800 dark:text-red-200">
+								Failed Attributes: {failedAttributes.map(attr => attr.n).join(", ")}
+							</p>
+						)}
+					</div>
+				)}
+				<div className="flex-1 overflow-auto">
+					{smartAttributes.length > 0 ? (
+						<div className="rounded-md border">
+							<Table>
+								<TableHeader>
+									{table.getHeaderGroups().map((headerGroup) => (
+										<TableRow key={headerGroup.id}>
+											{headerGroup.headers.map((header) => (
+												<TableHead key={header.id}>
+													{header.isPlaceholder
+														? null
+														: flexRender(
+																header.column.columnDef.header,
+																header.getContext()
+															)}
+												</TableHead>
+											))}
+										</TableRow>
+									))}
+								</TableHeader>
+								<TableBody>
+									{table.getRowModel().rows.map((row) => {
+										// Check if the attribute is failed
+										const isFailedAttribute = row.original.wf && row.original.wf.trim() !== '';
+										
+										return (
+											<TableRow 
+												key={row.id}
+												className={isFailedAttribute ? "text-red-600 dark:text-red-400" : ""}
+											>
+												{row.getVisibleCells().map((cell) => (
+													<TableCell key={cell.id}>
+														{flexRender(
+															cell.column.columnDef.cell,
+															cell.getContext()
+														)}
+													</TableCell>
+												))}
+											</TableRow>
+										);
+									})}
+								</TableBody>
+							</Table>
+						</div>
+					) : (
+						<div className="text-center py-8 text-muted-foreground">
+							No S.M.A.R.T. attributes available for this device.
+						</div>
+					)}
+				</div>
+			</DialogContent>
+		</Dialog>
+	)
+}
+
+export const columns: ColumnDef<DiskInfo>[] = [
+	{
+		accessorKey: "device",
+		header: () => (
+			<div className="flex items-center">
+				<HardDrive className="mr-2 h-4 w-4" />
+				Device
+			</div>
+		),
+		cell: ({ row }) => (
+			<div className="font-medium">{row.getValue("device")}</div>
+		),
+		enableSorting: false,
+	},
+	{
+		accessorKey: "model",
+		header: () => (
+			<div className="flex items-center">
+				<Box className="mr-2 h-4 w-4" />
+				Model
+			</div>
+		),
+		cell: ({ row }) => (
+			<div className="max-w-[200px] truncate" title={row.getValue("model")}>
+				{row.getValue("model")}
+			</div>
+		),
+		enableSorting: false,
+	},
+	{
+		accessorKey: "capacity",
+		header: () => (
+			<div className="flex items-center">
+				<Container className="mr-2 h-4 w-4" />
+				Capacity
+			</div>
+		),
+		cell: ({ row }) => (
+			<div className="font-medium">{row.getValue("capacity")}</div>
+		),
+		enableSorting: false,
+	},
+	{
+		accessorKey: "temperature",
+		header: () => (
+			<div className="flex items-center">
+				<Thermometer className="mr-2 h-4 w-4" />
+				Temp.
+			</div>
+		),
+		cell: ({ row }) => {
+			const temp = row.getValue("temperature") as number
+			const getTemperatureColor = (temp: number) => {
+				if (temp >= 60) return "destructive"
+				if (temp >= 45) return "secondary"
+				return "default"
+			}
+			return (
+				<Badge variant={getTemperatureColor(temp)}>
+					{temp}°C
+				</Badge>
+			)
+		},
+		enableSorting: false,
+	},
+	{
+		accessorKey: "status",
+		header: () => (
+			<div className="flex items-center">
+				<Activity className="mr-2 h-4 w-4" />
+				Status
+			</div>
+		),
+		cell: ({ row }) => {
+			const status = row.getValue("status") as string
+			return (
+				<Badge 
+					variant={status === "PASSED" ? "default" : "destructive"}
+					className={status === "PASSED" ? "bg-green-500 hover:bg-green-600 text-white" : ""}
+				>
+					{status}
+				</Badge>
+			)
+		},
+		enableSorting: false,
+	},
+	{
+		accessorKey: "deviceType",
+		header: () => (
+			<div className="flex items-center">
+				<Tags className="mr-2 h-4 w-4" />
+				Type
+			</div>
+		),
+		cell: ({ row }) => (
+			<Badge variant="outline" className="uppercase">
+				{row.getValue("deviceType")}
+			</Badge>
+		),
+		enableSorting: false,
+	},
+	{
+		accessorKey: "powerOnHours",
+		header: () => (
+			<div className="flex items-center">
+				<Clock className="mr-2 h-4 w-4" />
+				Power On Time
+			</div>
+		),
+		cell: ({ row }) => {
+			const hours = row.getValue("powerOnHours") as number | undefined
+			if (!hours && hours !== 0) {
+				return (
+					<div className="text-sm text-muted-foreground">
+						N/A
+					</div>
+				)
+			}
+			const days = Math.floor(hours / 24)
+			return (
+				<div className="text-sm">
+					<div>{hours.toLocaleString()} hours</div>
+					<div className="text-muted-foreground text-xs">{days} days</div>
+				</div>
+			)
+		},
+		enableSorting: false,
+	},
+	{
+		accessorKey: "serialNumber",
+		header: () => (
+			<div className="flex items-center">
+				<Binary className="mr-2 h-4 w-4" />
+				Serial Number
+			</div>
+		),
+		cell: ({ row }) => (
+			<div className="font-mono text-sm">{row.getValue("serialNumber")}</div>
+		),
+		enableSorting: false,
+	},
+	{
+		id: "actions",
+		enableHiding: false,
+		cell: () => null, // This will be overwritten by columnsWithSmartData
+	},
+]
+
+export default function DisksTab({ smartData }: { smartData?: Record<string, SmartData> }) {
+	const [sorting, setSorting] = React.useState<SortingState>([])
+	const [columnFilters, setColumnFilters] = React.useState<ColumnFiltersState>([])
+	const [columnVisibility, setColumnVisibility] = React.useState<VisibilityState>({})
+	const [rowSelection, setRowSelection] = React.useState({})
+
+	// Convert SmartData to DiskInfo, if no data use empty array
+	const diskData = React.useMemo(() => {
+		return smartData ? convertSmartDataToDiskInfo(smartData) : []
+	}, [smartData])
+
+	// Create column definitions with SmartData
+	const columnsWithSmartData = React.useMemo(() => {
+		return columns.map(column => {
+			if (column.id === "actions") {
+				return {
+					...column,
+					cell: ({ row }: { row: any }) => {
+						const disk = row.original as DiskInfo
+						// Find the corresponding SmartData
+						const diskSmartData = smartData ? Object.values(smartData).find(
+							sd => sd.dn === disk.device || sd.mn === disk.model
+						) : undefined
+
+						return (
+							<DropdownMenu>
+								<DropdownMenuTrigger asChild>
+									<Button variant="ghost" className="h-8 w-8 p-0">
+										<span className="sr-only">Open menu</span>
+										<MoreHorizontal className="h-4 w-4" />
+									</Button>
+								</DropdownMenuTrigger>
+								<DropdownMenuContent align="end">
+									<DropdownMenuLabel>Actions</DropdownMenuLabel>
+									<SmartDialog disk={disk} smartData={diskSmartData} />
+									<DropdownMenuSeparator />
+									<DropdownMenuItem
+										onClick={() => navigator.clipboard.writeText(disk.device)}
+									>
+										Copy device path
+									</DropdownMenuItem>
+									<DropdownMenuItem
+										onClick={() => navigator.clipboard.writeText(disk.serialNumber)}
+									>
+										Copy serial number
+									</DropdownMenuItem>
+								</DropdownMenuContent>
+							</DropdownMenu>
+						)
+					}
+				}
+			}
+			return column
+		})
+	}, [smartData])
+
+	const table = useReactTable({
+		data: diskData,
+		columns: columnsWithSmartData,
+		onSortingChange: setSorting,
+		onColumnFiltersChange: setColumnFilters,
+		getCoreRowModel: getCoreRowModel(),
+		getPaginationRowModel: getPaginationRowModel(),
+		getSortedRowModel: getSortedRowModel(),
+		getFilteredRowModel: getFilteredRowModel(),
+		onColumnVisibilityChange: setColumnVisibility,
+		onRowSelectionChange: setRowSelection,
+		state: {
+			sorting,
+			columnFilters,
+			columnVisibility,
+			rowSelection,
+		},
+	})
+
+	return (
+		<div>
+			<Card>
+				<CardHeader>
+					<CardTitle>Disk Information</CardTitle>
+					<CardDescription>Disk information and S.M.A.R.T. data</CardDescription>
+				</CardHeader>
+				<div className="px-6 pb-6">
+					<div className="w-full">
+						<div className="flex items-center py-4">
+							<Input
+								placeholder="Filter devices..."
+								value={(table.getColumn("device")?.getFilterValue() as string) ?? ""}
+								onChange={(event) =>
+									table.getColumn("device")?.setFilterValue(event.target.value)
+								}
+								className="max-w-sm"
+							/>
+							<DropdownMenu>
+								<DropdownMenuTrigger asChild>
+									<Button variant="outline" className="ml-auto">
+										Columns <ChevronDown className="ml-2 h-4 w-4" />
+									</Button>
+								</DropdownMenuTrigger>
+								<DropdownMenuContent align="end">
+									{table
+										.getAllColumns()
+										.filter((column) => column.getCanHide())
+										.map((column) => {
+											return (
+												<DropdownMenuCheckboxItem
+													key={column.id}
+													className="capitalize"
+													checked={column.getIsVisible()}
+													onCheckedChange={(value) =>
+														column.toggleVisibility(!!value)
+													}
+												>
+													{column.id}
+												</DropdownMenuCheckboxItem>
+											)
+										})}
+								</DropdownMenuContent>
+							</DropdownMenu>
+						</div>
+						<div className="rounded-md border grid">
+							<Table>
+								<TableHeader>
+									{table.getHeaderGroups().map((headerGroup) => (
+										<TableRow key={headerGroup.id}>
+											{headerGroup.headers.map((header) => {
+												return (
+													<TableHead key={header.id}>
+														{header.isPlaceholder
+															? null
+															: flexRender(
+																	header.column.columnDef.header,
+																	header.getContext()
+																)}
+													</TableHead>
+												)
+											})}
+										</TableRow>
+									))}
+								</TableHeader>
+								<TableBody>
+									{table.getRowModel().rows?.length ? (
+										table.getRowModel().rows.map((row) => (
+											<TableRow
+												key={row.id}
+												data-state={row.getIsSelected() && "selected"}
+											>
+												{row.getVisibleCells().map((cell) => (
+													<TableCell key={cell.id}>
+														{flexRender(
+															cell.column.columnDef.cell,
+															cell.getContext()
+														)}
+													</TableCell>
+												))}
+											</TableRow>
+										))
+									) : (
+										<TableRow>
+											<TableCell
+												colSpan={columns.length}
+												className="h-24 text-center"
+											>
+												{smartData ? "No disk data available." : "Loading disk data..."}
+											</TableCell>
+										</TableRow>
+									)}
+								</TableBody>
+							</Table>
+						</div>
+						<div className="flex items-center justify-end space-x-2 py-4">
+							<div className="text-muted-foreground flex-1 text-sm">
+								{table.getFilteredRowModel().rows.length} disk device(s)
+							</div>
+							<div className="space-x-2">
+								<Button
+									variant="outline"
+									size="sm"
+									onClick={() => table.previousPage()}
+									disabled={!table.getCanPreviousPage()}
+								>
+									Previous
+								</Button>
+								<Button
+									variant="outline"
+									size="sm"
+									onClick={() => table.nextPage()}
+									disabled={!table.getCanNextPage()}
+								>
+									Next
+								</Button>
+							</div>
+						</div>
+					</div>
+				</div>
+			</Card>
+		</div>
+	)
+} 
--- a/beszel/site/src/components/ui/collapsible.tsx
+++ b/beszel/site/src/components/ui/collapsible.tsx
@@ -1,49 +0,0 @@
-import * as React from "react"
-import { ChevronDownIcon, HourglassIcon } from "lucide-react"
-import { cn } from "@/lib/utils"
-import { Button } from "./button"
-
-interface CollapsibleProps {
-	title: string
-	children: React.ReactNode
-	description?: React.ReactNode
-	defaultOpen?: boolean
-	className?: string
-	icon?: React.ReactNode
-}
-
-export function Collapsible({ title, children, description, defaultOpen = false, className, icon }: CollapsibleProps) {
-	const [isOpen, setIsOpen] = React.useState(defaultOpen)
-
-	return (
-		<div className={cn("border rounded-lg", className)}>
-			<Button
-				variant="ghost"
-				className="w-full justify-between p-4 font-semibold"
-				onClick={() => setIsOpen(!isOpen)}
-			>
-				<div className="flex items-center gap-2">
-					{icon}
-					{title}
-				</div>
-				<ChevronDownIcon
-					className={cn("h-4 w-4 transition-transform duration-200", {
-						"rotate-180": isOpen,
-					})}
-				/>
-			</Button>
-			{description && (
-				<div className="px-4 pb-2 text-sm text-muted-foreground">
-					{description}
-				</div>
-			)}
-			{isOpen && (
-				<div className="px-4 pb-4">
-					<div className="grid gap-3">
-						{children}
-					</div>
-				</div>
-			)}
-		</div>
-	)
-} 
--- a/beszel/site/src/components/ui/icons.tsx
+++ b/beszel/site/src/components/ui/icons.tsx
@@ -121,12 +121,3 @@ export function GpuIcon(props: SVGProps<SVGSVGElement>) {
 		</svg>
 	)
 }
-
-// Remix icons (Apache 2.0) https://github.com/Remix-Design/RemixIcon/blob/master/License
-export function HourglassIcon(props: SVGProps<SVGSVGElement>) {
-	return (
-		<svg viewBox="0 0 24 24" {...props} fill="currentColor">
-			<path d="M4 2h16v4.5L13.5 12l6.5 5.5V22H4v-4.5l6.5-5.5L4 6.5zm12.3 5L18 5.5V4H6v1.5L7.7 7zM12 13.3l-6 5.2V20h1l5-3 5 3h1v-1.5z" />
-		</svg>
-	)
-}
--- a/beszel/site/src/components/ui/input-copy.tsx
+++ b/beszel/site/src/components/ui/input-copy.tsx
@@ -1,38 +0,0 @@
-import { copyToClipboard } from "@/lib/utils"
-import { Input } from "./input"
-import { Trans } from "@lingui/react/macro"
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "./tooltip"
-import { CopyIcon } from "lucide-react"
-import { Button } from "./button"
-
-export function InputCopy({ value, id, name }: { value: string; id: string; name: string }) {
-	return (
-		<div className="relative">
-			<Input readOnly id={id} name={name} value={value} required></Input>
-			<div
-				className={
-					"h-6 w-24 bg-gradient-to-r rtl:bg-gradient-to-l from-transparent to-background to-65% absolute top-2 end-1 pointer-events-none"
-				}
-			></div>
-			<TooltipProvider delayDuration={100} disableHoverableContent>
-				<Tooltip>
-					<TooltipTrigger asChild>
-						<Button
-							type="button"
-							variant={"link"}
-							className="absolute end-0 top-0"
-							onClick={() => copyToClipboard(value)}
-						>
-							<CopyIcon className="size-4" />
-						</Button>
-					</TooltipTrigger>
-					<TooltipContent>
-						<p>
-							<Trans>Click to copy</Trans>
-						</p>
-					</TooltipContent>
-				</Tooltip>
-			</TooltipProvider>
-		</div>
-	)
-}
--- a/beszel/site/src/components/ui/table.tsx
+++ b/beszel/site/src/components/ui/table.tsx
@@ -51,7 +51,7 @@ const TableHead = React.forwardRef<HTMLTableCellElement, React.ThHTMLAttributes<
 		<th
 			ref={ref}
 			className={cn(
-				"h-12 px-4 text-start align-middle font-medium text-muted-foreground [&:has([role=checkbox])]:pe-0",
+				"h-12 px-4 text-start align-middle whitespace-nowrap font-medium text-muted-foreground [&:has([role=checkbox])]:pe-0",
 				className
 			)}
 			{...props}
@@ -62,7 +62,7 @@ TableHead.displayName = "TableHead"

 const TableCell = React.forwardRef<HTMLTableCellElement, React.TdHTMLAttributes<HTMLTableCellElement>>(
 	({ className, ...props }, ref) => (
-		<td ref={ref} className={cn("p-4 align-middle [&:has([role=checkbox])]:pe-0", className)} {...props} />
+		<td ref={ref} className={cn("p-4 align-middle whitespace-nowrap [&:has([role=checkbox])]:pe-0", className)} {...props} />
 	)
 )
 TableCell.displayName = "TableCell"
--- a/beszel/site/src/lib/enums.ts
+++ b/beszel/site/src/lib/enums.ts
@@ -1,4 +1,3 @@
-/** Operating system */
 export enum Os {
 	Linux = 0,
 	Darwin,
@@ -6,18 +5,9 @@ export enum Os {
 	FreeBSD,
 }

-/** Type of chart */
 export enum ChartType {
 	Memory,
 	Disk,
 	Network,
 	CPU,
 }
-
-/** Unit of measurement */
-export enum Unit {
-	Bytes,
-	Bits,
-	Celsius,
-	Fahrenheit,
-}
--- a/beszel/site/src/lib/stores.ts
+++ b/beszel/site/src/lib/stores.ts
@@ -28,9 +28,6 @@ export const $maxValues = atom(false)
 export const $userSettings = map<UserSettings>({
 	chartTime: "1h",
 	emails: [pb.authStore.record?.email || ""],
-	// unitTemp: "celsius",
-	// unitNet: "mbps",
-	// unitDisk: "mbps",
 })
 // update local storage on change
 $userSettings.subscribe((value) => {
--- a/beszel/site/src/lib/utils.ts
+++ b/beszel/site/src/lib/utils.ts
@@ -1,34 +1,29 @@
-import { t } from "@lingui/core/macro"
+import { t } from "@lingui/core/macro";
 import { toast } from "@/components/ui/use-toast"
 import { type ClassValue, clsx } from "clsx"
 import { twMerge } from "tailwind-merge"
 import { $alerts, $copyContent, $systems, $userSettings, pb } from "./stores"
-import {
-	AlertInfo,
-	AlertRecord,
-	ChartTimeData,
-	ChartTimes,
-	FingerprintRecord,
-	SystemRecord,
-	UserSettings,
-} from "@/types"
+import { AlertInfo, AlertRecord, ChartTimeData, ChartTimes, SystemRecord } from "@/types"
 import { RecordModel, RecordSubscription } from "pocketbase"
 import { WritableAtom } from "nanostores"
 import { timeDay, timeHour } from "d3-time"
 import { useEffect, useState } from "react"
 import { CpuIcon, HardDriveIcon, MemoryStickIcon, ServerIcon } from "lucide-react"
-import { EthernetIcon, HourglassIcon, ThermometerIcon } from "@/components/ui/icons"
+import { EthernetIcon, ThermometerIcon } from "@/components/ui/icons"
 import { prependBasePath } from "@/components/router"
-import { Unit } from "./enums"

 export function cn(...inputs: ClassValue[]) {
 	return twMerge(clsx(inputs))
 }

 /** Adds event listener to node and returns function that removes the listener */
-export function listen<T extends Event = Event>(node: Node, event: string, handler: (event: T) => void) {
-	node.addEventListener(event, handler as EventListener)
-	return () => node.removeEventListener(event, handler as EventListener)
+export function listen<T extends Event = Event>(
+  node: Node, 
+  event: string, 
+  handler: (event: T) => void
+) {
+  node.addEventListener(event, handler as EventListener)
+  return () => node.removeEventListener(event, handler as EventListener)
 }

 export async function copyToClipboard(content: string) {
@@ -82,10 +77,7 @@ export const updateSystemList = (() => {

 /** Logs the user out by clearing the auth store and unsubscribing from realtime updates. */
 export async function logOut() {
-	$systems.set([])
-	$alerts.set([])
-	$userSettings.set({} as UserSettings)
-	sessionStorage.setItem("lo", "t") // prevent auto login on logout
+	sessionStorage.setItem("lo", "t")
 	pb.authStore.clear()
 	pb.realtime.unsubscribe()
 }
@@ -237,17 +229,17 @@ export function useYAxisWidth() {
 	return { yAxisWidth, updateYAxisWidth }
 }

-/** Format number to x decimal places, without trailing zeros */
+export function toFixedWithoutTrailingZeros(num: number, digits: number) {
+	return parseFloat(num.toFixed(digits)).toString()
+}
+
 export function toFixedFloat(num: number, digits: number) {
-	return parseFloat((digits === 0 ? Math.ceil(num) : num).toFixed(digits))
+	return parseFloat(num.toFixed(digits))
 }

 let decimalFormatters: Map<number, Intl.NumberFormat> = new Map()
-/** Format number to x decimal places, maintaining trailing zeros */
+/** Format number to x decimal places */
 export function decimalString(num: number, digits = 2) {
-	if (digits === 0) {
-		return Math.ceil(num).toString()
-	}
 	let formatter = decimalFormatters.get(digits)
 	if (!formatter) {
 		formatter = new Intl.NumberFormat(undefined, {
@@ -278,93 +270,40 @@ export function useLocalStorage<T>(key: string, defaultValue: T) {
 	return [value, setValue]
 }

-/** Format temperature to user's preferred unit */
-export function formatTemperature(celsius: number, unit?: Unit): { value: number; unit: string } {
-	if (!unit) {
-		unit = $userSettings.get().unitTemp || Unit.Celsius
-	}
-	// need loose equality check due to form data being strings
-	if (unit == Unit.Fahrenheit) {
-		return {
-			value: celsius * 1.8 + 32,
-			unit: "°F",
-		}
-	}
-	return {
-		value: celsius,
-		unit: "°C",
-	}
-}
-
-/** Format bytes to user's preferred unit */
-export function formatBytes(
-	size: number,
-	perSecond = false,
-	unit = Unit.Bytes,
-	isMegabytes = false
-): { value: number; unit: string } {
-	// Convert MB to bytes if isMegabytes is true
-	if (isMegabytes) size *= 1024 * 1024
-
-	// need loose equality check due to form data being strings
-	if (unit == Unit.Bits) {
-		const bits = size * 8
-		const suffix = perSecond ? "ps" : ""
-		if (bits < 1000) return { value: bits, unit: `b${suffix}` }
-		if (bits < 1_000_000) return { value: bits / 1_000, unit: `Kb${suffix}` }
-		if (bits < 1_000_000_000)
-			return {
-				value: bits / 1_000_000,
-				unit: `Mb${suffix}`,
-			}
-		if (bits < 1_000_000_000_000)
-			return {
-				value: bits / 1_000_000_000,
-				unit: `Gb${suffix}`,
-			}
-		return {
-			value: bits / 1_000_000_000_000,
-			unit: `Tb${suffix}`,
-		}
-	}
-	// bytes
-	const suffix = perSecond ? "/s" : ""
-	if (size < 100) return { value: size, unit: `B${suffix}` }
-	if (size < 1000 * 1024) return { value: size / 1024, unit: `KB${suffix}` }
-	if (size < 1000 * 1024 ** 2)
-		return {
-			value: size / 1024 ** 2,
-			unit: `MB${suffix}`,
-		}
-	if (size < 1000 * 1024 ** 3)
-		return {
-			value: size / 1024 ** 3,
-			unit: `GB${suffix}`,
-		}
-	return {
-		value: size / 1024 ** 4,
-		unit: `TB${suffix}`,
-	}
-}
-
-/** Fetch or create user settings in database */
 export async function updateUserSettings() {
 	try {
 		const req = await pb.collection("user_settings").getFirstListItem("", { fields: "settings" })
 		$userSettings.set(req.settings)
 		return
 	} catch (e) {
-		console.error("get settings", e)
+		console.log("get settings", e)
 	}
 	// create user settings if error fetching existing
 	try {
 		const createdSettings = await pb.collection("user_settings").create({ user: pb.authStore.record!.id })
 		$userSettings.set(createdSettings.settings)
 	} catch (e) {
-		console.error("create settings", e)
+		console.log("create settings", e)
 	}
 }

+/**
+ * Get the value and unit of size (TB, GB, or MB) for a given size
+ * @param n size in gigabytes or megabytes
+ * @param isGigabytes boolean indicating if n represents gigabytes (true) or megabytes (false)
+ * @returns an object containing the value and unit of size
+ */
+export const getSizeAndUnit = (n: number, isGigabytes = true) => {
+	const sizeInGB = isGigabytes ? n : n / 1_000
+
+	if (sizeInGB >= 1_000) {
+		return { v: sizeInGB / 1_000, u: " TB" }
+	} else if (sizeInGB >= 1) {
+		return { v: sizeInGB, u: " GB" }
+	}
+	return { v: isGigabytes ? sizeInGB * 1_000 : n, u: " MB" }
+}
+
 export const chartMargin = { top: 12 }

 export const alertInfo: Record<string, AlertInfo> = {
@@ -407,36 +346,6 @@ export const alertInfo: Record<string, AlertInfo> = {
 		icon: ThermometerIcon,
 		desc: () => t`Triggers when any sensor exceeds a threshold`,
 	},
-	LoadAvg1: {
-		name: () => t`Load Average 1m`,
-		unit: "",
-		icon: HourglassIcon,
-		max: 100,
-		min: 0.1,
-		start: 10,
-		step: 0.1,
-		desc: () => t`Triggers when 1 minute load average exceeds a threshold`,
-	},
-	LoadAvg5: {
-		name: () => t`Load Average 5m`,
-		unit: "",
-		icon: HourglassIcon,
-		max: 100,
-		min: 0.1,
-		start: 10,
-		step: 0.1,
-		desc: () => t`Triggers when 5 minute load average exceeds a threshold`,
-	},
-	LoadAvg15: {
-		name: () => t`Load Average 15m`,
-		unit: "",
-		icon: HourglassIcon,
-		min: 0.1,
-		max: 100,
-		start: 10,
-		step: 0.1,
-		desc: () => t`Triggers when 15 minute load average exceeds a threshold`,
-	},
 }

 /**
@@ -446,36 +355,3 @@ export const alertInfo: Record<string, AlertInfo> = {
 * const hostname = getHostDisplayValue(system) // hostname will be "beszel.sock"
 */
 export const getHostDisplayValue = (system: SystemRecord): string => system.host.slice(system.host.lastIndexOf("/") + 1)
-
-/** Generate a random token for the agent */
-export const generateToken = () => crypto?.randomUUID() ?? (performance.now() * Math.random()).toString(16)
-
-/** Get the hub URL from the global BESZEL object */
-export const getHubURL = () => BESZEL?.HUB_URL || window.location.origin
-
-/** Map of system IDs to their corresponding tokens (used to avoid fetching in add-system dialog) */
-export const tokenMap = new Map<SystemRecord["id"], FingerprintRecord["token"]>()
-
-/**
- * Calculate load average percentage relative to CPU cores
- * @param loadAverage - The load average value (1m, 5m, or 15m)
- * @param cores - Number of CPU cores
- * @returns Percentage (0-100) representing CPU utilization
- */
-export const calculateLoadAveragePercent = (loadAverage: number, cores: number): number => {
-	if (!loadAverage || !cores) return 0
-	return Math.min((loadAverage / cores) * 100, 100)
-}
-
-/**
- * Get load average opacity based on utilization relative to cores
- * @param loadAverage - The load average value
- * @param cores - Number of CPU cores
- * @returns Opacity value (0.6, 0.8, or 1.0)
- */
-export const getLoadAverageOpacity = (loadAverage: number, cores: number): number => {
-	if (!loadAverage || !cores) return 0.6
-	if (loadAverage < cores * 0.5) return 0.6
-	if (loadAverage < cores) return 0.8
-	return 1.0
-}
--- a/beszel/site/src/locales/ar/ar.po
+++ b/beszel/site/src/locales/ar/ar.po
@@ -49,7 +49,6 @@ msgstr "30 يومًا"

 #. Table column
 #: src/components/systems-table/systems-table.tsx
-#: src/components/routes/settings/tokens-fingerprints.tsx
 msgid "Actions"
 msgstr "إجراءات"

@@ -77,6 +76,9 @@ msgstr "إضافة عنوان URL"
 msgid "Adjust display options for charts."
 msgstr "تعديل خيارات العرض للرسوم البيانية."

+#: src/components/command-palette.tsx
+#: src/components/command-palette.tsx
+#: src/components/command-palette.tsx
 #: src/components/command-palette.tsx
 #: src/components/command-palette.tsx
 msgid "Admin"
@@ -184,7 +186,7 @@ msgstr "تحقق من السجلات لمزيد من التفاصيل."
 msgid "Check your notification service"
 msgstr "تحقق من خدمة الإشعارات الخاصة بك"

-#: src/components/ui/input-copy.tsx
+#: src/components/add-system.tsx
 msgid "Click to copy"
 msgstr "انقر للنسخ"

@@ -211,28 +213,20 @@ msgid "Copied to clipboard"
 msgstr "تم النسخ إلى الحافظة"

 #: src/components/add-system.tsx
-#: src/components/routes/settings/tokens-fingerprints.tsx
 msgctxt "Button to copy docker compose file content"
 msgid "Copy docker compose"
 msgstr "نسخ docker compose"

 #: src/components/add-system.tsx
-#: src/components/routes/settings/tokens-fingerprints.tsx
 msgctxt "Button to copy docker run command"
 msgid "Copy docker run"
 msgstr "نسخ docker run"

-#: src/components/routes/settings/tokens-fingerprints.tsx
-msgctxt "Environment variables"
-msgid "Copy env"
-msgstr "نسخ متغيرات البيئة"
-
 #: src/components/systems-table/systems-table.tsx
 msgid "Copy host"
 msgstr "نسخ المضيف"

 #: src/components/add-system.tsx
-#: src/components/routes/settings/tokens-fingerprints.tsx
 msgid "Copy Linux command"
 msgstr "نسخ أمر لينكس"

@@ -240,18 +234,6 @@ msgstr "نسخ أمر لينكس"
 msgid "Copy text"
 msgstr "نسخ النص"

-#: src/components/add-system.tsx
-msgid "Copy the installation command for the agent below, or register agents automatically with a <0>universal token</0>."
-msgstr "انسخ أمر التثبيت للوكيل أدناه، أو سجل الوكلاء تلقائياً باستخدام <0>رمز مميز عالمي</0>."
-
-#: src/components/add-system.tsx
-msgid "Copy the<0>docker-compose.yml</0> content for the agent below, or register agents automatically with a <1>universal token</1>."
-msgstr "انسخ محتوى <0>docker-compose.yml</0> للوكيل أدناه، أو سجل الوكلاء تلقائياً باستخدام <1>رمز مميز عالمي</1>."
-
-#: src/components/routes/settings/tokens-fingerprints.tsx
-msgid "Copy YAML"
-msgstr "نسخ YAML"
-
 #: src/components/systems-table/systems-table.tsx
 msgid "CPU"
 msgstr "المعالج"
@@ -284,10 +266,6 @@ msgstr "الفترة الزمنية الافتراضية"
 msgid "Delete"
 msgstr "حذف"

-#: src/components/routes/settings/tokens-fingerprints.tsx
-msgid "Delete fingerprint"
-msgstr "حذف البصمة"
-
 #: src/components/systems-table/systems-table.tsx
 msgid "Disk"
 msgstr "القرص"
@@ -351,7 +329,6 @@ msgstr "أدخل عنوان البريد الإشباكي لإعادة تعيي
 msgid "Enter email address..."
 msgstr "أدخل عنوان البريد الإشباكي..."

-#: src/components/routes/settings/tokens-fingerprints.tsx
 #: src/components/routes/settings/notifications.tsx
 #: src/components/routes/settings/config-yaml.tsx
 #: src/components/login/auth-form.tsx
@@ -399,10 +376,6 @@ msgstr "فشل في تحديث التنبيه"
 msgid "Filter..."
 msgstr "تصفية..."

-#: src/components/routes/settings/tokens-fingerprints.tsx
-msgid "Fingerprint"
-msgstr ""
-
 #: src/components/alerts/alerts-system.tsx
 msgid "For <0>{min}</0> {min, plural, one {minute} other {minutes}}"
 msgstr "لمدة <0>{min}</0> {min, plural, one {دقيقة} other {دقائق}}"
@@ -426,7 +399,6 @@ msgid "Grid"
 msgstr "شبكة"

 #: src/components/add-system.tsx
-#: src/components/routes/settings/tokens-fingerprints.tsx
 msgctxt "Button to copy install command"
 msgid "Homebrew command"
 msgstr "أمر Homebrew"
@@ -448,16 +420,6 @@ msgstr "عنوان البريد الإشباكي غير صالح."
 msgid "Kernel"
 msgstr "النواة"

-#. Load average 15 minutes
-#: src/components/systems-table/systems-table.tsx
-msgid "L15"
-msgstr ""
-
-#. Load average 5 minutes
-#: src/components/systems-table/systems-table.tsx
-msgid "L5"
-msgstr ""
-
 #: src/components/routes/settings/general.tsx
 msgid "Language"
 msgstr "اللغة"
@@ -471,14 +433,6 @@ msgstr "التخطيط"
 msgid "Light"
 msgstr "فاتح"

-#: src/lib/utils.ts
-msgid "Load Average 15m"
-msgstr ""
-
-#: src/lib/utils.ts
-msgid "Load Average 5m"
-msgstr ""
-
 #: src/components/navbar.tsx
 msgid "Log Out"
 msgstr "تسجيل الخروج"
@@ -567,8 +521,6 @@ msgid "On each restart, systems in the database will be updated to match the sys
 msgstr "في كل إعادة تشغيل، سيتم تحديث الأنظمة في قاعدة البيانات لتتطابق مع الأنظمة المعرفة في الملف."

 #: src/components/systems-table/systems-table.tsx
-#: src/components/routes/settings/tokens-fingerprints.tsx
-#: src/components/routes/settings/tokens-fingerprints.tsx
 msgid "Open menu"
 msgstr "فتح القائمة"

@@ -683,10 +635,6 @@ msgstr "إعادة تعيين كلمة المرور"
 msgid "Resume"
 msgstr "استئناف"

-#: src/components/routes/settings/tokens-fingerprints.tsx
-msgid "Rotate token"
-msgstr "تدوير الرمز المميز"
-
 #: src/components/routes/settings/notifications.tsx
 msgid "Save address using enter key or comma. Leave blank to disable email notifications."
 msgstr "احفظ العنوان باستخدام مفتاح الإدخال أو الفاصلة. اتركه فارغًا لتعطيل إشعارات البريد الإشباكي."
@@ -721,6 +669,7 @@ msgstr "تم الإرسال"
 msgid "Sets the default time range for charts when a system is viewed."
 msgstr "يحدد النطاق الزمني الافتراضي للرسوم البيانية عند عرض النظام."

+#: src/components/command-palette.tsx
 #: src/components/command-palette.tsx
 #: src/components/command-palette.tsx
 #: src/components/routes/settings/layout.tsx
@@ -760,7 +709,6 @@ msgstr "استخدام التبديل"
 #: src/lib/utils.ts
 #: src/components/mode-toggle.tsx
 #: src/components/systems-table/systems-table.tsx
-#: src/components/routes/settings/tokens-fingerprints.tsx
 msgid "System"
 msgstr "النظام"

@@ -798,6 +746,14 @@ msgstr "اختبار <0>URL</0>"
 msgid "Test notification sent"
 msgstr "تم إرسال إشعار الاختبار"

+#: src/components/add-system.tsx
+msgid "The agent must be running on the system to connect. Copy the installation command for the agent below."
+msgstr "يجب أن يكون الوكيل قيد التشغيل على النظام للاتصال. انسخ أمر التثبيت للوكيل أدناه."
+
+#: src/components/add-system.tsx
+msgid "The agent must be running on the system to connect. Copy the<0>docker-compose.yml</0> for the agent below."
+msgstr "يجب أن يكون الوكيل قيد التشغيل على النظام للاتصال. انسخ <0>docker-compose.yml</0> للوكيل أدناه."
+
 #: src/components/login/forgot-pass-form.tsx
 msgid "Then log into the backend and reset your user account password in the users table."
 msgstr "ثم قم بتسجيل الدخول إلى الواجهة الخلفية وأعد تعيين كلمة مرور حساب المستخدم الخاص بك في جدول المستخدمين."
@@ -827,33 +783,6 @@ msgstr "تبديل الشبكة"
 msgid "Toggle theme"
 msgstr "تبديل السمة"

-#: src/components/add-system.tsx
-#: src/components/routes/settings/tokens-fingerprints.tsx
-msgid "Token"
-msgstr "رمز مميز"
-
-#: src/components/command-palette.tsx
-#: src/components/routes/settings/tokens-fingerprints.tsx
-#: src/components/routes/settings/layout.tsx
-msgid "Tokens & Fingerprints"
-msgstr "الرموز المميزة والبصمات"
-
-#: src/components/routes/settings/tokens-fingerprints.tsx
-msgid "Tokens allow agents to connect and register. Fingerprints are stable identifiers unique to each system, set on first connection."
-msgstr "تسمح الرموز المميزة للوكلاء بالاتصال والتسجيل. البصمات هي معرفات مستقرة فريدة لكل نظام، يتم تعيينها عند الاتصال الأول."
-
-#: src/components/routes/settings/tokens-fingerprints.tsx
-msgid "Tokens and fingerprints are used to authenticate WebSocket connections to the hub."
-msgstr "تُستخدم الرموز المميزة والبصمات للمصادقة على اتصالات WebSocket إلى المحور."
-
-#: src/lib/utils.ts
-msgid "Triggers when 15 minute load average exceeds a threshold"
-msgstr ""
-
-#: src/lib/utils.ts
-msgid "Triggers when 5 minute load average exceeds a threshold"
-msgstr ""
-
 #: src/lib/utils.ts
 msgid "Triggers when any sensor exceeds a threshold"
 msgstr "يتم التفعيل عندما يتجاوز أي مستشعر عتبة معينة"
@@ -878,10 +807,6 @@ msgstr "يتم التفعيل عندما يتغير الحالة بين التش
 msgid "Triggers when usage of any disk exceeds a threshold"
 msgstr "يتم التفعيل عندما يتجاوز استخدام أي قرص عتبة معينة"

-#: src/components/routes/settings/tokens-fingerprints.tsx
-msgid "Universal token"
-msgstr "رمز مميز عالمي"
-
 #. Context: System is up
 #: src/components/systems-table/systems-table.tsx
 #: src/components/routes/system.tsx
@@ -937,12 +862,7 @@ msgstr "هل تريد مساعدتنا في تحسين ترجماتنا؟ تحق
 msgid "Webhook / Push notifications"
 msgstr "إشعارات Webhook / Push"

-#: src/components/routes/settings/tokens-fingerprints.tsx
-msgid "When enabled, this token allows agents to self-register without prior system creation. Expires after one hour or on hub restart."
-msgstr "عند التفعيل، يسمح هذا الرمز المميز للوكلاء بالتسجيل الذاتي دون إنشاء نظام مسبق. ينتهي بعد ساعة واحدة أو عند إعادة تشغيل المحور."
-
 #: src/components/add-system.tsx
-#: src/components/routes/settings/tokens-fingerprints.tsx
 msgctxt "Button to copy install command"
 msgid "Windows command"
 msgstr "أمر Windows"
--- a/beszel/site/src/locales/bg/bg.po
+++ b/beszel/site/src/locales/bg/bg.po
@@ -49,7 +49,6 @@ msgstr "30 дни"

 #. Table column
 #: src/components/systems-table/systems-table.tsx
-#: src/components/routes/settings/tokens-fingerprints.tsx
 msgid "Actions"
 msgstr "Действия"

@@ -77,6 +76,9 @@ msgstr "Добави URL"
 msgid "Adjust display options for charts."
 msgstr "Настрой опциите за показване на диаграмите."

+#: src/components/command-palette.tsx
+#: src/components/command-palette.tsx
+#: src/components/command-palette.tsx
 #: src/components/command-palette.tsx
 #: src/components/command-palette.tsx
 msgid "Admin"
@@ -184,7 +186,7 @@ msgstr "Провери log-овете за повече информация."
 msgid "Check your notification service"
 msgstr "Провери услугата си за удостоверяване"

-#: src/components/ui/input-copy.tsx
+#: src/components/add-system.tsx
 msgid "Click to copy"
 msgstr "Настисни за да копираш"

@@ -211,28 +213,20 @@ msgid "Copied to clipboard"
 msgstr "Записано в клипборда"

 #: src/components/add-system.tsx
-#: src/components/routes/settings/tokens-fingerprints.tsx
 msgctxt "Button to copy docker compose file content"
 msgid "Copy docker compose"
 msgstr "Копирай docker compose"

 #: src/components/add-system.tsx
-#: src/components/routes/settings/tokens-fingerprints.tsx
 msgctxt "Button to copy docker run command"
 msgid "Copy docker run"
 msgstr "Копирай docker run"

-#: src/components/routes/settings/tokens-fingerprints.tsx
-msgctxt "Environment variables"
-msgid "Copy env"
-msgstr ""
-
 #: src/components/systems-table/systems-table.tsx
 msgid "Copy host"
 msgstr "Копирай хоста"

 #: src/components/add-system.tsx
-#: src/components/routes/settings/tokens-fingerprints.tsx
 msgid "Copy Linux command"
 msgstr "Копирай linux командата"

@@ -240,18 +234,6 @@ msgstr "Копирай linux командата"
 msgid "Copy text"
 msgstr "Копирай текста"

-#: src/components/add-system.tsx
-msgid "Copy the installation command for the agent below, or register agents automatically with a <0>universal token</0>."
-msgstr ""
-
-#: src/components/add-system.tsx
-msgid "Copy the<0>docker-compose.yml</0> content for the agent below, or register agents automatically with a <1>universal token</1>."
-msgstr ""
-
-#: src/components/routes/settings/tokens-fingerprints.tsx
-msgid "Copy YAML"
-msgstr ""
-
 #: src/components/systems-table/systems-table.tsx
 msgid "CPU"
 msgstr "Процесор"
@@ -284,10 +266,6 @@ msgstr "Времеви диапазон по подразбиране"
 msgid "Delete"
 msgstr "Изтрий"

-#: src/components/routes/settings/tokens-fingerprints.tsx
-msgid "Delete fingerprint"
-msgstr ""
-
 #: src/components/systems-table/systems-table.tsx
 msgid "Disk"
 msgstr "Диск"
@@ -351,7 +329,6 @@ msgstr "Въведи имейл адрес за да нулираш парола
 msgid "Enter email address..."
 msgstr "Въведи имейл адрес..."

-#: src/components/routes/settings/tokens-fingerprints.tsx
 #: src/components/routes/settings/notifications.tsx
 #: src/components/routes/settings/config-yaml.tsx
 #: src/components/login/auth-form.tsx
@@ -399,10 +376,6 @@ msgstr "Неуспешно обнови тревога"
 msgid "Filter..."
 msgstr "Филтрирай..."

-#: src/components/routes/settings/tokens-fingerprints.tsx
-msgid "Fingerprint"
-msgstr ""
-
 #: src/components/alerts/alerts-system.tsx
 msgid "For <0>{min}</0> {min, plural, one {minute} other {minutes}}"
 msgstr "За <0>{min}</0> {min, plural, one {минута} other {минути}}"
@@ -426,7 +399,6 @@ msgid "Grid"
 msgstr "Мрежово"

 #: src/components/add-system.tsx
-#: src/components/routes/settings/tokens-fingerprints.tsx
 msgctxt "Button to copy install command"
 msgid "Homebrew command"
 msgstr "Команда Homebrew"
@@ -448,16 +420,6 @@ msgstr "Невалиден имейл адрес."
 msgid "Kernel"
 msgstr "Linux Kernel"

-#. Load average 15 minutes
-#: src/components/systems-table/systems-table.tsx
-msgid "L15"
-msgstr ""
-
-#. Load average 5 minutes
-#: src/components/systems-table/systems-table.tsx
-msgid "L5"
-msgstr ""
-
 #: src/components/routes/settings/general.tsx
 msgid "Language"
 msgstr "Език"
@@ -471,14 +433,6 @@ msgstr "Подреждане"
 msgid "Light"
 msgstr "Светъл"

-#: src/lib/utils.ts
-msgid "Load Average 15m"
-msgstr ""
-
-#: src/lib/utils.ts
-msgid "Load Average 5m"
-msgstr ""
-
 #: src/components/navbar.tsx
 msgid "Log Out"
 msgstr "Изход"
@@ -567,8 +521,6 @@ msgid "On each restart, systems in the database will be updated to match the sys
 msgstr "На всеки рестарт, системите в датабазата ще бъдат обновени да съвпадат със системите зададени във файла."

 #: src/components/systems-table/systems-table.tsx
-#: src/components/routes/settings/tokens-fingerprints.tsx
-#: src/components/routes/settings/tokens-fingerprints.tsx
 msgid "Open menu"
 msgstr "Отвори менюто"

@@ -683,10 +635,6 @@ msgstr "Нулиране на парола"
 msgid "Resume"
 msgstr "Възобнови"

-#: src/components/routes/settings/tokens-fingerprints.tsx
-msgid "Rotate token"
-msgstr ""
-
 #: src/components/routes/settings/notifications.tsx
 msgid "Save address using enter key or comma. Leave blank to disable email notifications."
 msgstr "Запази адреса с enter или запетая. Остави празно за да изключиш нотификациите чрез имейл."
@@ -721,6 +669,7 @@ msgstr "Изпратени"
 msgid "Sets the default time range for charts when a system is viewed."
 msgstr "Задава диапазона за време за диаграмите, когато се разглежда система."

+#: src/components/command-palette.tsx
 #: src/components/command-palette.tsx
 #: src/components/command-palette.tsx
 #: src/components/routes/settings/layout.tsx
@@ -760,7 +709,6 @@ msgstr "Използване на swap"
 #: src/lib/utils.ts
 #: src/components/mode-toggle.tsx
 #: src/components/systems-table/systems-table.tsx
-#: src/components/routes/settings/tokens-fingerprints.tsx
 msgid "System"
 msgstr "Система"

@@ -798,6 +746,14 @@ msgstr "Тествай <0>URL</0>"
 msgid "Test notification sent"
 msgstr "Тестова нотификация изпратена"

+#: src/components/add-system.tsx
+msgid "The agent must be running on the system to connect. Copy the installation command for the agent below."
+msgstr "Агента трябва да работи на системата за да се свърже. Копирай инсталационната команда за агента долу."
+
+#: src/components/add-system.tsx
+msgid "The agent must be running on the system to connect. Copy the<0>docker-compose.yml</0> for the agent below."
+msgstr "Агемта трябва да работи на системата за да се свърже. Копирай <0>docker-compose.yml</0> файла за агента долу."
+
 #: src/components/login/forgot-pass-form.tsx
 msgid "Then log into the backend and reset your user account password in the users table."
 msgstr "След това влез в backend-а и нулирай паролата за потребителския акаунт в таблицата за потребители."
@@ -827,33 +783,6 @@ msgstr "Превключване на мрежа"
 msgid "Toggle theme"
 msgstr "Включи тема"

-#: src/components/add-system.tsx
-#: src/components/routes/settings/tokens-fingerprints.tsx
-msgid "Token"
-msgstr ""
-
-#: src/components/command-palette.tsx
-#: src/components/routes/settings/tokens-fingerprints.tsx
-#: src/components/routes/settings/layout.tsx
-msgid "Tokens & Fingerprints"
-msgstr ""
-
-#: src/components/routes/settings/tokens-fingerprints.tsx
-msgid "Tokens allow agents to connect and register. Fingerprints are stable identifiers unique to each system, set on first connection."
-msgstr ""
-
-#: src/components/routes/settings/tokens-fingerprints.tsx
-msgid "Tokens and fingerprints are used to authenticate WebSocket connections to the hub."
-msgstr ""
-
-#: src/lib/utils.ts
-msgid "Triggers when 15 minute load average exceeds a threshold"
-msgstr ""
-
-#: src/lib/utils.ts
-msgid "Triggers when 5 minute load average exceeds a threshold"
-msgstr ""
-
 #: src/lib/utils.ts
 msgid "Triggers when any sensor exceeds a threshold"
 msgstr "Задейства се, когато някой даден сензор надвиши зададен праг"
@@ -878,10 +807,6 @@ msgstr "Задейства се, когато статуса превключв
 msgid "Triggers when usage of any disk exceeds a threshold"
 msgstr "Задейства се, когато употребата на някой диск надивши зададен праг"

-#: src/components/routes/settings/tokens-fingerprints.tsx
-msgid "Universal token"
-msgstr ""
-
 #. Context: System is up
 #: src/components/systems-table/systems-table.tsx
 #: src/components/routes/system.tsx
@@ -937,12 +862,7 @@ msgstr "Искаш да помогнеш да направиш преводит
 msgid "Webhook / Push notifications"
 msgstr "Webhook / Пуш нотификации"

-#: src/components/routes/settings/tokens-fingerprints.tsx
-msgid "When enabled, this token allows agents to self-register without prior system creation. Expires after one hour or on hub restart."
-msgstr ""
-
 #: src/components/add-system.tsx
-#: src/components/routes/settings/tokens-fingerprints.tsx
 msgctxt "Button to copy install command"
 msgid "Windows command"
 msgstr "Команда Windows"
--- a/beszel/site/src/locales/cs/cs.po
+++ b/beszel/site/src/locales/cs/cs.po
@@ -49,7 +49,6 @@ msgstr "30 dní"

 #. Table column
 #: src/components/systems-table/systems-table.tsx
-#: src/components/routes/settings/tokens-fingerprints.tsx
 msgid "Actions"
 msgstr "Akce"

@@ -77,6 +76,9 @@ msgstr "Přidat URL"
 msgid "Adjust display options for charts."
 msgstr "Upravit možnosti zobrazení pro grafy."

+#: src/components/command-palette.tsx
+#: src/components/command-palette.tsx
+#: src/components/command-palette.tsx
 #: src/components/command-palette.tsx
 #: src/components/command-palette.tsx
 msgid "Admin"
@@ -184,7 +186,7 @@ msgstr "Pro více informací zkontrolujte logy."
 msgid "Check your notification service"
 msgstr "Zkontrolujte službu upozornění"

-#: src/components/ui/input-copy.tsx
+#: src/components/add-system.tsx
 msgid "Click to copy"
 msgstr "Klikněte pro zkopírování"

@@ -211,28 +213,20 @@ msgid "Copied to clipboard"
 msgstr "Zkopírováno do schránky"

 #: src/components/add-system.tsx
-#: src/components/routes/settings/tokens-fingerprints.tsx
 msgctxt "Button to copy docker compose file content"
 msgid "Copy docker compose"
 msgstr "Kopírovat docker compose"

 #: src/components/add-system.tsx
-#: src/components/routes/settings/tokens-fingerprints.tsx
 msgctxt "Button to copy docker run command"
 msgid "Copy docker run"
 msgstr ""

-#: src/components/routes/settings/tokens-fingerprints.tsx
-msgctxt "Environment variables"
-msgid "Copy env"
-msgstr ""
-
 #: src/components/systems-table/systems-table.tsx
 msgid "Copy host"
 msgstr "Kopírovat hostitele"

 #: src/components/add-system.tsx
-#: src/components/routes/settings/tokens-fingerprints.tsx
 msgid "Copy Linux command"
 msgstr "Kopírovat příkaz Linux"

@@ -240,18 +234,6 @@ msgstr "Kopírovat příkaz Linux"
 msgid "Copy text"
 msgstr "Kopírovat text"

-#: src/components/add-system.tsx
-msgid "Copy the installation command for the agent below, or register agents automatically with a <0>universal token</0>."
-msgstr ""
-
-#: src/components/add-system.tsx
-msgid "Copy the<0>docker-compose.yml</0> content for the agent below, or register agents automatically with a <1>universal token</1>."
-msgstr ""
-
-#: src/components/routes/settings/tokens-fingerprints.tsx
-msgid "Copy YAML"
-msgstr ""
-
 #: src/components/systems-table/systems-table.tsx
 msgid "CPU"
 msgstr "Procesor"
@@ -284,10 +266,6 @@ msgstr "Výchozí doba"
 msgid "Delete"
 msgstr "Odstranit"

-#: src/components/routes/settings/tokens-fingerprints.tsx
-msgid "Delete fingerprint"
-msgstr ""
-
 #: src/components/systems-table/systems-table.tsx
 msgid "Disk"
 msgstr "Disk"
@@ -351,7 +329,6 @@ msgstr "Zadejte e-mailovou adresu pro obnovu hesla"
 msgid "Enter email address..."
 msgstr "Zadejte e-mailovou adresu..."

-#: src/components/routes/settings/tokens-fingerprints.tsx
 #: src/components/routes/settings/notifications.tsx
 #: src/components/routes/settings/config-yaml.tsx
 #: src/components/login/auth-form.tsx
@@ -399,10 +376,6 @@ msgstr "Nepodařilo se aktualizovat upozornění"
 msgid "Filter..."
 msgstr "Filtr..."

-#: src/components/routes/settings/tokens-fingerprints.tsx
-msgid "Fingerprint"
-msgstr ""
-
 #: src/components/alerts/alerts-system.tsx
 msgid "For <0>{min}</0> {min, plural, one {minute} other {minutes}}"
 msgstr "Za <0>{min}</0> {min, plural, one {minutu} few {minuty} other {minut}}"
@@ -426,7 +399,6 @@ msgid "Grid"
 msgstr "Mřížka"

 #: src/components/add-system.tsx
-#: src/components/routes/settings/tokens-fingerprints.tsx
 msgctxt "Button to copy install command"
 msgid "Homebrew command"
 msgstr ""
@@ -448,16 +420,6 @@ msgstr "Neplatná e-mailová adresa."
 msgid "Kernel"
 msgstr "Kernel"

-#. Load average 15 minutes
-#: src/components/systems-table/systems-table.tsx
-msgid "L15"
-msgstr ""
-
-#. Load average 5 minutes
-#: src/components/systems-table/systems-table.tsx
-msgid "L5"
-msgstr ""
-
 #: src/components/routes/settings/general.tsx
 msgid "Language"
 msgstr "Jazyk"
@@ -471,14 +433,6 @@ msgstr "Rozvržení"
 msgid "Light"
 msgstr "Světlý"

-#: src/lib/utils.ts
-msgid "Load Average 15m"
-msgstr ""
-
-#: src/lib/utils.ts
-msgid "Load Average 5m"
-msgstr ""
-
 #: src/components/navbar.tsx
 msgid "Log Out"
 msgstr "Odhlásit"
@@ -567,8 +521,6 @@ msgid "On each restart, systems in the database will be updated to match the sys
 msgstr "Při každém restartu budou systémy v databázi aktualizovány tak, aby odpovídaly systémům definovaným v souboru."

 #: src/components/systems-table/systems-table.tsx
-#: src/components/routes/settings/tokens-fingerprints.tsx
-#: src/components/routes/settings/tokens-fingerprints.tsx
 msgid "Open menu"
 msgstr "Otevřít menu"

@@ -683,10 +635,6 @@ msgstr "Obnovit heslo"
 msgid "Resume"
 msgstr "Pokračovat"

-#: src/components/routes/settings/tokens-fingerprints.tsx
-msgid "Rotate token"
-msgstr ""
-
 #: src/components/routes/settings/notifications.tsx
 msgid "Save address using enter key or comma. Leave blank to disable email notifications."
 msgstr "Adresu uložte pomocí klávesy enter nebo čárky. Pro deaktivaci e-mailových oznámení ponechte prázdné pole."
@@ -721,6 +669,7 @@ msgstr "Odeslat"
 msgid "Sets the default time range for charts when a system is viewed."
 msgstr "Nastaví výchozí časový rozsah grafů, když je systém zobrazen."

+#: src/components/command-palette.tsx
 #: src/components/command-palette.tsx
 #: src/components/command-palette.tsx
 #: src/components/routes/settings/layout.tsx
@@ -760,7 +709,6 @@ msgstr "Swap využití"
 #: src/lib/utils.ts
 #: src/components/mode-toggle.tsx
 #: src/components/systems-table/systems-table.tsx
-#: src/components/routes/settings/tokens-fingerprints.tsx
 msgid "System"
 msgstr "Systém"

@@ -798,6 +746,14 @@ msgstr "Test <0>URL</0>"
 msgid "Test notification sent"
 msgstr "Testovací oznámení odesláno"

+#: src/components/add-system.tsx
+msgid "The agent must be running on the system to connect. Copy the installation command for the agent below."
+msgstr "Agent musí být v systému spuštěn, aby se mohl připojit. Zkopírujte níže uvedený instalační příkaz pro agenta."
+
+#: src/components/add-system.tsx
+msgid "The agent must be running on the system to connect. Copy the<0>docker-compose.yml</0> for the agent below."
+msgstr "Agent musí být v systému spuštěn, aby se mohl připojit. Zkopírujte níže uvedený soubor<0>docker-compose.yml</0> pro agenta."
+
 #: src/components/login/forgot-pass-form.tsx
 msgid "Then log into the backend and reset your user account password in the users table."
 msgstr "Poté se přihlaste do backendu a obnovte heslo k uživatelskému účtu v tabulce uživatelů."
@@ -827,33 +783,6 @@ msgstr "Přepnout mřížku"
 msgid "Toggle theme"
 msgstr "Přepnout motiv"

-#: src/components/add-system.tsx
-#: src/components/routes/settings/tokens-fingerprints.tsx
-msgid "Token"
-msgstr ""
-
-#: src/components/command-palette.tsx
-#: src/components/routes/settings/tokens-fingerprints.tsx
-#: src/components/routes/settings/layout.tsx
-msgid "Tokens & Fingerprints"
-msgstr ""
-
-#: src/components/routes/settings/tokens-fingerprints.tsx
-msgid "Tokens allow agents to connect and register. Fingerprints are stable identifiers unique to each system, set on first connection."
-msgstr ""
-
-#: src/components/routes/settings/tokens-fingerprints.tsx
-msgid "Tokens and fingerprints are used to authenticate WebSocket connections to the hub."
-msgstr ""
-
-#: src/lib/utils.ts
-msgid "Triggers when 15 minute load average exceeds a threshold"
-msgstr ""
-
-#: src/lib/utils.ts
-msgid "Triggers when 5 minute load average exceeds a threshold"
-msgstr ""
-
 #: src/lib/utils.ts
 msgid "Triggers when any sensor exceeds a threshold"
 msgstr "Spustí se, když některý senzor překročí prahovou hodnotu"
@@ -878,10 +807,6 @@ msgstr "Spouští se, když se změní dostupnost"
 msgid "Triggers when usage of any disk exceeds a threshold"
 msgstr "Spustí se, když využití disku překročí prahovou hodnotu"

-#: src/components/routes/settings/tokens-fingerprints.tsx
-msgid "Universal token"
-msgstr ""
-
 #. Context: System is up
 #: src/components/systems-table/systems-table.tsx
 #: src/components/routes/system.tsx
@@ -937,12 +862,7 @@ msgstr "Chcete nám pomoci s našimi překlady ještě lépe? Podívejte se na <
 msgid "Webhook / Push notifications"
 msgstr "Webhook / Push oznámení"

-#: src/components/routes/settings/tokens-fingerprints.tsx
-msgid "When enabled, this token allows agents to self-register without prior system creation. Expires after one hour or on hub restart."
-msgstr ""
-
 #: src/components/add-system.tsx
-#: src/components/routes/settings/tokens-fingerprints.tsx
 msgctxt "Button to copy install command"
 msgid "Windows command"
 msgstr ""
--- a/beszel/site/src/locales/da/da.po
+++ b/beszel/site/src/locales/da/da.po
@@ -49,7 +49,6 @@ msgstr "30 dage"

 #. Table column
 #: src/components/systems-table/systems-table.tsx
-#: src/components/routes/settings/tokens-fingerprints.tsx
 msgid "Actions"
 msgstr "Handlinger"

@@ -77,6 +76,9 @@ msgstr "Tilføj URL"
 msgid "Adjust display options for charts."
 msgstr "Juster visningsindstillinger for diagrammer."

+#: src/components/command-palette.tsx
+#: src/components/command-palette.tsx
+#: src/components/command-palette.tsx
 #: src/components/command-palette.tsx
 #: src/components/command-palette.tsx
 msgid "Admin"
@@ -184,7 +186,7 @@ msgstr "Tjek logfiler for flere detaljer."
 msgid "Check your notification service"
 msgstr "Tjek din notifikationstjeneste"

-#: src/components/ui/input-copy.tsx
+#: src/components/add-system.tsx
 msgid "Click to copy"
 msgstr "Klik for at kopiere"

@@ -211,28 +213,20 @@ msgid "Copied to clipboard"
 msgstr "Kopieret til udklipsholder"

 #: src/components/add-system.tsx
-#: src/components/routes/settings/tokens-fingerprints.tsx
 msgctxt "Button to copy docker compose file content"
 msgid "Copy docker compose"
 msgstr "Kopiér docker compose"

 #: src/components/add-system.tsx
-#: src/components/routes/settings/tokens-fingerprints.tsx
 msgctxt "Button to copy docker run command"
 msgid "Copy docker run"
 msgstr "Kopiér docker run"

-#: src/components/routes/settings/tokens-fingerprints.tsx
-msgctxt "Environment variables"
-msgid "Copy env"
-msgstr ""
-
 #: src/components/systems-table/systems-table.tsx
 msgid "Copy host"
 msgstr "Kopier host"

 #: src/components/add-system.tsx
-#: src/components/routes/settings/tokens-fingerprints.tsx
 msgid "Copy Linux command"
 msgstr "Kopier Linux kommando"

@@ -240,18 +234,6 @@ msgstr "Kopier Linux kommando"
 msgid "Copy text"
 msgstr "Kopier tekst"

-#: src/components/add-system.tsx
-msgid "Copy the installation command for the agent below, or register agents automatically with a <0>universal token</0>."
-msgstr ""
-
-#: src/components/add-system.tsx
-msgid "Copy the<0>docker-compose.yml</0> content for the agent below, or register agents automatically with a <1>universal token</1>."
-msgstr ""
-
-#: src/components/routes/settings/tokens-fingerprints.tsx
-msgid "Copy YAML"
-msgstr ""
-
 #: src/components/systems-table/systems-table.tsx
 msgid "CPU"
 msgstr "CPU"
@@ -284,10 +266,6 @@ msgstr "Standard tidsperiode"
 msgid "Delete"
 msgstr "Slet"

-#: src/components/routes/settings/tokens-fingerprints.tsx
-msgid "Delete fingerprint"
-msgstr ""
-
 #: src/components/systems-table/systems-table.tsx
 msgid "Disk"
 msgstr "Disk"
@@ -351,7 +329,6 @@ msgstr "Indtast e-mailadresse for at nulstille adgangskoden"
 msgid "Enter email address..."
 msgstr "Indtast e-mailadresse..."

-#: src/components/routes/settings/tokens-fingerprints.tsx
 #: src/components/routes/settings/notifications.tsx
 #: src/components/routes/settings/config-yaml.tsx
 #: src/components/login/auth-form.tsx
@@ -399,10 +376,6 @@ msgstr "Kunne ikke opdatere alarm"
 msgid "Filter..."
 msgstr "Filter..."

-#: src/components/routes/settings/tokens-fingerprints.tsx
-msgid "Fingerprint"
-msgstr ""
-
 #: src/components/alerts/alerts-system.tsx
 msgid "For <0>{min}</0> {min, plural, one {minute} other {minutes}}"
 msgstr "For <0>{min}</0> {min, plural, one {minut} other {minutter}}"
@@ -426,7 +399,6 @@ msgid "Grid"
 msgstr "Gitter"

 #: src/components/add-system.tsx
-#: src/components/routes/settings/tokens-fingerprints.tsx
 msgctxt "Button to copy install command"
 msgid "Homebrew command"
 msgstr "Homebrew-kommando"
@@ -448,16 +420,6 @@ msgstr "Ugyldig email adresse."
 msgid "Kernel"
 msgstr "Kernel"

-#. Load average 15 minutes
-#: src/components/systems-table/systems-table.tsx
-msgid "L15"
-msgstr ""
-
-#. Load average 5 minutes
-#: src/components/systems-table/systems-table.tsx
-msgid "L5"
-msgstr ""
-
 #: src/components/routes/settings/general.tsx
 msgid "Language"
 msgstr "Sprog"
@@ -471,14 +433,6 @@ msgstr "Layout"
 msgid "Light"
 msgstr "Lys"

-#: src/lib/utils.ts
-msgid "Load Average 15m"
-msgstr ""
-
-#: src/lib/utils.ts
-msgid "Load Average 5m"
-msgstr ""
-
 #: src/components/navbar.tsx
 msgid "Log Out"
 msgstr "Log ud"
@@ -567,8 +521,6 @@ msgid "On each restart, systems in the database will be updated to match the sys
 msgstr "Ved hver genstart vil systemer i databasen blive opdateret til at matche de systemer, der er defineret i filen."

 #: src/components/systems-table/systems-table.tsx
-#: src/components/routes/settings/tokens-fingerprints.tsx
-#: src/components/routes/settings/tokens-fingerprints.tsx
 msgid "Open menu"
 msgstr "Åbn menu"

@@ -683,10 +635,6 @@ msgstr "Nulstil adgangskode"
 msgid "Resume"
 msgstr "Genoptag"

-#: src/components/routes/settings/tokens-fingerprints.tsx
-msgid "Rotate token"
-msgstr ""
-
 #: src/components/routes/settings/notifications.tsx
 msgid "Save address using enter key or comma. Leave blank to disable email notifications."
 msgstr "Gem adresse ved hjælp af enter eller komma. Lad feltet stå tomt for at deaktivere e-mail-meddelelser."
@@ -721,6 +669,7 @@ msgstr "Sendt"
 msgid "Sets the default time range for charts when a system is viewed."
 msgstr "Sætter standardtidsintervallet for diagrammer når et system vises."

+#: src/components/command-palette.tsx
 #: src/components/command-palette.tsx
 #: src/components/command-palette.tsx
 #: src/components/routes/settings/layout.tsx
@@ -760,7 +709,6 @@ msgstr "Swap forbrug"
 #: src/lib/utils.ts
 #: src/components/mode-toggle.tsx
 #: src/components/systems-table/systems-table.tsx
-#: src/components/routes/settings/tokens-fingerprints.tsx
 msgid "System"
 msgstr "System"

@@ -798,6 +746,14 @@ msgstr "Test <0>URL</0>"
 msgid "Test notification sent"
 msgstr "Test notifikation sendt"

+#: src/components/add-system.tsx
+msgid "The agent must be running on the system to connect. Copy the installation command for the agent below."
+msgstr "Agenten skal køre på systemet for at forbinde. Kopier installationskommandoen for agenten nedenfor."
+
+#: src/components/add-system.tsx
+msgid "The agent must be running on the system to connect. Copy the<0>docker-compose.yml</0> for the agent below."
+msgstr "Agenten skal køre på systemet for at forbinde. Kopier <0>docker-compose.yml</0> for agenten nedenfor."
+
 #: src/components/login/forgot-pass-form.tsx
 msgid "Then log into the backend and reset your user account password in the users table."
 msgstr "Log derefter ind på backend og nulstil adgangskoden til din brugerkonto i tabellen brugere."
@@ -827,33 +783,6 @@ msgstr "Slå gitter til/fra"
 msgid "Toggle theme"
 msgstr "Skift tema"

-#: src/components/add-system.tsx
-#: src/components/routes/settings/tokens-fingerprints.tsx
-msgid "Token"
-msgstr ""
-
-#: src/components/command-palette.tsx
-#: src/components/routes/settings/tokens-fingerprints.tsx
-#: src/components/routes/settings/layout.tsx
-msgid "Tokens & Fingerprints"
-msgstr ""
-
-#: src/components/routes/settings/tokens-fingerprints.tsx
-msgid "Tokens allow agents to connect and register. Fingerprints are stable identifiers unique to each system, set on first connection."
-msgstr ""
-
-#: src/components/routes/settings/tokens-fingerprints.tsx
-msgid "Tokens and fingerprints are used to authenticate WebSocket connections to the hub."
-msgstr ""
-
-#: src/lib/utils.ts
-msgid "Triggers when 15 minute load average exceeds a threshold"
-msgstr ""
-
-#: src/lib/utils.ts
-msgid "Triggers when 5 minute load average exceeds a threshold"
-msgstr ""
-
 #: src/lib/utils.ts
 msgid "Triggers when any sensor exceeds a threshold"
 msgstr "Udløser når en sensor overstiger en tærskel"
@@ -878,10 +807,6 @@ msgstr "Udløser når status skifter mellem op og ned"
 msgid "Triggers when usage of any disk exceeds a threshold"
 msgstr "Udløser når brugen af en disk overstiger en tærskel"

-#: src/components/routes/settings/tokens-fingerprints.tsx
-msgid "Universal token"
-msgstr ""
-
 #. Context: System is up
 #: src/components/systems-table/systems-table.tsx
 #: src/components/routes/system.tsx
@@ -937,12 +862,7 @@ msgstr "Vil du hjælpe os med at gøre vores oversættelser endnu bedre? Tjek <0
 msgid "Webhook / Push notifications"
 msgstr "Webhook / Push notifikationer"

-#: src/components/routes/settings/tokens-fingerprints.tsx
-msgid "When enabled, this token allows agents to self-register without prior system creation. Expires after one hour or on hub restart."
-msgstr ""
-
 #: src/components/add-system.tsx
-#: src/components/routes/settings/tokens-fingerprints.tsx
 msgctxt "Button to copy install command"
 msgid "Windows command"
 msgstr "Windows-kommando"
--- a/Show More
+++ b/Show More