diff --git a/.github/workflows/delete-merged-branch.yml b/.github/workflows/delete-merged-branch.yml
index 7d183eee..85bcc2e7 100644
--- a/.github/workflows/delete-merged-branch.yml
+++ b/.github/workflows/delete-merged-branch.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   delete-branch:
-    if: github.event.pull_request.merged == true && github.event.pull_request.head.ref != 'develop'
+    if: github.event.pull_request.merged == true
     runs-on: ubuntu-latest
     permissions:
       contents: write
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
new file mode 100644
index 00000000..560db809
--- /dev/null
+++ b/.github/workflows/format.yml
@@ -0,0 +1,53 @@
+name: Format
+
+on:
+  push:
+    branches:
+      - "feat/**"
+      - "fix/**"
+      - "chore/**"
+
+permissions:
+  contents: write
+
+jobs:
+  format:
+    name: Auto-format
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          ref: ${{ github.ref_name }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          components: rustfmt, clippy
+
+      - name: Install system dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y pkg-config libssl-dev libpq-dev protobuf-compiler
+
+      - uses: actions/cache@v5
+        with:
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+
+      - name: cargo fmt
+        run: cargo fmt --all
+
+      - name: cargo clippy --fix
+        run: cargo clippy --fix --allow-dirty --allow-staged --workspace --all-targets
+
+      - name: Commit and push fixes
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          if ! git diff --quiet; then
+            git add -A
+            git commit -m "style: apply cargo fmt and clippy fixes"
+            git push origin HEAD:${{ github.ref_name }}
+          fi
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 622d56a2..60607534 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -6,12 +6,42 @@ on:
   push:
     branches:
       - main
+  workflow_run:
+    workflows: ["Format"]
+    types: [completed]
   workflow_dispatch:
 
+permissions:
+  contents: read
+  pull-requests: write
+  checks: write
+  actions: read
+
 jobs:
-  clippy:
+  wait-for-format:
+    name: Wait for auto-format
+    runs-on: ubuntu-latest
+    if: github.event_name == 'pull_request'
+    steps:
+      - name: Poll for in-flight format run
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          BRANCH="${{ github.event.pull_request.head.ref }}"
+          REPO="${{ github.repository }}"
+          for _ in $(seq 1 30); do
+            STATUS=$(gh run list --repo "$REPO" --workflow Format --branch "$BRANCH" \
+              --limit 1 --json status -q '.[0].status' 2>/dev/null || echo "")
+            if [ "$STATUS" != "in_progress" ] && [ "$STATUS" != "queued" ]; then
+              exit 0
+            fi
+            sleep 5
+          done
+
+  clippy-push:
     name: Clippy
     runs-on: ubuntu-latest
+    if: github.event_name != 'pull_request'
     steps:
       - uses: actions/checkout@v6
 
@@ -34,11 +64,49 @@ jobs:
       - name: Clippy
         run: cargo clippy --workspace --all-targets -- -D warnings
 
+  clippy-pr:
+    name: Clippy
+    runs-on: ubuntu-latest
+    needs: wait-for-format
+    if: github.event_name == 'pull_request' && always() && (needs.wait-for-format.result == 'success' || needs.wait-for-format.result == 'skipped')
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          ref: ${{ github.event.pull_request.head.ref }}
+
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          components: clippy
+
+      - name: Install system dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y pkg-config libssl-dev libpq-dev protobuf-compiler
+
+      - uses: actions/cache@v5
+        with:
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+
+      - name: Clippy with PR annotations
+        uses: giraffate/clippy-action@v1
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          reporter: github-pr-review
+          fail_on_error: true
+          clippy_flags: --workspace --all-targets -- -D warnings
+
   rustfmt:
     name: rustfmt
     runs-on: ubuntu-latest
+    needs: wait-for-format
+    if: always() && (needs.wait-for-format.result == 'success' || needs.wait-for-format.result == 'skipped')
     steps:
       - uses: actions/checkout@v6
+        with:
+          ref: ${{ github.event.pull_request.head.ref || github.ref }}
 
       - uses: dtolnay/rust-toolchain@stable
         with:
@@ -59,4 +127,16 @@ jobs:
         run: cargo install cargo-audit --locked
 
       - name: Audit
-        run: cargo audit
+        id: audit
+        run: cargo audit --json > audit-report.json || echo "failed=true" >> "$GITHUB_OUTPUT"
+
+      - name: Post audit findings to PR
+        if: github.event_name == 'pull_request' && steps.audit.outputs.failed == 'true'
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          SUMMARY=$(jq -r '.vulnerabilities.list[] | "- **\(.advisory.id)** \(.package.name)@\(.package.version): \(.advisory.title)"' audit-report.json)
+          gh pr comment "${{ github.event.pull_request.number }}" \
+            --repo "${{ github.repository }}" \
+            --body "$(printf 'cargo audit found vulnerabilities:\n\n%s' "$SUMMARY")"
+          exit 1
diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
index 9a920667..c0df19b1 100644
--- a/.github/workflows/prerelease.yml
+++ b/.github/workflows/prerelease.yml
@@ -3,7 +3,7 @@ name: Pre-release Build
 on:
   push:
     branches:
-      - develop
+      - main
   workflow_dispatch:
     inputs:
       version:
@@ -38,7 +38,7 @@ jobs:
           if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
             echo "version=${{ inputs.version }}" >> $GITHUB_OUTPUT
           else
-            BASE=$(grep '^version' Cargo.toml | head -1 | sed 's/.*"\(.*\)"/\1/')
+            BASE=$(grep -m1 '^version' Cargo.toml | sed 's/[^"]*"\([^"]*\)".*/\1/')
             COUNT=$(git rev-list --count HEAD)
             echo "version=${BASE}-alpha.${COUNT}" >> $GITHUB_OUTPUT
           fi
@@ -262,7 +262,7 @@ jobs:
         with:
           repository: ${{ github.repository_owner }}/CSFX-Infra
           token: ${{ secrets.INFRA_REPO_TOKEN }}
-          ref: develop
+          ref: main
           path: infra
 
       - uses: actions/download-artifact@v8
@@ -419,6 +419,6 @@ jobs:
           git add versions.nix
           git diff --cached --quiet && echo "no changes" && exit 0
           git commit -m "chore: update versions.nix for v${VERSION}"
-          git push origin develop
+          git push origin main
           git tag "v${VERSION}"
           git push origin "v${VERSION}"
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/release-build.yml
similarity index 93%
rename from .github/workflows/docker-build.yml
rename to .github/workflows/release-build.yml
index 37f6570f..73a06f04 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/release-build.yml
@@ -1,9 +1,6 @@
 name: Release Build & Push
 
 on:
-  workflow_run:
-    workflows: ["Release Please"]
-    types: [completed]
   workflow_dispatch:
     inputs:
       version:
@@ -19,32 +16,13 @@ jobs:
   prepare:
     name: Prepare Build Context
     runs-on: ubuntu-latest
-    if: >
-      github.event_name == 'workflow_dispatch' ||
-      (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success')
     outputs:
       version: ${{ steps.version.outputs.version }}
-      should_build: ${{ steps.version.outputs.should_build }}
+      should_build: "true"
     steps:
-      - uses: actions/checkout@v6
-
       - name: Resolve version
         id: version
-        run: |
-          if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
-            echo "version=${{ inputs.version }}" >> $GITHUB_OUTPUT
-            echo "should_build=true" >> $GITHUB_OUTPUT
-          else
-            TAG=$(gh release list --limit 1 --json tagName -q '.[0].tagName' 2>/dev/null || echo "")
-            if [ -z "$TAG" ]; then
-              echo "should_build=false" >> $GITHUB_OUTPUT
-            else
-              echo "version=${TAG#v}" >> $GITHUB_OUTPUT
-              echo "should_build=true" >> $GITHUB_OUTPUT
-            fi
-          fi
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: echo "version=${{ inputs.version }}" >> $GITHUB_OUTPUT
 
   build-binaries:
     name: Build ${{ matrix.binary }} (${{ matrix.arch }})
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
index 7b2244ab..2ff69371 100644
--- a/.github/workflows/release-please.yml
+++ b/.github/workflows/release-please.yml
@@ -25,3 +25,12 @@ jobs:
           config-file: release-please-config.json
           manifest-file: .release-please-manifest.json
           token: ${{ secrets.RELEASE_PLEASE_TOKEN || secrets.GITHUB_TOKEN }}
+
+      - name: Trigger full release build
+        if: steps.release.outputs.release_created == 'true'
+        env:
+          GH_TOKEN: ${{ secrets.RELEASE_PLEASE_TOKEN || secrets.GITHUB_TOKEN }}
+        run: |
+          gh workflow run release-build.yml \
+            --repo "${{ github.repository }}" \
+            --field version="${{ steps.release.outputs.version }}"
diff --git a/Cargo.lock b/Cargo.lock
index be7c5be4..6ecc057e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -154,9 +154,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.102"
+version = "1.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"
+checksum = "2a4385e2e34eb35d6b3efe798b9eb88096925d87726c0798709bf56d9ed84af3"
 
 [[package]]
 name = "api-gateway"
@@ -174,6 +174,7 @@ dependencies = [
  "dotenvy",
  "entity",
  "etcd-client",
+ "futures-util",
  "http",
  "hyper",
  "hyper-util",
@@ -186,7 +187,7 @@ dependencies = [
  "opentelemetry_sdk",
  "prometheus",
  "qrcode",
- "rand 0.10.1",
+ "rand 0.10.2",
  "rcgen",
  "reqwest",
  "ring",
@@ -201,6 +202,7 @@ dependencies = [
  "sysinfo",
  "thiserror 2.0.18",
  "tokio",
+ "tokio-tungstenite",
  "totp-rs",
  "tower-http 0.7.0",
  "tower_governor",
@@ -223,9 +225,9 @@ dependencies = [
 
 [[package]]
 name = "arc-swap"
-version = "1.9.1"
+version = "1.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a3a1fd6f75306b68087b831f025c712524bcb19aad54e557b1129cfa0a2b207"
+checksum = "c049c0be4daef0b145cb3555416b3b8ef5b7888a38aea1a3a155801fe7b0810b"
 dependencies = [
  "rustversion",
 ]
@@ -243,9 +245,9 @@ dependencies = [
 
 [[package]]
 name = "arrayvec"
-version = "0.7.6"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
+checksum = "d3fb67a6e08acf24fdeccbac2cb6ac4305825bd1f117462e0e6f2f193345ad56"
 
 [[package]]
 name = "as-slice"
@@ -548,6 +550,7 @@ checksum = "31b698c5f9a010f6573133b09e0de5408834d0c82f8d7475a89fc1867a71cd90"
 dependencies = [
  "axum-core",
  "axum-macros",
+ "base64",
  "bytes",
  "form_urlencoded",
  "futures-util",
@@ -566,8 +569,10 @@ dependencies = [
  "serde_json",
  "serde_path_to_error",
  "serde_urlencoded",
+ "sha1 0.10.6",
  "sync_wrapper",
  "tokio",
+ "tokio-tungstenite",
  "tower",
  "tower-layer",
  "tower-service",
@@ -712,9 +717,9 @@ dependencies = [
 
 [[package]]
 name = "bitvec"
-version = "1.0.1"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
+checksum = "ddcec3d12c579d40898fe0a9a358a803c23e9c52ca3c425707f81c9436211837"
 dependencies = [
  "funty",
  "radium",
@@ -808,9 +813,9 @@ dependencies = [
 
 [[package]]
 name = "borsh"
-version = "1.6.1"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfd1e3f8955a5d7de9fab72fc8373fade9fb8a703968cb200ae3dc6cf08e185a"
+checksum = "2f3f6da4992df95bbcd9af42a6c7dcb994498fc9048230405f3b36ff7cd3f145"
 dependencies = [
  "borsh-derive",
  "bytes",
@@ -819,9 +824,9 @@ dependencies = [
 
 [[package]]
 name = "borsh-derive"
-version = "1.6.1"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfcfdc083699101d5a7965e49925975f2f55060f94f9a05e7187be95d530ca59"
+checksum = "3ae8fb4fb5740e4b2c4884ff95f5f32f5e8479db1e8fd8eb49ddbe09eb09bb7c"
 dependencies = [
  "once_cell",
  "proc-macro-crate",
@@ -884,15 +889,15 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
 
 [[package]]
 name = "bytes"
-version = "1.11.1"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
+checksum = "8ae3f5d315924270530207e2a68396c3cc547f6dca3fbdca317cfb1a51edb593"
 
 [[package]]
 name = "cc"
-version = "1.2.64"
+version = "1.2.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dad887fd958be91b5098c0248def011f4523ab786cd411be668777e55063501f"
+checksum = "e228eec9be7c17ccb640b59b36a5cd805ea2a564a4c5e162c2f659fea30d3b96"
 dependencies = [
  "find-msvc-tools",
  "jobserver",
@@ -920,9 +925,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
 [[package]]
 name = "chacha20"
-version = "0.10.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601"
+checksum = "d524456ba66e72eb8b115ff89e01e497f8e6d11d78b70b1aa13c0fbd97540a81"
 dependencies = [
  "cfg-if",
  "cpufeatures 0.3.0",
@@ -1198,6 +1203,7 @@ name = "csfx-agent"
 version = "0.2.2"
 dependencies = [
  "anyhow",
+ "axum",
  "base64",
  "bollard",
  "chrono",
@@ -1214,6 +1220,7 @@ dependencies = [
  "tracing-subscriber",
  "uuid",
  "x25519-dalek",
+ "x509-parser",
  "zbus",
 ]
 
@@ -2233,9 +2240,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
 [[package]]
 name = "hybrid-array"
-version = "0.4.12"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9155a582abd142abc056962c29e3ce5ff2ad5469f4246b537ed42c5deba857da"
+checksum = "818356c5132c1fede50f837ca96afbe78ff42413047f4abb886217845e1b6c8c"
 dependencies = [
  "typenum",
 ]
@@ -2651,9 +2658,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.102"
+version = "0.3.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03d04c30968dffe80775bd4d7fb676131cd04a1fb46d2686dbffbaec2d9dfd31"
+checksum = "53b44bfcdb3f8d5837a46dae1ca9660a837176eee74a28b229bc626816589102"
 dependencies = [
  "cfg-if",
  "futures-util",
@@ -2732,14 +2739,14 @@ checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981"
 
 [[package]]
 name = "libredox"
-version = "0.1.17"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f02ab6bace2054fb888a3c16f990117b579d14a3088e472d63c6011fa185c9d3"
+checksum = "c943259e342f1e06ff2da7a83eabdfe7f92ce10262688dbf1895ff0b3e6e4652"
 dependencies = [
  "bitflags",
  "libc",
  "plain",
- "redox_syscall 0.8.1",
+ "redox_syscall 0.9.0",
 ]
 
 [[package]]
@@ -2781,9 +2788,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.32"
+version = "0.4.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "953f07c43838f8e6f9758cab68bf5bed85465e7587ebe0b823f1bcd81978ad3a"
+checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad"
 dependencies = [
  "value-bag",
 ]
@@ -3171,9 +3178,9 @@ dependencies = [
 
 [[package]]
 name = "opentelemetry-semantic-conventions"
-version = "0.32.0"
+version = "0.32.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ca2f98a0437b427b4b08f19f1caa3c44db885a202bc12cfea13d6c702243d68"
+checksum = "c913ac17a6c451661ee255f4625d143e51647ae78ebd969b75e41c4442f4fe47"
 
 [[package]]
 name = "opentelemetry_sdk"
@@ -3798,9 +3805,9 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
 
 [[package]]
 name = "quote"
-version = "1.0.45"
+version = "1.0.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"
+checksum = "dfbc457d0c7a0759a614551b11a6409e5951f6c7537be1f1b7682b9ae9230368"
 dependencies = [
  "proc-macro2",
 ]
@@ -3846,9 +3853,9 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.10.1"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207"
+checksum = "c7f5fa3a058cd35567ef9bfa5e75732bee0f9e4c55fa90477bef2dfcdbc4be80"
 dependencies = [
  "chacha20",
  "getrandom 0.4.3",
@@ -4003,9 +4010,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.8.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b44b894f2a6e36457d665d1e08c3866add6ed5e70050c1b4ba8a8ddedb02ce7"
+checksum = "c5102a6aaa05aa011a238e178e6bca86d2cb56fc9f586d37cb80f5bca6e07759"
 dependencies = [
  "bitflags",
 ]
@@ -4045,6 +4052,7 @@ version = "0.2.2"
 dependencies = [
  "anyhow",
  "axum",
+ "base64",
  "chrono",
  "dotenvy",
  "entity",
@@ -4090,6 +4098,7 @@ dependencies = [
  "base64",
  "bytes",
  "futures-core",
+ "futures-util",
  "http",
  "http-body",
  "http-body-util",
@@ -4108,12 +4117,14 @@ dependencies = [
  "sync_wrapper",
  "tokio",
  "tokio-rustls",
+ "tokio-util",
  "tower",
  "tower-http 0.6.11",
  "tower-service",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
+ "wasm-streams",
  "web-sys",
  "webpki-roots 1.0.8",
 ]
@@ -4295,9 +4306,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.40"
+version = "0.23.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef86cd5876211988985292b91c96a8f2d298df24e75989a43a3c73f2d4d8168b"
+checksum = "6b92b125634d9b795e7beca796cc790df15a7fb38323bf3196fda83292d06b1f"
 dependencies = [
  "log",
  "once_cell",
@@ -4331,9 +4342,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.14.1"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30a7197ae7eb376e574fe940d068c30fe0462554a3ddbe4eca7838e049c937a9"
+checksum = "764899a24af3980067ee14bc143654f297b22eaebfe3c7b6b211920a5a59b046"
 dependencies = [
  "zeroize",
 ]
@@ -4424,7 +4435,9 @@ dependencies = [
  "sea-orm",
  "serde",
  "serde_json",
+ "serde_yaml",
  "shared",
+ "thiserror 2.0.18",
  "tokio",
  "tracing",
  "tracing-opentelemetry",
@@ -4758,6 +4771,19 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde_yaml"
+version = "0.9.34+deprecated"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
+dependencies = [
+ "indexmap",
+ "itoa",
+ "ryu",
+ "serde",
+ "unsafe-libyaml",
+]
+
 [[package]]
 name = "sha1"
 version = "0.10.6"
@@ -5331,9 +5357,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.49"
+version = "0.3.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "711a53c2d47bbd818258c498c8dbfe186a2526c631495cfe7e078567f86b8469"
+checksum = "18dfaaeddcb932337b5e7866ee7d0ce9b76d2fd092997146f187ec09b4558a50"
 dependencies = [
  "deranged",
  "num-conv",
@@ -5351,9 +5377,9 @@ checksum = "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109"
 
 [[package]]
 name = "time-macros"
-version = "0.2.29"
+version = "0.2.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71c652a3727a9cbb9a02f707f530b618ce00d0ccd762009c8c23bd191df3c17d"
+checksum = "c431b87111666e491a90baa837f914fb45cd5dc3c268591b0220ff5057f2085f"
 dependencies = [
  "num-conv",
  "time-core",
@@ -5434,6 +5460,18 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "tokio-tungstenite"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f72a05e828585856dacd553fba484c242c46e391fb0e58917c942ee9202915c"
+dependencies = [
+ "futures-util",
+ "log",
+ "tokio",
+ "tungstenite",
+]
+
 [[package]]
 name = "tokio-util"
 version = "0.7.18"
@@ -5560,9 +5598,9 @@ dependencies = [
 
 [[package]]
 name = "totp-rs"
-version = "5.7.1"
+version = "5.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2b36a9dd327e9f401320a2cb4572cc76ff43742bcfc3291f871691050f140ba"
+checksum = "50e69a15e21b2ff22c415446983978bded3244195f17d59cb113551c1e806f91"
 dependencies = [
  "base32",
  "constant_time_eq",
@@ -5750,6 +5788,22 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
+[[package]]
+name = "tungstenite"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c01152af293afb9c7c2a57e4b559c5620b421f6d133261c60dd2d0cdb38e6b8"
+dependencies = [
+ "bytes",
+ "data-encoding",
+ "http",
+ "httparse",
+ "log",
+ "rand 0.9.4",
+ "sha1 0.10.6",
+ "thiserror 2.0.18",
+]
+
 [[package]]
 name = "typenum"
 version = "1.20.1"
@@ -5816,6 +5870,12 @@ dependencies = [
  "subtle",
 ]
 
+[[package]]
+name = "unsafe-libyaml"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
+
 [[package]]
 name = "untrusted"
 version = "0.9.0"
@@ -5897,9 +5957,9 @@ dependencies = [
 
 [[package]]
 name = "uuid"
-version = "1.23.3"
+version = "1.23.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "144d6b123cef80b301b8f72a9e2ca4370ddec21950d0a103dd22c437006d2db7"
+checksum = "bf80a72845275afea99e7f2b434723d3bc7e38470fcd1c7ed39a599c73319a53"
 dependencies = [
  "getrandom 0.4.3",
  "js-sys",
@@ -6015,9 +6075,9 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.125"
+version = "0.2.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ddb3f79143bced6de84270411622a2699cee572fc0875aeaf1e7867cf9fca1a"
+checksum = "4b067c0c11094aef6b7a801c1e34a26affafdf3d051dba08456b868789aaf9a4"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -6029,9 +6089,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.75"
+version = "0.4.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "503b14d284f2c8dac03b819967e155ea753f573586193b2b2c95990cb5d69280"
+checksum = "c62df1340f32221cb9c54d6a27b030e3dba64361d4a95bed55f9aacb44da291d"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -6039,9 +6099,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.125"
+version = "0.2.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e21a184b13fb19e157296e2c46056aec9092264fab83e4ba59e68c61b323c3d"
+checksum = "167ce5e579f6bcf889c4f7175a8a5a585de84e8ff93976ce393efa5f2837aab1"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -6049,9 +6109,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.125"
+version = "0.2.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fecefd9c35bd935a20fc3fc344b5f29138961e4f47fb03297d88f2587afb5ebd"
+checksum = "f3997c7839262f4ef12cf90b818d6340c18e80f263f1a94bf157d0ec4420380e"
 dependencies = [
  "bumpalo",
  "proc-macro2",
@@ -6062,18 +6122,31 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.125"
+version = "0.2.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23939e44bb9a5d7576fa2b563dc2e136628f1224e88a8deed09e04858b77871f"
+checksum = "dc1b4cb0cc549fcf58d7dfc081778139b3d283a081644e833e84682ad71cea24"
 dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "wasm-streams"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65"
+dependencies = [
+ "futures-util",
+ "js-sys",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
 [[package]]
 name = "web-sys"
-version = "0.3.102"
+version = "0.3.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6430a72df5eb332242960fe84b3002a241163998241eb596d4f739b9757061d"
+checksum = "8622dcb61c0bcc9fffa6938bed81210af2da9a7e4a1a834b2e37a59b6dfb6141"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -6769,9 +6842,9 @@ dependencies = [
 
 [[package]]
 name = "zlib-rs"
-version = "0.6.3"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3be3d40e40a133f9c916ee3f9f4fa2d9d63435b5fbe1bfc6d9dae0aa0ada1513"
+checksum = "5431d5661c32445236631278f27946e444ddafe4684cac70b185272d4f9c52d5"
 
 [[package]]
 name = "zmij"
diff --git a/Cargo.toml b/Cargo.toml
index a96b7b0e..8c1be5b9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -38,10 +38,12 @@ tower-http = { version = "0.7.0", features = ["cors", "trace", "fs"] }
 hyper = "1.5"
 hyper-util = { version = "0.1", features = ["client", "client-legacy", "http1", "http2", "tokio"] }
 http = "1.1"
+tokio-tungstenite = "0.29"
 
 # Serialization
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0.145"
+serde_yaml = "0.9"
 
 # Logging & Tracing
 tracing = "0.1"
diff --git a/agent/Cargo.toml b/agent/Cargo.toml
index f4321e38..85ecbafc 100644
--- a/agent/Cargo.toml
+++ b/agent/Cargo.toml
@@ -27,3 +27,5 @@ futures-util = { workspace = true }
 zbus = { workspace = true }
 x25519-dalek = { workspace = true }
 base64 = { workspace = true }
+axum = { workspace = true, features = ["ws"] }
+x509-parser = { workspace = true }
diff --git a/agent/src/client.rs b/agent/src/client.rs
index d9b79271..0bd04849 100644
--- a/agent/src/client.rs
+++ b/agent/src/client.rs
@@ -52,6 +52,8 @@ struct HeartbeatRequest {
     uptime_seconds: Option<u64>,
     wg_public_key: Option<String>,
     wg_endpoint: Option<String>,
+    wg_tunnel_ip: Option<String>,
+    agent_version: Option<String>,
 }
 
 #[derive(Debug, Serialize, Deserialize, Clone)]
@@ -86,6 +88,8 @@ pub struct AssignedWorkload {
     pub volume_mounts: Option<Vec<VolumeMount>>,
     pub status: String,
     pub container_id: Option<String>,
+    pub stack_id: Option<String>,
+    pub service_name: Option<String>,
 }
 
 pub struct ApiClient {
@@ -94,12 +98,14 @@ pub struct ApiClient {
     cert_pem: Option<String>,
     wg_public_key: String,
     wg_endpoint: Option<String>,
+    wg_tunnel_ip: Option<String>,
 }
 
 pub fn generate_wg_keypair() -> (String, String) {
     let rng = SystemRandom::new();
     let mut private_bytes = [0u8; 32];
-    rng.fill(&mut private_bytes).expect("failed to generate WireGuard key");
+    rng.fill(&mut private_bytes)
+        .expect("failed to generate WireGuard key");
     private_bytes[0] &= 248;
     private_bytes[31] &= 127;
     private_bytes[31] |= 64;
@@ -109,7 +115,12 @@ pub fn generate_wg_keypair() -> (String, String) {
 }
 
 impl ApiClient {
-    pub fn new(gateway_url: String, wg_public_key: String, wg_endpoint: Option<String>) -> Result<Self> {
+    pub fn new(
+        gateway_url: String,
+        wg_public_key: String,
+        wg_endpoint: Option<String>,
+        wg_tunnel_ip: Option<String>,
+    ) -> Result<Self> {
         let client = Client::builder()
             .timeout(std::time::Duration::from_secs(30))
             .danger_accept_invalid_certs(true)
@@ -122,6 +133,7 @@ impl ApiClient {
             cert_pem: None,
             wg_public_key,
             wg_endpoint,
+            wg_tunnel_ip,
         })
     }
 
@@ -243,6 +255,8 @@ impl ApiClient {
                 uptime_seconds,
                 wg_public_key: Some(self.wg_public_key.clone()),
                 wg_endpoint: self.wg_endpoint.clone(),
+                wg_tunnel_ip: self.wg_tunnel_ip.clone(),
+                agent_version: Some(env!("CARGO_PKG_VERSION").to_string()),
             });
 
         if let Some(ref cert_pem) = self.cert_pem {
diff --git a/agent/src/docker.rs b/agent/src/docker.rs
index 5d883000..d67bfb1c 100644
--- a/agent/src/docker.rs
+++ b/agent/src/docker.rs
@@ -1,10 +1,16 @@
 use anyhow::{Context, Result};
-use bollard::models::{ContainerCreateBody, HostConfig};
+use axum::body::Bytes;
+use bollard::exec::{CreateExecOptions, StartExecOptions, StartExecResults};
+use bollard::models::{
+    ContainerCreateBody, ContainerStateStatusEnum, EndpointSettings, HostConfig,
+    NetworkCreateRequest, NetworkingConfig,
+};
 use bollard::query_parameters::{
-    CreateContainerOptionsBuilder, CreateImageOptionsBuilder, StartContainerOptionsBuilder,
+    CreateContainerOptionsBuilder, CreateImageOptionsBuilder, InspectContainerOptionsBuilder,
+    ListNetworksOptionsBuilder, LogsOptionsBuilder, StartContainerOptionsBuilder,
 };
 use bollard::Docker;
-use futures_util::StreamExt;
+use futures_util::{Stream, StreamExt};
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 use std::path::Path;
@@ -38,6 +44,8 @@ pub struct WorkloadSpec {
     pub env_vars: Option<HashMap<String, String>>,
     pub ports: Option<Vec<PortMapping>>,
     pub volume_mounts: Option<Vec<VolumeMount>>,
+    pub stack_id: Option<String>,
+    pub service_name: Option<String>,
 }
 
 pub struct DockerManager {
@@ -89,6 +97,44 @@ impl DockerManager {
         Ok(())
     }
 
+    pub async fn ensure_stack_network(&self, stack_id: &str) -> Result<String> {
+        let network_name = format!("csfx-stack-{}", stack_id);
+
+        let filters = HashMap::from([("name".to_string(), vec![network_name.clone()])]);
+        let list_options = ListNetworksOptionsBuilder::default()
+            .filters(&filters)
+            .build();
+
+        let existing = self
+            .docker
+            .list_networks(Some(list_options))
+            .await
+            .context("Failed to list networks")?;
+
+        if let Some(network) = existing
+            .into_iter()
+            .find(|n| n.name.as_deref() == Some(&network_name))
+        {
+            return Ok(network.id.unwrap_or(network_name));
+        }
+
+        let config = NetworkCreateRequest {
+            name: network_name.clone(),
+            driver: Some("bridge".to_string()),
+            ..Default::default()
+        };
+
+        let response = self
+            .docker
+            .create_network(config)
+            .await
+            .context("Failed to create stack network")?;
+
+        info!(stack_id = %stack_id, network = %network_name, "Stack network ready");
+
+        Ok(response.id)
+    }
+
     pub async fn start_container(&self, spec: &WorkloadSpec) -> Result<String> {
         let container_name = format!("csfx-{}", spec.workload_id);
 
@@ -122,6 +168,23 @@ impl DockerManager {
             ..Default::default()
         };
 
+        let networking_config = match &spec.stack_id {
+            Some(stack_id) => {
+                let network_name = self.ensure_stack_network(stack_id).await?;
+                let aliases = spec.service_name.clone().map(|name| vec![name]);
+                Some(NetworkingConfig {
+                    endpoints_config: Some(HashMap::from([(
+                        network_name,
+                        EndpointSettings {
+                            aliases,
+                            ..Default::default()
+                        },
+                    )])),
+                })
+            }
+            None => None,
+        };
+
         let config = ContainerCreateBody {
             image: Some(spec.image.clone()),
             env,
@@ -131,6 +194,7 @@ impl DockerManager {
                 Some(exposed_ports)
             },
             host_config: Some(host_config),
+            networking_config,
             labels: Some(HashMap::from([
                 ("csfx.workload_id".to_string(), spec.workload_id.clone()),
                 ("csfx.managed".to_string(), "true".to_string()),
@@ -164,6 +228,82 @@ impl DockerManager {
         Ok(container.id)
     }
 
+    pub async fn inspect_status(&self, container_id: &str) -> Result<String> {
+        let options = InspectContainerOptionsBuilder::default().build();
+
+        let inspect = self
+            .docker
+            .inspect_container(container_id, Some(options))
+            .await
+            .context("Failed to inspect container")?;
+
+        let state = inspect.state.unwrap_or_default();
+        let status = state.status.unwrap_or(ContainerStateStatusEnum::EMPTY);
+        let exit_code = state.exit_code.unwrap_or(0);
+
+        Ok(match status {
+            ContainerStateStatusEnum::CREATED => "creating".to_string(),
+            ContainerStateStatusEnum::RUNNING => "running".to_string(),
+            ContainerStateStatusEnum::RESTARTING | ContainerStateStatusEnum::PAUSED => {
+                "running".to_string()
+            }
+            ContainerStateStatusEnum::EXITED if exit_code == 0 => "stopped".to_string(),
+            ContainerStateStatusEnum::EXITED | ContainerStateStatusEnum::DEAD => {
+                "failed".to_string()
+            }
+            ContainerStateStatusEnum::REMOVING | ContainerStateStatusEnum::STOPPING => {
+                "stopped".to_string()
+            }
+            ContainerStateStatusEnum::EMPTY => "failed".to_string(),
+        })
+    }
+
+    pub fn logs(
+        &self,
+        container_id: &str,
+    ) -> impl Stream<Item = Result<Bytes, std::io::Error>> + Send + 'static {
+        let options = LogsOptionsBuilder::default()
+            .stdout(true)
+            .stderr(true)
+            .follow(true)
+            .tail("200")
+            .build();
+
+        self.docker
+            .logs(container_id, Some(options))
+            .map(|item| match item {
+                Ok(log_output) => Ok(log_output.into_bytes()),
+                Err(e) => Err(std::io::Error::other(e.to_string())),
+            })
+    }
+
+    pub async fn exec(&self, container_id: &str) -> Result<StartExecResults> {
+        let create_options = CreateExecOptions {
+            attach_stdin: Some(true),
+            attach_stdout: Some(true),
+            attach_stderr: Some(true),
+            tty: Some(true),
+            cmd: Some(vec!["/bin/sh".to_string()]),
+            ..Default::default()
+        };
+
+        let created = self
+            .docker
+            .create_exec(container_id, create_options)
+            .await
+            .context("Failed to create exec session")?;
+
+        let start_options = StartExecOptions {
+            tty: true,
+            ..Default::default()
+        };
+
+        self.docker
+            .start_exec(&created.id, Some(start_options))
+            .await
+            .context("Failed to start exec session")
+    }
+
     pub async fn stop_container(&self, container_id: &str) -> Result<()> {
         self.docker
             .stop_container(container_id, None)
diff --git a/agent/src/main.rs b/agent/src/main.rs
index 003bfea1..86585492 100644
--- a/agent/src/main.rs
+++ b/agent/src/main.rs
@@ -3,6 +3,7 @@ mod config;
 mod docker;
 mod pki;
 mod rbd;
+mod server;
 mod ssh_keys;
 mod system;
 mod update_watch;
@@ -52,10 +53,16 @@ async fn main() -> Result<()> {
         .unwrap_or(60);
 
     let wg_endpoint = std::env::var("CSFX_WG_ENDPOINT").ok();
+    let wg_tunnel_ip = std::env::var("CSFX_WG_TUNNEL_IP").ok();
     let (_wg_private_key, wg_public_key) = client::generate_wg_keypair();
 
-    let api_client = client::ApiClient::new(gateway_url.clone(), wg_public_key, wg_endpoint)
-        .context("Failed to initialize API client")?;
+    let api_client = client::ApiClient::new(
+        gateway_url.clone(),
+        wg_public_key,
+        wg_endpoint,
+        wg_tunnel_ip,
+    )
+    .context("Failed to initialize API client")?;
 
     let agent_pki = pki::AgentPki::load_or_generate().context("Failed to initialize PKI")?;
 
@@ -97,8 +104,28 @@ async fn main() -> Result<()> {
     let running_containers: Arc<Mutex<HashMap<String, String>>> =
         Arc::new(Mutex::new(HashMap::new()));
 
+    let workload_phases: Arc<Mutex<HashMap<String, String>>> = Arc::new(Mutex::new(HashMap::new()));
+
     let mounted_volumes: Arc<Mutex<HashMap<String, String>>> = Arc::new(Mutex::new(HashMap::new()));
 
+    if let Some(port) = std::env::var("CSFX_AGENT_PORT")
+        .ok()
+        .and_then(|v| v.parse::<u16>().ok())
+    {
+        let server_state = server::ServerState {
+            docker: docker_manager.clone(),
+            running_containers: running_containers.clone(),
+            agent_id,
+        };
+        tokio::spawn(async move {
+            if let Err(e) = server::run(server_state, port).await {
+                error!(error = %e, "agent inbound server stopped");
+            }
+        });
+    } else {
+        info!("CSFX_AGENT_PORT not set, agent inbound server disabled");
+    }
+
     run_heartbeat_loop(
         &api_client,
         agent_id,
@@ -106,6 +133,7 @@ async fn main() -> Result<()> {
         heartbeat_interval_secs,
         docker_manager,
         running_containers,
+        workload_phases,
         mounted_volumes,
     )
     .await;
@@ -183,6 +211,7 @@ async fn run_heartbeat_loop(
     interval_secs: u64,
     docker: Arc<Mutex<Option<docker::DockerManager>>>,
     running_containers: Arc<Mutex<HashMap<String, String>>>,
+    workload_phases: Arc<Mutex<HashMap<String, String>>>,
     mounted_volumes: Arc<Mutex<HashMap<String, String>>>,
 ) {
     let mut interval = tokio::time::interval(Duration::from_secs(interval_secs));
@@ -193,9 +222,9 @@ async fn run_heartbeat_loop(
         tokio::select! {
             _ = interval.tick() => {
                 process_volumes(client, agent_id, api_key, &mounted_volumes).await;
-                process_workloads(client, api_key, &docker, &running_containers, &mounted_volumes).await;
+                process_workloads(client, api_key, &docker, &running_containers, &workload_phases, &mounted_volumes).await;
 
-                let statuses = build_container_statuses(&running_containers).await;
+                let statuses = build_container_statuses(&docker, &running_containers, &workload_phases).await;
                 let metrics = system::collect_metrics();
 
                 match client.heartbeat(agent_id, api_key, Some(statuses), Some(metrics)).await {
@@ -315,6 +344,7 @@ async fn process_workloads(
     api_key: &str,
     docker: &Arc<Mutex<Option<docker::DockerManager>>>,
     running_containers: &Arc<Mutex<HashMap<String, String>>>,
+    workload_phases: &Arc<Mutex<HashMap<String, String>>>,
     mounted_volumes: &Arc<Mutex<HashMap<String, String>>>,
 ) {
     let workloads = match client.fetch_assigned_workloads(api_key).await {
@@ -342,7 +372,9 @@ async fn process_workloads(
             }
         }
     }
-    let docker = docker_guard.as_ref().expect("docker manager initialized above");
+    let docker = docker_guard
+        .as_ref()
+        .expect("docker manager initialized above");
 
     for workload in workloads {
         let already_running = running_containers.lock().await.contains_key(&workload.id);
@@ -353,8 +385,14 @@ async fn process_workloads(
 
         info!(workload_id = %workload.id, image = %workload.image, "Starting workload");
 
+        workload_phases
+            .lock()
+            .await
+            .insert(workload.id.clone(), "pulling".to_string());
+
         if let Err(e) = docker.pull_image(&workload.image).await {
             warn!(workload_id = %workload.id, error = %e, "Failed to pull image");
+            workload_phases.lock().await.remove(&workload.id);
             continue;
         }
 
@@ -368,6 +406,11 @@ async fn process_workloads(
             }
         }
 
+        workload_phases
+            .lock()
+            .await
+            .insert(workload.id.clone(), "creating".to_string());
+
         let spec = docker::WorkloadSpec {
             workload_id: workload.id.clone(),
             name: workload.name.clone(),
@@ -383,10 +426,16 @@ async fn process_workloads(
                     })
                     .collect()
             }),
+            stack_id: workload.stack_id,
+            service_name: workload.service_name,
         };
 
         match docker.start_container(&spec).await {
             Ok(container_id) => {
+                workload_phases
+                    .lock()
+                    .await
+                    .insert(workload.id.clone(), "starting".to_string());
                 running_containers
                     .lock()
                     .await
@@ -398,6 +447,7 @@ async fn process_workloads(
                 );
             }
             Err(e) => {
+                workload_phases.lock().await.remove(&workload.id);
                 warn!(workload_id = %workload.id, error = %e, "Failed to start container");
             }
         }
@@ -405,16 +455,48 @@ async fn process_workloads(
 }
 
 async fn build_container_statuses(
+    docker: &Arc<Mutex<Option<docker::DockerManager>>>,
     running_containers: &Arc<Mutex<HashMap<String, String>>>,
+    workload_phases: &Arc<Mutex<HashMap<String, String>>>,
 ) -> Vec<client::ContainerStatus> {
-    running_containers
-        .lock()
-        .await
-        .iter()
-        .map(|(workload_id, container_id)| client::ContainerStatus {
+    let containers = running_containers.lock().await.clone();
+    let mut statuses = Vec::with_capacity(containers.len());
+
+    let docker_guard = docker.lock().await;
+    for (workload_id, container_id) in containers.iter() {
+        let status = match docker_guard.as_ref() {
+            Some(dm) => match dm.inspect_status(container_id).await {
+                Ok(s) => s,
+                Err(e) => {
+                    warn!(workload_id = %workload_id, container_id = %container_id, error = %e, "Failed to inspect container");
+                    "failed".to_string()
+                }
+            },
+            None => "failed".to_string(),
+        };
+
+        if status != "creating" {
+            workload_phases.lock().await.remove(workload_id);
+        }
+
+        statuses.push(client::ContainerStatus {
             workload_id: workload_id.clone(),
             container_id: container_id.clone(),
-            status: "running".to_string(),
-        })
-        .collect()
+            status,
+        });
+    }
+    drop(docker_guard);
+
+    let phases = workload_phases.lock().await;
+    for (workload_id, phase) in phases.iter() {
+        if !containers.contains_key(workload_id) {
+            statuses.push(client::ContainerStatus {
+                workload_id: workload_id.clone(),
+                container_id: String::new(),
+                status: phase.clone(),
+            });
+        }
+    }
+
+    statuses
 }
diff --git a/agent/src/server.rs b/agent/src/server.rs
new file mode 100644
index 00000000..eab38338
--- /dev/null
+++ b/agent/src/server.rs
@@ -0,0 +1,334 @@
+use anyhow::{anyhow, Context, Result};
+use axum::{
+    extract::ws::{Message, WebSocket, WebSocketUpgrade},
+    extract::{ConnectInfo, Path, State},
+    http::{HeaderMap, StatusCode},
+    routing::get,
+    Router,
+};
+use base64::{engine::general_purpose::URL_SAFE_NO_PAD, Engine};
+use bollard::exec::StartExecResults;
+use futures_util::{SinkExt, StreamExt};
+use ring::signature::{UnparsedPublicKey, ECDSA_P256_SHA256_ASN1};
+use std::collections::HashMap;
+use std::net::{IpAddr, Ipv4Addr, SocketAddr};
+use std::sync::Arc;
+use tokio::io::AsyncWriteExt;
+use tokio::sync::Mutex;
+use tracing::{info, warn};
+
+use crate::docker::DockerManager;
+use crate::pki::AgentPki;
+use crate::system::LiveMetricsCollector;
+
+const TICKET_HEADER: &str = "X-Csfx-Proxy-Ticket";
+pub const METRICS_TICKET_SCOPE: &str = "__node_metrics__";
+
+#[derive(Clone)]
+pub struct ServerState {
+    pub docker: Arc<Mutex<Option<DockerManager>>>,
+    pub running_containers: Arc<Mutex<HashMap<String, String>>>,
+    pub agent_id: uuid::Uuid,
+}
+
+pub async fn run(state: ServerState, port: u16) -> Result<()> {
+    let app = Router::new()
+        .route("/logs/{workload_id}", get(logs_handler))
+        .route("/exec/{workload_id}", get(exec_handler))
+        .route("/metrics/stream", get(metrics_stream_handler))
+        .with_state(state);
+
+    let addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::UNSPECIFIED), port);
+    let listener = tokio::net::TcpListener::bind(addr)
+        .await
+        .context("Failed to bind agent inbound server")?;
+
+    info!(port = port, "csfx-agent inbound server listening");
+
+    axum::serve(
+        listener,
+        app.into_make_service_with_connect_info::<SocketAddr>(),
+    )
+    .await
+    .context("Agent inbound server stopped unexpectedly")
+}
+
+fn is_internal_source(addr: &SocketAddr) -> bool {
+    let ip = addr.ip();
+    ip.is_loopback()
+        || match ip {
+            IpAddr::V4(v4) => {
+                let octets = v4.octets();
+                octets[0] == 10
+                    || (octets[0] == 172 && octets[1] >= 16 && octets[1] <= 31)
+                    || (octets[0] == 192 && octets[1] == 168)
+            }
+            IpAddr::V6(_) => false,
+        }
+}
+
+struct TicketClaims {
+    agent_id: String,
+    workload_id: String,
+    expires_at: i64,
+}
+
+fn verify_ticket(headers: &HeaderMap, workload_id: &str, expected_agent_id: &str) -> Result<()> {
+    let raw = headers
+        .get(TICKET_HEADER)
+        .and_then(|v| v.to_str().ok())
+        .ok_or_else(|| anyhow!("missing {} header", TICKET_HEADER))?;
+
+    let (payload_b64, signature_b64) = raw
+        .split_once('.')
+        .ok_or_else(|| anyhow!("malformed proxy ticket"))?;
+
+    let payload_bytes = URL_SAFE_NO_PAD
+        .decode(payload_b64)
+        .context("invalid ticket payload encoding")?;
+    let signature = URL_SAFE_NO_PAD
+        .decode(signature_b64)
+        .context("invalid ticket signature encoding")?;
+
+    let ca_pem = AgentPki::load_ca_pem().context("failed to load trusted CA certificate")?;
+    let public_key_bytes = extract_ca_public_key(&ca_pem)?;
+
+    let verifier = UnparsedPublicKey::new(&ECDSA_P256_SHA256_ASN1, &public_key_bytes);
+    verifier
+        .verify(&payload_bytes, &signature)
+        .map_err(|_| anyhow!("proxy ticket signature verification failed"))?;
+
+    let claims = parse_claims(&payload_bytes)?;
+
+    if claims.workload_id != workload_id {
+        return Err(anyhow!("proxy ticket workload_id mismatch"));
+    }
+    if claims.agent_id != expected_agent_id {
+        return Err(anyhow!("proxy ticket agent_id mismatch"));
+    }
+    if claims.expires_at < chrono::Utc::now().timestamp() {
+        return Err(anyhow!("proxy ticket expired"));
+    }
+
+    Ok(())
+}
+
+fn parse_claims(payload_bytes: &[u8]) -> Result<TicketClaims> {
+    let payload = std::str::from_utf8(payload_bytes).context("proxy ticket payload not utf8")?;
+    let mut parts = payload.splitn(3, '.');
+
+    let agent_id = parts
+        .next()
+        .ok_or_else(|| anyhow!("proxy ticket missing agent_id"))?
+        .to_string();
+    let workload_id = parts
+        .next()
+        .ok_or_else(|| anyhow!("proxy ticket missing workload_id"))?
+        .to_string();
+    let expires_at = parts
+        .next()
+        .ok_or_else(|| anyhow!("proxy ticket missing expiry"))?
+        .parse::<i64>()
+        .context("proxy ticket expiry not a valid timestamp")?;
+
+    Ok(TicketClaims {
+        agent_id,
+        workload_id,
+        expires_at,
+    })
+}
+
+fn extract_ca_public_key(ca_pem: &str) -> Result<Vec<u8>> {
+    let (_, pem) =
+        x509_parser::pem::parse_x509_pem(ca_pem.as_bytes()).context("failed to parse CA PEM")?;
+    let cert = pem.parse_x509().context("failed to parse CA certificate")?;
+    Ok(cert
+        .tbs_certificate
+        .subject_pki
+        .subject_public_key
+        .data
+        .to_vec())
+}
+
+async fn logs_handler(
+    State(state): State<ServerState>,
+    Path(workload_id): Path<String>,
+    ConnectInfo(addr): ConnectInfo<SocketAddr>,
+    headers: HeaderMap,
+) -> Result<axum::body::Body, (StatusCode, String)> {
+    if !is_internal_source(&addr) {
+        warn!(source = %addr, "rejected agent inbound request from non-internal source");
+        return Err((StatusCode::FORBIDDEN, "source not allowed".to_string()));
+    }
+
+    verify_ticket(&headers, &workload_id, &state.agent_id.to_string())
+        .map_err(|e| (StatusCode::UNAUTHORIZED, e.to_string()))?;
+
+    let container_id = state
+        .running_containers
+        .lock()
+        .await
+        .get(&workload_id)
+        .cloned()
+        .ok_or((
+            StatusCode::NOT_FOUND,
+            "workload not running here".to_string(),
+        ))?;
+
+    let docker_guard = state.docker.lock().await;
+    let docker = docker_guard.as_ref().ok_or((
+        StatusCode::SERVICE_UNAVAILABLE,
+        "docker unavailable".to_string(),
+    ))?;
+
+    let stream = docker.logs(&container_id);
+    Ok(axum::body::Body::from_stream(stream))
+}
+
+async fn exec_handler(
+    State(state): State<ServerState>,
+    Path(workload_id): Path<String>,
+    ConnectInfo(addr): ConnectInfo<SocketAddr>,
+    headers: HeaderMap,
+    ws: WebSocketUpgrade,
+) -> Result<axum::response::Response, (StatusCode, String)> {
+    if !is_internal_source(&addr) {
+        warn!(source = %addr, "rejected agent inbound request from non-internal source");
+        return Err((StatusCode::FORBIDDEN, "source not allowed".to_string()));
+    }
+
+    verify_ticket(&headers, &workload_id, &state.agent_id.to_string())
+        .map_err(|e| (StatusCode::UNAUTHORIZED, e.to_string()))?;
+
+    let container_id = state
+        .running_containers
+        .lock()
+        .await
+        .get(&workload_id)
+        .cloned()
+        .ok_or((
+            StatusCode::NOT_FOUND,
+            "workload not running here".to_string(),
+        ))?;
+
+    Ok(ws.on_upgrade(move |socket| handle_exec_socket(socket, state, container_id)))
+}
+
+async fn handle_exec_socket(socket: WebSocket, state: ServerState, container_id: String) {
+    let docker_guard = state.docker.lock().await;
+    let docker = match docker_guard.as_ref() {
+        Some(d) => d,
+        None => {
+            warn!("docker unavailable for exec session");
+            return;
+        }
+    };
+
+    let exec_result = match docker.exec(&container_id).await {
+        Ok(r) => r,
+        Err(e) => {
+            warn!(container_id = %container_id, error = %e, "failed to start exec session");
+            return;
+        }
+    };
+    drop(docker_guard);
+
+    let StartExecResults::Attached {
+        mut output,
+        mut input,
+    } = exec_result
+    else {
+        warn!(container_id = %container_id, "exec session detached unexpectedly");
+        return;
+    };
+
+    let (mut ws_sink, mut ws_stream) = socket.split();
+
+    let output_task = tokio::spawn(async move {
+        while let Some(item) = output.next().await {
+            match item {
+                Ok(log_output) => {
+                    let bytes = log_output.into_bytes();
+                    if ws_sink.send(Message::Binary(bytes)).await.is_err() {
+                        break;
+                    }
+                }
+                Err(_) => break,
+            }
+        }
+    });
+
+    let input_task = tokio::spawn(async move {
+        while let Some(Ok(msg)) = ws_stream.next().await {
+            match msg {
+                Message::Binary(data) => {
+                    if input.write_all(&data).await.is_err() {
+                        break;
+                    }
+                }
+                Message::Text(text) => {
+                    if input.write_all(text.as_bytes()).await.is_err() {
+                        break;
+                    }
+                }
+                Message::Close(_) => break,
+                _ => {}
+            }
+        }
+    });
+
+    tokio::select! {
+        _ = output_task => {}
+        _ = input_task => {}
+    }
+
+    info!(container_id = %container_id, "exec session closed");
+}
+
+async fn metrics_stream_handler(
+    State(state): State<ServerState>,
+    ConnectInfo(addr): ConnectInfo<SocketAddr>,
+    headers: HeaderMap,
+    ws: WebSocketUpgrade,
+) -> Result<axum::response::Response, (StatusCode, String)> {
+    if !is_internal_source(&addr) {
+        warn!(source = %addr, "rejected agent inbound request from non-internal source");
+        return Err((StatusCode::FORBIDDEN, "source not allowed".to_string()));
+    }
+
+    verify_ticket(&headers, METRICS_TICKET_SCOPE, &state.agent_id.to_string())
+        .map_err(|e| (StatusCode::UNAUTHORIZED, e.to_string()))?;
+
+    Ok(ws.on_upgrade(handle_metrics_socket))
+}
+
+async fn handle_metrics_socket(socket: WebSocket) {
+    let (mut sink, mut stream) = socket.split();
+    let mut collector = LiveMetricsCollector::new();
+    let mut interval = tokio::time::interval(std::time::Duration::from_secs(1));
+
+    loop {
+        tokio::select! {
+            _ = interval.tick() => {
+                let metrics = collector.sample();
+                let payload = match serde_json::to_string(&metrics) {
+                    Ok(p) => p,
+                    Err(e) => {
+                        warn!(error = %e, "failed to serialize live metrics");
+                        continue;
+                    }
+                };
+                if sink.send(Message::Text(payload.into())).await.is_err() {
+                    break;
+                }
+            }
+            msg = stream.next() => match msg {
+                Some(Ok(Message::Close(_))) | None => break,
+                Some(Err(_)) => break,
+                _ => {}
+            }
+        }
+    }
+
+    info!("live metrics session closed");
+}
diff --git a/agent/src/system.rs b/agent/src/system.rs
index 2ae27cae..94ad02d2 100644
--- a/agent/src/system.rs
+++ b/agent/src/system.rs
@@ -1,3 +1,4 @@
+use serde::Serialize;
 use sysinfo::{Disks, Networks, System};
 
 pub struct SystemInfo {
@@ -7,6 +8,7 @@ pub struct SystemInfo {
     pub architecture: String,
 }
 
+#[derive(Serialize)]
 pub struct SystemMetrics {
     pub cpu_usage_percent: f32,
     pub cpu_cores: u32,
@@ -19,11 +21,60 @@ pub struct SystemMetrics {
     pub uptime_seconds: u64,
 }
 
+pub struct LiveMetricsCollector {
+    sys: System,
+}
+
+impl LiveMetricsCollector {
+    pub fn new() -> Self {
+        let mut sys = System::new_all();
+        sys.refresh_cpu_usage();
+        Self { sys }
+    }
+
+    pub fn sample(&mut self) -> SystemMetrics {
+        self.sys.refresh_cpu_usage();
+        self.sys.refresh_memory();
+
+        let cpu_usage_percent = self.sys.global_cpu_usage();
+        let cpu_cores = self.sys.cpus().len() as u32;
+        let memory_total_bytes = self.sys.total_memory();
+        let memory_used_bytes = self.sys.used_memory();
+
+        let disks = Disks::new_with_refreshed_list();
+        let (disk_total_bytes, disk_used_bytes) =
+            disks.iter().fold((0u64, 0u64), |(total, used), d| {
+                (
+                    total + d.total_space(),
+                    used + (d.total_space() - d.available_space()),
+                )
+            });
+
+        let networks = Networks::new_with_refreshed_list();
+        let (network_rx_bytes, network_tx_bytes) =
+            networks.iter().fold((0u64, 0u64), |(rx, tx), (_, data)| {
+                (rx + data.total_received(), tx + data.total_transmitted())
+            });
+
+        SystemMetrics {
+            cpu_usage_percent,
+            cpu_cores,
+            memory_total_bytes,
+            memory_used_bytes,
+            disk_total_bytes,
+            disk_used_bytes,
+            network_rx_bytes,
+            network_tx_bytes,
+            uptime_seconds: System::uptime(),
+        }
+    }
+}
+
 fn parse_os_release_field(content: &str, field: &str) -> Option<String> {
     content
         .lines()
         .find(|l| l.starts_with(field))
-        .and_then(|l| l.splitn(2, '=').nth(1))
+        .and_then(|l| l.split_once('=').map(|x| x.1))
         .map(|v| v.trim_matches('"').to_string())
 }
 
diff --git a/app/package-lock.json b/app/package-lock.json
index 9a5881d8..0dba6c85 100644
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -10,6 +10,8 @@
 			"dependencies": {
 				"@iconify/svelte": "^5.2.1",
 				"@jis3r/icons": "^2.7.0",
+				"@xterm/addon-fit": "^0.11.0",
+				"@xterm/xterm": "^6.0.0",
 				"geist": "^1.7.0"
 			},
 			"devDependencies": {
@@ -1546,6 +1548,21 @@
 			"integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==",
 			"license": "MIT"
 		},
+		"node_modules/@xterm/addon-fit": {
+			"version": "0.11.0",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-fit/-/addon-fit-0.11.0.tgz",
+			"integrity": "sha512-jYcgT6xtVYhnhgxh3QgYDnnNMYTcf8ElbxxFzX0IZo+vabQqSPAjC3c1wJrKB5E19VwQei89QCiZZP86DCPF7g==",
+			"license": "MIT"
+		},
+		"node_modules/@xterm/xterm": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-6.0.0.tgz",
+			"integrity": "sha512-TQwDdQGtwwDt+2cgKDLn0IRaSxYu1tSUjgKarSDkUM0ZNiSRXFpjxEsvc/Zgc5kq5omJ+V0a8/kIM2WD3sMOYg==",
+			"license": "MIT",
+			"workspaces": [
+				"addons/*"
+			]
+		},
 		"node_modules/acorn": {
 			"version": "8.16.0",
 			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz",
diff --git a/app/package.json b/app/package.json
index ea80f909..330b4695 100644
--- a/app/package.json
+++ b/app/package.json
@@ -37,6 +37,8 @@
 	"dependencies": {
 		"@iconify/svelte": "^5.2.1",
 		"@jis3r/icons": "^2.7.0",
+		"@xterm/addon-fit": "^0.11.0",
+		"@xterm/xterm": "^6.0.0",
 		"geist": "^1.7.0"
 	}
 }
diff --git a/app/src/lib/api/nodes.ts b/app/src/lib/api/nodes.ts
index d8073408..131174ef 100644
--- a/app/src/lib/api/nodes.ts
+++ b/app/src/lib/api/nodes.ts
@@ -92,6 +92,34 @@ export async function getNodeMetricsLatest(token: string, id: string): Promise<N
     return res.json();
 }
 
+export interface LiveNodeMetrics {
+    cpu_usage_percent: number;
+    cpu_cores: number;
+    memory_total_bytes: number;
+    memory_used_bytes: number;
+    disk_total_bytes: number;
+    disk_used_bytes: number;
+    network_rx_bytes: number;
+    network_tx_bytes: number;
+    uptime_seconds: number;
+}
+
+export async function openNodeMetricsSocket(token: string, agentId: string): Promise<WebSocket> {
+    const res = await fetch(`${API_BASE}/agents/${agentId}/metrics/ticket`, {
+        method: 'POST',
+        headers: { Authorization: `Bearer ${token}` },
+    });
+    if (!res.ok) {
+        const err = await res.json().catch(() => ({ error: res.status }));
+        throw new Error(err.error ?? `Failed to issue metrics ticket: ${res.status}`);
+    }
+    const { ticket } = await res.json();
+
+    const wsProtocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
+    const url = `${wsProtocol}//${window.location.host}${API_BASE}/agents/${agentId}/metrics/stream?ticket=${encodeURIComponent(ticket)}`;
+    return new WebSocket(url);
+}
+
 export interface HealthHistoryPoint {
     bucket: string;
     online_count: number;
diff --git a/app/src/lib/api/resource-groups.ts b/app/src/lib/api/resource-groups.ts
index 9ef94e8a..8d79a55f 100644
--- a/app/src/lib/api/resource-groups.ts
+++ b/app/src/lib/api/resource-groups.ts
@@ -51,6 +51,8 @@ export interface Workload {
     container_id: string | null;
     volume_mounts: VolumeMount[] | null;
     resource_group_id: string | null;
+    stack_id: string | null;
+    service_name: string | null;
     created_at: string;
     updated_at: string | null;
 }
@@ -73,6 +75,24 @@ export interface CreateVolumeRequest {
     resource_group_id: string;
 }
 
+export interface CreateStackRequest {
+    name: string;
+    resource_group_id: string;
+    compose_yaml: string;
+}
+
+export interface CreateStackWorkloadResult {
+    workload_id: string;
+    status: string;
+    assigned_agent_id: string | null;
+    message: string;
+}
+
+export interface CreateStackResponse {
+    stack_id: string;
+    workloads: CreateStackWorkloadResult[];
+}
+
 export async function listResourceGroups(token: string): Promise<ResourceGroup[]> {
     const res = await fetch(`${API_BASE}/resource-groups`, {
         headers: { Authorization: `Bearer ${token}` },
@@ -137,6 +157,25 @@ export async function createWorkload(token: string, req: CreateWorkloadRequest):
     return res.json();
 }
 
+export async function createWorkloadStack(
+    token: string,
+    req: CreateStackRequest,
+): Promise<CreateStackResponse> {
+    const res = await fetch(`${API_BASE}/workload-stacks`, {
+        method: 'POST',
+        headers: {
+            Authorization: `Bearer ${token}`,
+            'Content-Type': 'application/json',
+        },
+        body: JSON.stringify(req),
+    });
+    if (!res.ok) {
+        const err = await res.json().catch(() => ({ error: res.status }));
+        throw new Error(err.error ?? `Failed to create stack: ${res.status}`);
+    }
+    return res.json();
+}
+
 export async function deleteWorkload(token: string, id: string): Promise<void> {
     const res = await fetch(`${API_BASE}/workloads/${id}`, {
         method: 'DELETE',
@@ -145,6 +184,38 @@ export async function deleteWorkload(token: string, id: string): Promise<void> {
     if (!res.ok) throw new Error(`Failed to delete workload: ${res.status}`);
 }
 
+export async function streamWorkloadLogs(
+    token: string,
+    id: string,
+    signal: AbortSignal,
+): Promise<ReadableStream<Uint8Array>> {
+    const res = await fetch(`${API_BASE}/workloads/${id}/logs`, {
+        headers: { Authorization: `Bearer ${token}` },
+        signal,
+    });
+    if (!res.ok || !res.body) {
+        const err = await res.json().catch(() => ({ error: res.status }));
+        throw new Error(err.error ?? `Failed to stream logs: ${res.status}`);
+    }
+    return res.body;
+}
+
+export async function openWorkloadExecSocket(token: string, id: string): Promise<WebSocket> {
+    const res = await fetch(`${API_BASE}/workloads/${id}/exec/ticket`, {
+        method: 'POST',
+        headers: { Authorization: `Bearer ${token}` },
+    });
+    if (!res.ok) {
+        const err = await res.json().catch(() => ({ error: res.status }));
+        throw new Error(err.error ?? `Failed to issue exec ticket: ${res.status}`);
+    }
+    const { ticket } = await res.json();
+
+    const wsProtocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
+    const url = `${wsProtocol}//${window.location.host}${API_BASE}/workloads/${id}/exec?ticket=${encodeURIComponent(ticket)}`;
+    return new WebSocket(url);
+}
+
 export async function listResourceGroupVolumes(token: string, rgId: string): Promise<Volume[]> {
     const res = await fetch(`${API_BASE}/resource-groups/${rgId}/volumes`, {
         headers: { Authorization: `Bearer ${token}` },
diff --git a/app/src/lib/components/nodes/NodeDetailSheet.svelte b/app/src/lib/components/nodes/NodeDetailSheet.svelte
index 85f6d9ee..9d72aed9 100644
--- a/app/src/lib/components/nodes/NodeDetailSheet.svelte
+++ b/app/src/lib/components/nodes/NodeDetailSheet.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { auth } from '$lib/auth/store.svelte';
-    import { getNodeMetricsLatest, type Node, type NodeMetricsLatest } from '$lib/api/nodes';
+    import { getNodeMetricsLatest, openNodeMetricsSocket, type LiveNodeMetrics, type Node, type NodeMetricsLatest } from '$lib/api/nodes';
     import * as Sheet from '$lib/components/ui/sheet/index.js';
     import { Button } from '$lib/components/ui/button/index.js';
 
@@ -15,16 +15,24 @@
     let metrics = $state<NodeMetricsLatest | null>(null);
     let metricsError = $state<string | null>(null);
     let metricsLoading = $state(false);
+    let metricsLive = $state(false);
     let activeTab = $state<'summary' | 'hardware' | 'workloads' | 'network' | 'tasks'>('summary');
     let sshCopied = $state(false);
+    let liveSocket: WebSocket | null = null;
 
     $effect(() => {
         if (node && open) {
             activeTab = 'summary';
             metrics = null;
             metricsError = null;
-            loadMetrics(node.id);
+            metricsLive = false;
+            const agentId = node.id;
+            loadMetrics(agentId).then(() => openLiveMetrics(agentId));
+        } else {
+            closeLiveMetrics();
         }
+
+        return () => closeLiveMetrics();
     });
 
     async function loadMetrics(id: string) {
@@ -39,6 +47,60 @@
         }
     }
 
+    function applyLiveSample(sample: LiveNodeMetrics) {
+        const timestamp = new Date().toISOString();
+        metrics = {
+            id: metrics?.id ?? '',
+            agent_id: metrics?.agent_id ?? '',
+            timestamp,
+            cpu_model: metrics?.cpu_model ?? null,
+            cpu_cores: sample.cpu_cores,
+            cpu_threads: metrics?.cpu_threads ?? null,
+            cpu_usage_percent: sample.cpu_usage_percent,
+            memory_total_bytes: sample.memory_total_bytes,
+            memory_used_bytes: sample.memory_used_bytes,
+            memory_usage_percent: sample.memory_total_bytes > 0
+                ? (sample.memory_used_bytes / sample.memory_total_bytes) * 100
+                : null,
+            disk_total_bytes: sample.disk_total_bytes,
+            disk_used_bytes: sample.disk_used_bytes,
+            disk_usage_percent: sample.disk_total_bytes > 0
+                ? (sample.disk_used_bytes / sample.disk_total_bytes) * 100
+                : null,
+            network_rx_bytes: sample.network_rx_bytes,
+            network_tx_bytes: sample.network_tx_bytes,
+            os_name: metrics?.os_name ?? null,
+            os_version: metrics?.os_version ?? null,
+            kernel_version: metrics?.kernel_version ?? null,
+            hostname: metrics?.hostname ?? null,
+            uptime_seconds: sample.uptime_seconds,
+        };
+    }
+
+    async function openLiveMetrics(agentId: string) {
+        if (!auth.token) return;
+        try {
+            const socket = await openNodeMetricsSocket(auth.token, agentId);
+            liveSocket = socket;
+            socket.onmessage = (event) => {
+                try {
+                    applyLiveSample(JSON.parse(event.data) as LiveNodeMetrics);
+                    metricsLive = true;
+                } catch {}
+            };
+            socket.onclose = () => { metricsLive = false; };
+            socket.onerror = () => { metricsLive = false; };
+        } catch {
+            metricsLive = false;
+        }
+    }
+
+    function closeLiveMetrics() {
+        liveSocket?.close();
+        liveSocket = null;
+        metricsLive = false;
+    }
+
     function bytesToGb(bytes: number | null): string {
         if (bytes == null) return '-';
         return (bytes / 1_073_741_824).toFixed(1) + ' GB';
@@ -249,6 +311,11 @@
                                 <span class="text-xs font-semibold text-muted-foreground uppercase tracking-wider">Live Load</span>
                                 {#if metricsLoading}
                                     <span class="text-xs text-muted-foreground">Loading...</span>
+                                {:else if metricsLive}
+                                    <span class="text-xs text-emerald-500 px-2 py-0.5 border border-emerald-500/30 rounded-md flex items-center gap-1.5">
+                                        <span class="inline-block w-1.5 h-1.5 rounded-full bg-emerald-500 animate-pulse"></span>
+                                        live
+                                    </span>
                                 {:else if metrics?.timestamp}
                                     <span class="text-xs text-muted-foreground px-2 py-0.5 border rounded-md">
                                         {refreshedLabel(metrics.timestamp)}
diff --git a/app/src/lib/utils/compose-preview.ts b/app/src/lib/utils/compose-preview.ts
new file mode 100644
index 00000000..a44328d1
--- /dev/null
+++ b/app/src/lib/utils/compose-preview.ts
@@ -0,0 +1,80 @@
+export interface ComposePreviewService {
+    serviceName: string;
+    image: string | null;
+    ports: string[];
+}
+
+export interface ComposePreviewResult {
+    services: ComposePreviewService[];
+    volumes: string[];
+    error: string | null;
+}
+
+function stripInlineComment(line: string): string {
+    const hashIndex = line.indexOf('#');
+    return hashIndex === -1 ? line : line.slice(0, hashIndex);
+}
+
+function indentOf(line: string): number {
+    return line.length - line.trimStart().length;
+}
+
+function parseTopLevelBlockKeys(lines: string[], blockName: string): string[] {
+    const blockLineIndex = lines.findIndex((line) => line.trim() === `${blockName}:`);
+    if (blockLineIndex === -1) return [];
+
+    const keys: string[] = [];
+    for (let i = blockLineIndex + 1; i < lines.length; i++) {
+        const line = lines[i];
+        if (!line.trim()) continue;
+        const indent = indentOf(line);
+        if (indent === 0) break;
+        if (indent === 2 && line.trim().endsWith(':')) {
+            keys.push(line.trim().slice(0, -1));
+        }
+    }
+    return keys;
+}
+
+export function parseComposePreview(yaml: string): ComposePreviewResult {
+    const lines = yaml.split('\n').map(stripInlineComment);
+    const volumes = parseTopLevelBlockKeys(lines, 'volumes');
+    const servicesLineIndex = lines.findIndex((line) => line.trim() === 'services:');
+    if (servicesLineIndex === -1) {
+        return { services: [], volumes, error: null };
+    }
+
+    const services: ComposePreviewService[] = [];
+    let current: ComposePreviewService | null = null;
+    let inPorts = false;
+
+    for (let i = servicesLineIndex + 1; i < lines.length; i++) {
+        const line = lines[i];
+        if (!line.trim()) continue;
+        const indent = indentOf(line);
+        const trimmed = line.trim();
+
+        if (indent === 0) break;
+
+        if (indent === 2 && trimmed.endsWith(':')) {
+            current = { serviceName: trimmed.slice(0, -1), image: null, ports: [] };
+            services.push(current);
+            inPorts = false;
+            continue;
+        }
+        if (indent <= 0 || !current) continue;
+
+        if (trimmed.startsWith('image:')) {
+            current.image = trimmed.slice('image:'.length).trim().replace(/^["']|["']$/g, '');
+            inPorts = false;
+        } else if (trimmed === 'ports:') {
+            inPorts = true;
+        } else if (inPorts && trimmed.startsWith('-')) {
+            current.ports.push(trimmed.slice(1).trim().replace(/^["']|["']$/g, ''));
+        } else if (trimmed.endsWith(':')) {
+            inPorts = false;
+        }
+    }
+
+    return { services, volumes, error: null };
+}
diff --git a/app/src/lib/utils/image-icon.ts b/app/src/lib/utils/image-icon.ts
new file mode 100644
index 00000000..6a3e95b3
--- /dev/null
+++ b/app/src/lib/utils/image-icon.ts
@@ -0,0 +1,27 @@
+const KNOWN_IMAGE_ICONS: Record<string, string> = {
+    redis: 'logos:redis',
+    postgres: 'logos:postgresql',
+    postgresql: 'logos:postgresql',
+    nginx: 'logos:nginx',
+    mysql: 'logos:mysql',
+    mariadb: 'logos:mariadb',
+    mongo: 'logos:mongodb',
+    mongodb: 'logos:mongodb',
+    rabbitmq: 'logos:rabbitmq-icon',
+    memcached: 'logos:memcached',
+    traefik: 'logos:traefikproxy-icon',
+    caddy: 'logos:caddy-icon',
+    elasticsearch: 'logos:elasticsearch',
+    grafana: 'logos:grafana',
+    prometheus: 'logos:prometheus',
+};
+
+const DOCKER_FALLBACK_ICON = 'logos:docker-icon';
+
+export function resolveImageIcon(image: string): string {
+    const withoutTag = image.split('@')[0].split(':')[0];
+    const segments = withoutTag.split('/');
+    const bareName = segments[segments.length - 1].toLowerCase();
+
+    return KNOWN_IMAGE_ICONS[bareName] ?? DOCKER_FALLBACK_ICON;
+}
diff --git a/app/src/lib/utils/yaml-highlight.ts b/app/src/lib/utils/yaml-highlight.ts
new file mode 100644
index 00000000..62a315e6
--- /dev/null
+++ b/app/src/lib/utils/yaml-highlight.ts
@@ -0,0 +1,55 @@
+function escapeHtml(text: string): string {
+    return text
+        .replace(/&/g, '&amp;')
+        .replace(/</g, '&lt;')
+        .replace(/>/g, '&gt;');
+}
+
+function highlightLine(line: string): string {
+    const commentIndex = line.indexOf('#');
+    const code = commentIndex === -1 ? line : line.slice(0, commentIndex);
+    const comment = commentIndex === -1 ? '' : line.slice(commentIndex);
+
+    const leadingSpaces = code.match(/^\s*/)?.[0] ?? '';
+    const rest = code.slice(leadingSpaces.length);
+
+    const dashMatch = rest.match(/^-\s*/);
+    const dashPrefix = dashMatch ? dashMatch[0] : '';
+    const afterDash = rest.slice(dashPrefix.length);
+
+    const keyMatch = afterDash.match(/^([A-Za-z0-9_.-]+)(:)(\s|$)/);
+    let highlighted: string;
+
+    if (keyMatch) {
+        const key = keyMatch[1];
+        const colon = keyMatch[2];
+        const separator = keyMatch[3];
+        const value = afterDash.slice(keyMatch[0].length);
+        highlighted = `<span class="text-sky-400">${escapeHtml(key)}</span><span class="text-muted-foreground">${colon}</span>${separator}${highlightValue(value)}`;
+    } else {
+        highlighted = highlightValue(afterDash);
+    }
+
+    const dashHtml = dashPrefix ? `<span class="text-muted-foreground">${escapeHtml(dashPrefix)}</span>` : '';
+    const commentHtml = comment ? `<span class="text-emerald-600/70">${escapeHtml(comment)}</span>` : '';
+
+    return `${escapeHtml(leadingSpaces)}${dashHtml}${highlighted}${commentHtml}`;
+}
+
+function highlightValue(value: string): string {
+    if (!value) return '';
+    if (/^["'].*["']$/.test(value)) {
+        return `<span class="text-amber-400">${escapeHtml(value)}</span>`;
+    }
+    if (/^-?\d+(\.\d+)?$/.test(value)) {
+        return `<span class="text-violet-400">${escapeHtml(value)}</span>`;
+    }
+    if (value === 'true' || value === 'false' || value === 'null') {
+        return `<span class="text-violet-400">${escapeHtml(value)}</span>`;
+    }
+    return `<span class="text-foreground">${escapeHtml(value)}</span>`;
+}
+
+export function highlightYaml(yaml: string): string {
+    return yaml.split('\n').map(highlightLine).join('\n');
+}
diff --git a/app/src/routes/(app)/logs/+page.svelte b/app/src/routes/(app)/logs/+page.svelte
index c6c9b56e..07d86c91 100644
--- a/app/src/routes/(app)/logs/+page.svelte
+++ b/app/src/routes/(app)/logs/+page.svelte
@@ -124,7 +124,6 @@
     }
 
     onMount(() => {
-        load();
         refreshTimer = setInterval(load, REFRESH_INTERVAL_MS);
     });
 
@@ -133,6 +132,7 @@
     });
 
     $effect(() => {
+        auth.token;
         selectedService;
         selectedLevel;
         selectedClassification;
diff --git a/app/src/routes/(app)/nodes/+page.svelte b/app/src/routes/(app)/nodes/+page.svelte
index 2f429736..ab6a4794 100644
--- a/app/src/routes/(app)/nodes/+page.svelte
+++ b/app/src/routes/(app)/nodes/+page.svelte
@@ -81,11 +81,12 @@
         }
     }
 
-    onMount(async () => {
-        if (!auth.token) return;
+    let loadStarted = false;
+
+    async function loadInitial() {
         try {
             [nodes] = await Promise.all([
-                listNodes(auth.token),
+                listNodes(auth.token!),
                 fetchStats(),
             ]);
         } catch (e) {
@@ -93,6 +94,16 @@
         } finally {
             loading = false;
         }
+    }
+
+    $effect(() => {
+        if (auth.token && !loadStarted) {
+            loadStarted = true;
+            loadInitial();
+        }
+    });
+
+    onMount(() => {
         pollInterval = setInterval(fetchStats, 10_000);
     });
 
diff --git a/app/src/routes/(app)/resource-groups/+page.svelte b/app/src/routes/(app)/resource-groups/+page.svelte
index 21a6c3bf..42d37fcc 100644
--- a/app/src/routes/(app)/resource-groups/+page.svelte
+++ b/app/src/routes/(app)/resource-groups/+page.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-    import { onMount } from "svelte";
     import { goto } from "$app/navigation";
     import { auth } from "$lib/auth/store.svelte";
     import {
@@ -74,7 +73,14 @@
         }
     }
 
-    onMount(load);
+    let loadStarted = false;
+
+    $effect(() => {
+        if (auth.token && !loadStarted) {
+            loadStarted = true;
+            load();
+        }
+    });
 </script>
 
 <dialog
diff --git a/app/src/routes/(app)/resource-groups/[id]/+page.svelte b/app/src/routes/(app)/resource-groups/[id]/+page.svelte
index 51da30d1..708e5c3b 100644
--- a/app/src/routes/(app)/resource-groups/[id]/+page.svelte
+++ b/app/src/routes/(app)/resource-groups/[id]/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { onMount } from "svelte";
+    import { tick } from "svelte";
     import { page } from "$app/stores";
     import { goto } from "$app/navigation";
     import { auth } from "$lib/auth/store.svelte";
@@ -8,15 +8,25 @@
         listResourceGroupWorkloads,
         listResourceGroupVolumes,
         createWorkload,
+        createWorkloadStack,
         deleteWorkload,
         createVolume,
         deleteVolume,
+        streamWorkloadLogs,
+        openWorkloadExecSocket,
         type ResourceGroup,
         type Workload,
         type Volume,
         type PortMapping,
         type VolumeMount,
     } from "$lib/api/resource-groups";
+    import { resolveImageIcon } from "$lib/utils/image-icon";
+    import { parseComposePreview } from "$lib/utils/compose-preview";
+    import { highlightYaml } from "$lib/utils/yaml-highlight";
+    import type { Terminal } from "@xterm/xterm";
+    import type { FitAddon } from "@xterm/addon-fit";
+    import "@xterm/xterm/css/xterm.css";
+    import Icon from "@iconify/svelte";
     import * as Sidebar from "$lib/components/ui/sidebar/index.js";
     import { Button } from "$lib/components/ui/button/index.js";
 
@@ -33,11 +43,21 @@
 
     let deployDialog = $state<HTMLDialogElement | null>(null);
     let volumeDialog = $state<HTMLDialogElement | null>(null);
+    let resourcePickerDialog = $state<HTMLDialogElement | null>(null);
+    let composeDialog = $state<HTMLDialogElement | null>(null);
     let deploying = $state(false);
     let creatingVolume = $state(false);
+    let deployingStack = $state(false);
     let deployError = $state<string | null>(null);
     let volumeError = $state<string | null>(null);
+    let composeError = $state<string | null>(null);
     let downloadingVpn = $state(false);
+    let expandedStacks = $state<Set<string>>(new Set());
+
+    const RESOURCE_TYPES = [
+        { key: "docker-container", label: "Docker Container", description: "Deploy a single container", icon: "logos:docker-icon" },
+        { key: "docker-compose", label: "Docker Compose", description: "Deploy multiple related containers as one stack", icon: "logos:docker-icon" },
+    ] as const;
 
     let formImage = $state("");
     let formName = $state("");
@@ -48,9 +68,41 @@
     let formPorts = $state("");
     let formVolumeMounts = $state("");
 
+    let composeStackName = $state("");
+    let composeYaml = $state("");
+    let composePreview = $derived(parseComposePreview(composeYaml));
+    let composeLineCount = $derived(Math.max(composeYaml.split("\n").length, 1));
+    let composeGutter = $state<HTMLDivElement | null>(null);
+    let composeTextarea = $state<HTMLTextAreaElement | null>(null);
+    let composeHighlightLayer = $state<HTMLPreElement | null>(null);
+    let composeHighlighted = $derived(highlightYaml(composeYaml));
+    function syncComposeScroll() {
+        if (composeGutter && composeTextarea) {
+            composeGutter.scrollTop = composeTextarea.scrollTop;
+        }
+        if (composeHighlightLayer && composeTextarea) {
+            composeHighlightLayer.scrollTop = composeTextarea.scrollTop;
+            composeHighlightLayer.scrollLeft = composeTextarea.scrollLeft;
+        }
+    }
+
     let volFormName = $state("");
     let volFormSize = $state("10");
 
+    let logsDialog = $state<HTMLDialogElement | null>(null);
+    let logsWorkloadName = $state("");
+    let logsLines = $state<string[]>([]);
+    let logsError = $state<string | null>(null);
+    let logsAbort: AbortController | null = null;
+
+    let execDialog = $state<HTMLDialogElement | null>(null);
+    let execWorkloadName = $state("");
+    let execError = $state<string | null>(null);
+    let execTerminalEl = $state<HTMLDivElement | null>(null);
+    let execTerminal: Terminal | null = null;
+    let execFitAddon: FitAddon | null = null;
+    let execSocket: WebSocket | null = null;
+
     async function load() {
         if (!auth.token) return;
         try {
@@ -144,6 +196,60 @@
         }
     }
 
+    async function handleDeployStack() {
+        if (!auth.token || !composeYaml.trim() || !composeStackName) return;
+        deployingStack = true;
+        composeError = null;
+        try {
+            await createWorkloadStack(auth.token, {
+                name: composeStackName,
+                resource_group_id: rgId,
+                compose_yaml: composeYaml,
+            });
+            composeDialog?.close();
+            resetComposeForm();
+            workloads = await listResourceGroupWorkloads(auth.token, rgId);
+        } catch (e) {
+            composeError = e instanceof Error ? e.message : "Failed to deploy stack";
+        } finally {
+            deployingStack = false;
+        }
+    }
+
+    function resetComposeForm() {
+        composeStackName = "";
+        composeYaml = "";
+        composeError = null;
+    }
+
+    function handleComposeFileUpload(event: Event) {
+        const input = event.target as HTMLInputElement;
+        const file = input.files?.[0];
+        if (!file) return;
+        file.text().then((text) => {
+            composeYaml = text;
+        });
+    }
+
+    function openResourceType(key: (typeof RESOURCE_TYPES)[number]["key"]) {
+        resourcePickerDialog?.close();
+        if (key === "docker-container") {
+            deployDialog?.showModal();
+        } else {
+            composeDialog?.showModal();
+        }
+    }
+
+    function toggleStack(stackId: string) {
+        const next = new Set(expandedStacks);
+        if (next.has(stackId)) {
+            next.delete(stackId);
+        } else {
+            next.add(stackId);
+        }
+        expandedStacks = next;
+    }
+
     async function handleCreateVolume() {
         if (!auth.token || !volFormName) return;
         creatingVolume = true;
@@ -175,6 +281,99 @@
         }
     }
 
+    async function openLogs(workload: Workload) {
+        if (!auth.token) return;
+
+        logsWorkloadName = workload.name;
+        logsLines = [];
+        logsError = null;
+        logsDialog?.showModal();
+
+        logsAbort = new AbortController();
+        const decoder = new TextDecoder();
+
+        try {
+            const body = await streamWorkloadLogs(auth.token, workload.id, logsAbort.signal);
+            const reader = body.getReader();
+
+            while (true) {
+                const { done, value } = await reader.read();
+                if (done) break;
+                const chunk = decoder.decode(value, { stream: true });
+                if (chunk) {
+                    logsLines = [...logsLines, ...chunk.split("\n").filter((l) => l.length > 0)];
+                }
+            }
+        } catch (e) {
+            if (e instanceof Error && e.name !== "AbortError") {
+                logsError = e.message;
+            }
+        }
+    }
+
+    function closeLogs() {
+        logsAbort?.abort();
+        logsAbort = null;
+        logsDialog?.close();
+    }
+
+    async function openExec(workload: Workload) {
+        if (!auth.token) return;
+
+        execWorkloadName = workload.name;
+        execError = null;
+        execDialog?.showModal();
+
+        await tick();
+
+        if (!execTerminalEl) return;
+
+        const { Terminal } = await import("@xterm/xterm");
+        const { FitAddon } = await import("@xterm/addon-fit");
+
+        execTerminal = new Terminal({ convertEol: true, cursorBlink: true });
+        execFitAddon = new FitAddon();
+        execTerminal.loadAddon(execFitAddon);
+        execTerminal.open(execTerminalEl);
+        execFitAddon.fit();
+
+        try {
+            execSocket = await openWorkloadExecSocket(auth.token, workload.id);
+            execSocket.binaryType = "arraybuffer";
+
+            execSocket.onmessage = (event) => {
+                if (execTerminal) {
+                    const data =
+                        event.data instanceof ArrayBuffer
+                            ? new Uint8Array(event.data)
+                            : event.data;
+                    execTerminal.write(data);
+                }
+            };
+            execSocket.onerror = () => {
+                execError = "Exec socket error";
+            };
+            execSocket.onclose = () => {
+                execTerminal?.write("\r\n[session closed]\r\n");
+            };
+
+            execTerminal.onData((data) => {
+                execSocket?.send(data);
+            });
+        } catch (e) {
+            execError = e instanceof Error ? e.message : "Failed to start exec session";
+        }
+    }
+
+    function closeExec() {
+        execSocket?.close();
+        execSocket = null;
+        execTerminal?.dispose();
+        execTerminal = null;
+        execFitAddon = null;
+        execDialog?.close();
+    }
+
     async function handleDeleteVolume(id: string) {
         if (!auth.token) return;
         try {
@@ -224,24 +423,68 @@
         deployError = null;
     }
 
+    type WorkloadStack = {
+        stack_id: string;
+        stack_name: string;
+        children: Workload[];
+    };
+
     type ResourceItem =
         | { kind: "container"; data: Workload }
+        | { kind: "stack"; data: WorkloadStack }
         | { kind: "volume"; data: Volume };
 
+    function groupWorkloadsByStack(items: Workload[]): ResourceItem[] {
+        const standalone: Workload[] = [];
+        const stacks = new Map<string, Workload[]>();
+
+        for (const w of items) {
+            if (!w.stack_id) {
+                standalone.push(w);
+                continue;
+            }
+            const group = stacks.get(w.stack_id) ?? [];
+            group.push(w);
+            stacks.set(w.stack_id, group);
+        }
+
+        const stackItems: ResourceItem[] = Array.from(stacks.entries()).map(
+            ([stackId, children]): ResourceItem => ({
+                kind: "stack",
+                data: {
+                    stack_id: stackId,
+                    stack_name: `Stack ${stackId.slice(0, 8)}`,
+                    children,
+                },
+            }),
+        );
+
+        return [
+            ...standalone.map((w): ResourceItem => ({ kind: "container", data: w })),
+            ...stackItems,
+        ];
+    }
+
     let allResources = $derived<ResourceItem[]>([
-        ...workloads.map((w): ResourceItem => ({ kind: "container", data: w })),
+        ...groupWorkloadsByStack(workloads),
         ...volumes.map((v): ResourceItem => ({ kind: "volume", data: v })),
     ]);
 
     let filteredResources = $derived(
         allResources.filter((r) => {
-            if (activeTab === "container" && r.kind !== "container") return false;
+            if (activeTab === "container" && r.kind === "volume") return false;
             if (activeTab === "volume" && r.kind !== "volume") return false;
             if (!filterText) return true;
             const q = filterText.toLowerCase();
             if (r.kind === "container") {
                 return r.data.name.toLowerCase().includes(q) || r.data.image.toLowerCase().includes(q);
             }
+            if (r.kind === "stack") {
+                return (
+                    r.data.stack_name.toLowerCase().includes(q) ||
+                    r.data.children.some((c) => c.name.toLowerCase().includes(q) || c.image.toLowerCase().includes(q))
+                );
+            }
             return r.data.name.toLowerCase().includes(q);
         })
     );
@@ -255,12 +498,24 @@
             case "error": return "bg-red-500/15 text-red-600 dark:text-red-400";
             case "scheduled":
             case "attaching": return "bg-blue-500/15 text-blue-600 dark:text-blue-400";
+            case "pulling": return "bg-blue-500/15 text-blue-600 dark:text-blue-400 animate-pulse";
+            case "creating":
+            case "starting": return "bg-yellow-500/15 text-yellow-600 dark:text-yellow-400 animate-pulse";
             case "stopped":
             case "deleting": return "bg-muted text-muted-foreground";
             default: return "bg-yellow-500/15 text-yellow-600 dark:text-yellow-400";
         }
     }
 
+    function statusLabel(status: string): string {
+        switch (status.toLowerCase()) {
+            case "pulling": return "Pulling image...";
+            case "creating": return "Creating container...";
+            case "starting": return "Starting...";
+            default: return status;
+        }
+    }
+
     function fmtBytes(bytes: number): string {
         if (bytes >= 1073741824) return `${(bytes / 1073741824).toFixed(1)} GB`;
         if (bytes >= 1048576) return `${(bytes / 1048576).toFixed(0)} MB`;
@@ -275,7 +530,14 @@
     let totalMem = $derived(workloads.reduce((s, w) => s + w.memory_bytes, 0));
     let totalDisk = $derived(volumes.reduce((s, v) => s + v.size_gb, 0));
 
-    onMount(load);
+    let loadStarted = false;
+
+    $effect(() => {
+        if (auth.token && !loadStarted) {
+            loadStarted = true;
+            load();
+        }
+    });
 </script>
 
 <dialog
@@ -354,6 +616,136 @@
     </div>
 </dialog>
 
+<dialog
+    bind:this={resourcePickerDialog}
+    class="fixed inset-0 z-50 m-auto w-full max-w-sm rounded-xl border bg-background shadow-xl p-0 backdrop:bg-black/40"
+>
+    <div class="flex flex-col gap-4 p-6">
+        <div class="flex items-center justify-between">
+            <h2 class="text-base font-semibold">Add Resource</h2>
+            <button
+                class="text-muted-foreground hover:text-foreground"
+                onclick={() => resourcePickerDialog?.close()}
+                aria-label="Close"
+            >
+                <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="18" y1="6" x2="6" y2="18"/><line x1="6" y1="6" x2="18" y2="18"/></svg>
+            </button>
+        </div>
+        <div class="flex flex-col gap-2">
+            {#each RESOURCE_TYPES as type}
+                <button
+                    class="flex items-center gap-3 rounded-lg border p-3 text-left hover:bg-muted/40 transition-colors"
+                    onclick={() => openResourceType(type.key)}
+                >
+                    <div class="flex w-9 shrink-0 items-center justify-center">
+                        <Icon icon={type.icon} width={20} height={20} />
+                    </div>
+                    <div>
+                        <p class="text-sm font-medium leading-tight">{type.label}</p>
+                        <p class="text-xs text-muted-foreground">{type.description}</p>
+                    </div>
+                </button>
+            {/each}
+        </div>
+    </div>
+</dialog>
+
+<dialog
+    bind:this={composeDialog}
+    class="fixed inset-0 z-50 m-auto w-full max-w-6xl rounded-xl border bg-background shadow-xl p-0 backdrop:bg-black/40"
+    onclose={() => resetComposeForm()}
+>
+    <div class="flex flex-col gap-4 p-6">
+        <div class="flex items-center justify-between">
+            <h2 class="text-base font-semibold">Deploy Docker Compose Stack</h2>
+            <button
+                class="text-muted-foreground hover:text-foreground"
+                onclick={() => composeDialog?.close()}
+                aria-label="Close"
+            >
+                <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="18" y1="6" x2="6" y2="18"/><line x1="6" y1="6" x2="18" y2="18"/></svg>
+            </button>
+        </div>
+        <div class="flex flex-col gap-1">
+            <label class="text-xs text-muted-foreground" for="c-name">Stack Name</label>
+            <input id="c-name" class="border rounded px-3 py-1.5 text-sm bg-background" placeholder="my-stack" bind:value={composeStackName} />
+        </div>
+        <div class="grid grid-cols-5 gap-4">
+            <div class="col-span-2 flex flex-col gap-1">
+                <label class="text-xs text-muted-foreground">Preview</label>
+                <div class="border rounded flex flex-col gap-2 p-3 h-[32rem] overflow-y-auto bg-muted/20">
+                    {#if composePreview.services.length === 0 && composePreview.volumes.length === 0}
+                        <p class="text-xs text-muted-foreground">No services detected yet.</p>
+                    {:else}
+                        {#each composePreview.services as service (service.serviceName)}
+                            <div class="flex items-center gap-2.5 rounded border bg-background p-2">
+                                <Icon icon={resolveImageIcon(service.image ?? "")} width={20} height={20} class="shrink-0" />
+                                <div class="min-w-0">
+                                    <p class="text-sm font-medium leading-tight truncate">{service.serviceName}</p>
+                                    <p class="text-xs text-muted-foreground font-mono truncate">{service.image ?? "no image"}</p>
+                                    {#if service.ports.length > 0}
+                                        <p class="text-xs text-muted-foreground font-mono truncate">{service.ports.join(", ")}</p>
+                                    {/if}
+                                </div>
+                            </div>
+                        {/each}
+                        {#if composePreview.volumes.length > 0}
+                            <p class="text-xs text-muted-foreground mt-1">Volumes</p>
+                            {#each composePreview.volumes as volumeName (volumeName)}
+                                <div class="flex items-center gap-2.5 rounded border bg-background p-2">
+                                    <Icon icon="mdi:database-outline" width={20} height={20} class="shrink-0 text-muted-foreground" />
+                                    <p class="text-sm font-medium leading-tight truncate">{volumeName}</p>
+                                </div>
+                            {/each}
+                        {/if}
+                    {/if}
+                </div>
+            </div>
+            <div class="col-span-3 flex flex-col gap-1">
+                <div class="flex items-center justify-between">
+                    <label class="text-xs text-muted-foreground" for="c-yaml">docker-compose.yml</label>
+                    <label class="text-xs text-primary cursor-pointer hover:underline">
+                        Upload file
+                        <input type="file" accept=".yml,.yaml" class="hidden" onchange={handleComposeFileUpload} />
+                    </label>
+                </div>
+                <div class="relative border rounded h-[32rem] overflow-hidden bg-background">
+                    <div
+                        bind:this={composeGutter}
+                        class="absolute left-0 top-0 bottom-0 w-9 overflow-hidden py-1.5 text-right text-xs leading-relaxed font-mono text-muted-foreground select-none bg-muted/30 border-r"
+                    >
+                        {#each Array(composeLineCount) as _, i}
+                            <div class="px-1.5">{i + 1}</div>
+                        {/each}
+                    </div>
+                    <pre
+                        bind:this={composeHighlightLayer}
+                        class="absolute inset-0 left-9 overflow-hidden pl-2 pr-3 py-1.5 text-xs leading-relaxed font-mono whitespace-pre-wrap break-words m-0 pointer-events-none"
+                    >{@html composeHighlighted}</pre>
+                    <textarea
+                        id="c-yaml"
+                        bind:this={composeTextarea}
+                        onscroll={syncComposeScroll}
+                        spellcheck="false"
+                        class="absolute inset-0 pl-11 pr-3 py-1.5 text-xs leading-relaxed bg-transparent font-mono resize-none outline-none w-full h-full text-transparent caret-foreground placeholder:text-muted-foreground"
+                        placeholder={"services:\n  redis:\n    image: redis:7\n  web:\n    image: nginx:alpine\n    ports:\n      - \"8080:80\""}
+                        bind:value={composeYaml}
+                    ></textarea>
+                </div>
+            </div>
+        </div>
+        {#if composeError}
+            <p class="text-xs text-destructive">{composeError}</p>
+        {/if}
+        <div class="flex gap-2 justify-end">
+            <Button size="sm" variant="outline" onclick={() => composeDialog?.close()}>Cancel</Button>
+            <Button size="sm" onclick={handleDeployStack} disabled={deployingStack || !composeStackName || !composeYaml.trim()}>
+                {deployingStack ? "Deploying..." : "Deploy Stack"}
+            </Button>
+        </div>
+    </div>
+</dialog>
+
 <dialog
     bind:this={volumeDialog}
     class="fixed inset-0 z-50 m-auto w-full max-w-sm rounded-xl border bg-background shadow-xl p-0 backdrop:bg-black/40"
@@ -392,6 +784,56 @@
     </div>
 </dialog>
 
+<dialog
+    bind:this={logsDialog}
+    class="fixed inset-0 z-50 m-auto w-full max-w-3xl h-[70vh] rounded-xl border bg-background shadow-xl p-0 backdrop:bg-black/40"
+    onclose={() => closeLogs()}
+>
+    <div class="flex flex-col h-full">
+        <div class="flex items-center justify-between px-6 py-4 border-b shrink-0">
+            <h2 class="text-base font-semibold font-mono">{logsWorkloadName}</h2>
+            <button
+                class="text-muted-foreground hover:text-foreground"
+                onclick={() => logsDialog?.close()}
+                aria-label="Close"
+            >
+                <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="18" y1="6" x2="6" y2="18"/><line x1="6" y1="6" x2="18" y2="18"/></svg>
+            </button>
+        </div>
+        <div class="flex-1 overflow-y-auto bg-black p-4 font-mono text-xs text-green-400">
+            {#if logsError}
+                <p class="text-red-400">{logsError}</p>
+            {/if}
+            {#each logsLines as line}
+                <p class="whitespace-pre-wrap">{line}</p>
+            {/each}
+        </div>
+    </div>
+</dialog>
+
+<dialog
+    bind:this={execDialog}
+    class="fixed inset-0 z-50 m-auto w-full max-w-4xl h-[80vh] rounded-xl border bg-background shadow-xl p-0 backdrop:bg-black/40"
+    onclose={() => closeExec()}
+>
+    <div class="flex flex-col h-full">
+        <div class="flex items-center justify-between px-6 py-4 border-b shrink-0">
+            <h2 class="text-base font-semibold font-mono">{execWorkloadName}</h2>
+            <button
+                class="text-muted-foreground hover:text-foreground"
+                onclick={() => execDialog?.close()}
+                aria-label="Close"
+            >
+                <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="18" y1="6" x2="6" y2="18"/><line x1="6" y1="6" x2="18" y2="18"/></svg>
+            </button>
+        </div>
+        {#if execError}
+            <p class="px-6 py-2 text-xs text-destructive shrink-0">{execError}</p>
+        {/if}
+        <div class="flex-1 overflow-hidden bg-black p-2" bind:this={execTerminalEl}></div>
+    </div>
+</dialog>
+
 <header class="flex h-16 shrink-0 items-center gap-2 px-4 border-b">
     <Sidebar.Trigger class="-ms-1" />
     <span class="text-sm text-muted-foreground">/</span>
@@ -433,9 +875,9 @@
                 <Button size="sm" variant="outline" onclick={() => volumeDialog?.showModal()}>
                     Add Volume
                 </Button>
-                <Button size="sm" onclick={() => deployDialog?.showModal()}>
+                <Button size="sm" onclick={() => resourcePickerDialog?.showModal()}>
                     <svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg>
-                    Deploy Container
+                    Add Resource
                 </Button>
             </div>
         </div>
@@ -504,51 +946,111 @@
                             </td>
                         </tr>
                     {:else}
-                        {#each filteredResources as item (item.kind + item.data.id)}
+                        {#snippet workloadActions(w: Workload)}
+                            <Button
+                                size="sm"
+                                variant="ghost"
+                                class="h-7 px-2 text-xs"
+                                onclick={() => openLogs(w)}
+                            >
+                                Logs
+                            </Button>
+                            <Button
+                                size="sm"
+                                variant="ghost"
+                                class="h-7 px-2 text-xs"
+                                onclick={() => openExec(w)}
+                                disabled={w.status !== "running"}
+                            >
+                                Shell
+                            </Button>
+                            <Button
+                                size="sm"
+                                variant="ghost"
+                                class="text-destructive hover:text-destructive h-7 px-2 text-xs"
+                                onclick={() => handleDeleteWorkload(w.id)}
+                            >
+                                Stop
+                            </Button>
+                        {/snippet}
+                        {#snippet workloadRow(w: Workload, indented: boolean)}
+                            <tr class="border-t hover:bg-muted/20 transition-colors">
+                                <td class="px-4 py-3">
+                                    <div class="flex items-center gap-2.5" class:ps-6={indented}>
+                                        <div class="flex w-5 shrink-0 items-center justify-center">
+                                            <Icon icon={resolveImageIcon(w.image)} width={20} height={20} />
+                                        </div>
+                                        <div>
+                                            <p class="font-medium leading-tight">{w.service_name ?? w.name}</p>
+                                            <p class="text-xs text-muted-foreground font-mono">{w.image}</p>
+                                        </div>
+                                    </div>
+                                </td>
+                                <td class="px-4 py-3">
+                                    <span class="text-xs px-2 py-0.5 rounded border font-medium">Container</span>
+                                </td>
+                                <td class="px-4 py-3 text-xs text-muted-foreground font-mono">
+                                    {w.assigned_agent_id ? w.assigned_agent_id.slice(0, 8) : "-"}
+                                </td>
+                                <td class="px-4 py-3">
+                                    <div class="flex items-center gap-2 min-w-[120px]">
+                                        <span class="text-xs text-muted-foreground w-8">{w.cpu_millicores}m</span>
+                                        <div class="flex-1 h-1 rounded-full bg-muted overflow-hidden">
+                                            <div class="h-full rounded-full bg-foreground/60" style="width: {Math.min(100, w.cpu_millicores / 10)}%"></div>
+                                        </div>
+                                    </div>
+                                </td>
+                                <td class="px-4 py-3">
+                                    <span class="text-xs px-2 py-0.5 rounded-full font-medium {statusClass(w.status)}">
+                                        {statusLabel(w.status)}
+                                    </span>
+                                </td>
+                                <td class="px-4 py-3 text-right">
+                                    {@render workloadActions(w)}
+                                </td>
+                            </tr>
+                        {/snippet}
+                        {#each filteredResources as item (item.kind + (item.kind === "stack" ? item.data.stack_id : item.data.id))}
                             {#if item.kind === "container"}
-                                {@const w = item.data}
+                                {@render workloadRow(item.data, false)}
+                            {:else if item.kind === "stack"}
+                                {@const stack = item.data}
+                                {@const expanded = expandedStacks.has(stack.stack_id)}
                                 <tr class="border-t hover:bg-muted/20 transition-colors">
                                     <td class="px-4 py-3">
-                                        <div class="flex items-center gap-2.5">
-                                            <div class="flex h-7 w-7 shrink-0 items-center justify-center rounded border bg-muted/50">
-                                                <svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><rect x="2" y="7" width="20" height="14" rx="2"/><path d="M16 21V5a2 2 0 0 0-2-2h-4a2 2 0 0 0-2 2v16"/></svg>
+                                        <button
+                                            class="flex items-center gap-2.5 text-left"
+                                            onclick={() => toggleStack(stack.stack_id)}
+                                        >
+                                            <div class="flex w-5 shrink-0 items-center justify-center">
+                                                <Icon icon="mdi:layers-outline" width={20} height={20} />
                                             </div>
                                             <div>
-                                                <p class="font-medium leading-tight">{w.name}</p>
-                                                <p class="text-xs text-muted-foreground font-mono">{w.image}</p>
+                                                <p class="font-medium leading-tight">{stack.stack_name}</p>
+                                                <p class="text-xs text-muted-foreground">{stack.children.length} services</p>
                                             </div>
-                                        </div>
+                                            <Icon icon={expanded ? "mdi:chevron-up" : "mdi:chevron-down"} width={16} height={16} class="text-muted-foreground" />
+                                        </button>
                                     </td>
                                     <td class="px-4 py-3">
-                                        <span class="text-xs px-2 py-0.5 rounded border font-medium">Container</span>
+                                        <span class="text-xs px-2 py-0.5 rounded border font-medium">Compose Stack</span>
                                     </td>
                                     <td class="px-4 py-3 text-xs text-muted-foreground font-mono">
-                                        {w.assigned_agent_id ? w.assigned_agent_id.slice(0, 8) : "-"}
-                                    </td>
-                                    <td class="px-4 py-3">
-                                        <div class="flex items-center gap-2 min-w-[120px]">
-                                            <span class="text-xs text-muted-foreground w-8">{w.cpu_millicores}m</span>
-                                            <div class="flex-1 h-1 rounded-full bg-muted overflow-hidden">
-                                                <div class="h-full rounded-full bg-foreground/60" style="width: {Math.min(100, w.cpu_millicores / 10)}%"></div>
-                                            </div>
-                                        </div>
+                                        {stack.children[0]?.assigned_agent_id ? stack.children[0].assigned_agent_id!.slice(0, 8) : "-"}
                                     </td>
+                                    <td class="px-4 py-3 text-xs text-muted-foreground">-</td>
                                     <td class="px-4 py-3">
-                                        <span class="text-xs px-2 py-0.5 rounded-full font-medium {statusClass(w.status)}">
-                                            {w.status}
+                                        <span class="text-xs px-2 py-0.5 rounded-full font-medium {statusClass(stack.children.every((c) => c.status === 'running') ? 'running' : 'pending')}">
+                                            {stack.children.filter((c) => c.status === 'running').length}/{stack.children.length} running
                                         </span>
                                     </td>
-                                    <td class="px-4 py-3 text-right">
-                                        <Button
-                                            size="sm"
-                                            variant="ghost"
-                                            class="text-destructive hover:text-destructive h-7 px-2 text-xs"
-                                            onclick={() => handleDeleteWorkload(w.id)}
-                                        >
-                                            Stop
-                                        </Button>
-                                    </td>
+                                    <td class="px-4 py-3"></td>
                                 </tr>
+                                {#if expanded}
+                                    {#each stack.children as child (child.id)}
+                                        {@render workloadRow(child, true)}
+                                    {/each}
+                                {/if}
                             {:else}
                                 {@const v = item.data}
                                 <tr class="border-t hover:bg-muted/20 transition-colors">
diff --git a/app/vite.config.ts b/app/vite.config.ts
index e402b69e..6042d847 100644
--- a/app/vite.config.ts
+++ b/app/vite.config.ts
@@ -4,6 +4,9 @@ import { defineConfig } from 'vite';
 
 export default defineConfig({
 	plugins: [tailwindcss(), sveltekit()],
+	optimizeDeps: {
+		include: ['@xterm/xterm', '@xterm/addon-fit'],
+	},
 	server: {
 		watch: {
 			usePolling: true,
diff --git a/control-plane/api-gateway/Cargo.toml b/control-plane/api-gateway/Cargo.toml
index 9adb4c58..222d966b 100644
--- a/control-plane/api-gateway/Cargo.toml
+++ b/control-plane/api-gateway/Cargo.toml
@@ -22,7 +22,7 @@ async-trait = { workspace = true }
 sea-orm = { workspace = true }
 
 # Web framework
-axum = { workspace = true }
+axum = { workspace = true, features = ["ws"] }
 axum-server = { workspace = true }
 tower-http = { workspace = true }
 hyper = { workspace = true }
@@ -67,7 +67,9 @@ cookie = { workspace = true }
 qrcode = { workspace = true }
 image = { workspace = true }
 sysinfo = { workspace = true }
-reqwest = { workspace = true }
+reqwest = { workspace = true, features = ["stream"] }
+tokio-tungstenite = { workspace = true }
+futures-util = { workspace = true }
 prometheus = { workspace = true }
 etcd-client = { workspace = true }
 tower_governor = { workspace = true }
diff --git a/control-plane/api-gateway/src/auth/crypto.rs b/control-plane/api-gateway/src/auth/crypto.rs
index 2a18426d..19f466ba 100644
--- a/control-plane/api-gateway/src/auth/crypto.rs
+++ b/control-plane/api-gateway/src/auth/crypto.rs
@@ -1,6 +1,6 @@
 use base64::Engine;
 use bcrypt::{hash, verify, DEFAULT_COST};
-use rsa::rand_core::{OsRng, RngCore};
+use rsa::rand_core::OsRng;
 use rsa::{
     pkcs1::{DecodeRsaPrivateKey, EncodeRsaPrivateKey, EncodeRsaPublicKey},
     RsaPrivateKey, RsaPublicKey,
diff --git a/control-plane/api-gateway/src/auth/jwt.rs b/control-plane/api-gateway/src/auth/jwt.rs
index 4385308a..928593c5 100644
--- a/control-plane/api-gateway/src/auth/jwt.rs
+++ b/control-plane/api-gateway/src/auth/jwt.rs
@@ -50,3 +50,109 @@ pub fn verify_jwt(token: &str) -> Result<TokenData<Claims>, jsonwebtoken::errors
 fn get_jwt_secret() -> String {
     env::var("JWT_SECRET").unwrap_or_else(|_| "your-secret-key".to_string())
 }
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct ExecTicketClaims {
+    pub workload_id: Uuid,
+    pub user_id: Uuid,
+    pub exp: i64,
+    pub iat: i64,
+    pub purpose: String,
+}
+
+impl ExecTicketClaims {
+    pub fn new(workload_id: Uuid, user_id: Uuid) -> Self {
+        let now = Utc::now();
+        ExecTicketClaims {
+            workload_id,
+            user_id,
+            exp: (now + Duration::seconds(30)).timestamp(),
+            iat: now.timestamp(),
+            purpose: "workload-exec".to_string(),
+        }
+    }
+}
+
+pub fn create_exec_ticket(
+    workload_id: Uuid,
+    user_id: Uuid,
+) -> Result<String, jsonwebtoken::errors::Error> {
+    let claims = ExecTicketClaims::new(workload_id, user_id);
+    let secret = get_jwt_secret();
+    encode(
+        &Header::default(),
+        &claims,
+        &EncodingKey::from_secret(secret.as_ref()),
+    )
+}
+
+pub fn verify_exec_ticket(
+    token: &str,
+    workload_id: Uuid,
+) -> Result<ExecTicketClaims, jsonwebtoken::errors::Error> {
+    let secret = get_jwt_secret();
+    let data = decode::<ExecTicketClaims>(
+        token,
+        &DecodingKey::from_secret(secret.as_ref()),
+        &Validation::default(),
+    )?;
+
+    if data.claims.purpose != "workload-exec" || data.claims.workload_id != workload_id {
+        return Err(jsonwebtoken::errors::ErrorKind::InvalidToken.into());
+    }
+
+    Ok(data.claims)
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct NodeMetricsTicketClaims {
+    pub agent_id: Uuid,
+    pub user_id: Uuid,
+    pub exp: i64,
+    pub iat: i64,
+    pub purpose: String,
+}
+
+impl NodeMetricsTicketClaims {
+    pub fn new(agent_id: Uuid, user_id: Uuid) -> Self {
+        let now = Utc::now();
+        NodeMetricsTicketClaims {
+            agent_id,
+            user_id,
+            exp: (now + Duration::seconds(30)).timestamp(),
+            iat: now.timestamp(),
+            purpose: "node-metrics".to_string(),
+        }
+    }
+}
+
+pub fn create_node_metrics_ticket(
+    agent_id: Uuid,
+    user_id: Uuid,
+) -> Result<String, jsonwebtoken::errors::Error> {
+    let claims = NodeMetricsTicketClaims::new(agent_id, user_id);
+    let secret = get_jwt_secret();
+    encode(
+        &Header::default(),
+        &claims,
+        &EncodingKey::from_secret(secret.as_ref()),
+    )
+}
+
+pub fn verify_node_metrics_ticket(
+    token: &str,
+    agent_id: Uuid,
+) -> Result<NodeMetricsTicketClaims, jsonwebtoken::errors::Error> {
+    let secret = get_jwt_secret();
+    let data = decode::<NodeMetricsTicketClaims>(
+        token,
+        &DecodingKey::from_secret(secret.as_ref()),
+        &Validation::default(),
+    )?;
+
+    if data.claims.purpose != "node-metrics" || data.claims.agent_id != agent_id {
+        return Err(jsonwebtoken::errors::ErrorKind::InvalidToken.into());
+    }
+
+    Ok(data.claims)
+}
diff --git a/control-plane/api-gateway/src/init.rs b/control-plane/api-gateway/src/init.rs
index 4a70a724..dcc0f819 100644
--- a/control-plane/api-gateway/src/init.rs
+++ b/control-plane/api-gateway/src/init.rs
@@ -220,22 +220,39 @@ pub async fn initialize_database(
             created_at: ActiveValue::Set(now),
         };
         Role::insert(new_role).exec_without_returning(db).await?;
-
-        // Assign all permissions to Admin role
-        for perm_id in permission_map.values() {
-            let role_perm = role_permission::ActiveModel {
-                role_id: ActiveValue::Set(role_id),
-                permission_id: ActiveValue::Set(*perm_id),
-            };
-            RolePermission::insert(role_perm)
-                .exec_without_returning(db)
-                .await?;
-        }
-
-        tracing::info!("Admin role created with all permissions");
+        tracing::info!("Admin role created");
         role_id
     };
 
+    let admin_existing_perm_ids: std::collections::HashSet<Uuid> = RolePermission::find()
+        .filter(role_permission::Column::RoleId.eq(admin_role_id))
+        .all(db)
+        .await?
+        .into_iter()
+        .map(|rp| rp.permission_id)
+        .collect();
+
+    let mut admin_granted = 0;
+    for perm_id in permission_map.values() {
+        if admin_existing_perm_ids.contains(perm_id) {
+            continue;
+        }
+        let role_perm = role_permission::ActiveModel {
+            role_id: ActiveValue::Set(admin_role_id),
+            permission_id: ActiveValue::Set(*perm_id),
+        };
+        RolePermission::insert(role_perm)
+            .exec_without_returning(db)
+            .await?;
+        admin_granted += 1;
+    }
+    if admin_granted > 0 {
+        tracing::info!(
+            count = admin_granted,
+            "granted missing permissions to Admin role"
+        );
+    }
+
     // 4b. Create Operator role
     let operator_role_exists = Role::find()
         .filter(role::Column::Name.eq("Operator"))
diff --git a/control-plane/api-gateway/src/routes/agent_proxy.rs b/control-plane/api-gateway/src/routes/agent_proxy.rs
new file mode 100644
index 00000000..678c546d
--- /dev/null
+++ b/control-plane/api-gateway/src/routes/agent_proxy.rs
@@ -0,0 +1,423 @@
+use axum::{
+    body::Body,
+    extract::ws::{Message, WebSocket, WebSocketUpgrade},
+    extract::{Path, Query, State},
+    http::StatusCode,
+    response::{IntoResponse, Json},
+    routing::get,
+    Router,
+};
+use entity::entities::{agents, workloads};
+use futures_util::{SinkExt, StreamExt};
+use sea_orm::EntityTrait;
+use serde::Deserialize;
+use serde_json::json;
+use tokio_tungstenite::tungstenite::client::IntoClientRequest;
+use tokio_tungstenite::tungstenite::Message as TungsteniteMessage;
+use uuid::Uuid;
+
+use crate::{
+    auth::jwt::{
+        create_exec_ticket, create_node_metrics_ticket, verify_exec_ticket,
+        verify_node_metrics_ticket,
+    },
+    auth::rbac::{CanManageWorkloads, CanViewAgents, CanViewWorkloads},
+    AppState,
+};
+
+const CSFX_AGENT_PORT_ENV: &str = "CSFX_AGENT_PORT";
+const METRICS_TICKET_SCOPE: &str = "__node_metrics__";
+
+async fn resolve_agent_tunnel_ip(
+    state: &AppState,
+    agent_id: Uuid,
+) -> Result<String, (StatusCode, Json<serde_json::Value>)> {
+    let agent = agents::Entity::find_by_id(agent_id)
+        .one(&state.db_conn)
+        .await
+        .map_err(|e| {
+            (
+                StatusCode::INTERNAL_SERVER_ERROR,
+                Json(json!({ "error": format!("database error: {}", e) })),
+            )
+        })?
+        .ok_or_else(|| {
+            (
+                StatusCode::NOT_FOUND,
+                Json(json!({ "error": "agent not found" })),
+            )
+        })?;
+
+    agent.wg_tunnel_ip.ok_or_else(|| {
+        (
+            StatusCode::SERVICE_UNAVAILABLE,
+            Json(json!({ "error": "agent has no known tunnel address" })),
+        )
+    })
+}
+
+async fn resolve_agent_target(
+    state: &AppState,
+    workload_id: Uuid,
+) -> Result<(String, Uuid), (StatusCode, Json<serde_json::Value>)> {
+    let workload = workloads::Entity::find_by_id(workload_id)
+        .one(&state.db_conn)
+        .await
+        .map_err(|e| {
+            (
+                StatusCode::INTERNAL_SERVER_ERROR,
+                Json(json!({ "error": format!("database error: {}", e) })),
+            )
+        })?
+        .ok_or_else(|| {
+            (
+                StatusCode::NOT_FOUND,
+                Json(json!({ "error": "workload not found" })),
+            )
+        })?;
+
+    let agent_id = workload.assigned_agent_id.ok_or_else(|| {
+        (
+            StatusCode::CONFLICT,
+            Json(json!({ "error": "workload has no assigned agent" })),
+        )
+    })?;
+
+    let agent = agents::Entity::find_by_id(agent_id)
+        .one(&state.db_conn)
+        .await
+        .map_err(|e| {
+            (
+                StatusCode::INTERNAL_SERVER_ERROR,
+                Json(json!({ "error": format!("database error: {}", e) })),
+            )
+        })?
+        .ok_or_else(|| {
+            (
+                StatusCode::NOT_FOUND,
+                Json(json!({ "error": "agent not found" })),
+            )
+        })?;
+
+    let tunnel_ip = agent.wg_tunnel_ip.ok_or_else(|| {
+        (
+            StatusCode::SERVICE_UNAVAILABLE,
+            Json(json!({ "error": "agent has no known tunnel address" })),
+        )
+    })?;
+
+    Ok((tunnel_ip, agent_id))
+}
+
+async fn fetch_proxy_ticket(
+    state: &AppState,
+    agent_id: Uuid,
+    workload_id: &str,
+) -> Result<String, (StatusCode, Json<serde_json::Value>)> {
+    let (status, body) = state
+        .service_client
+        .forward_to_registry(
+            reqwest::Method::POST,
+            "/internal/agent-proxy-ticket",
+            Some(json!({ "agent_id": agent_id, "workload_id": workload_id })),
+            None,
+        )
+        .await
+        .map_err(|e| {
+            (
+                StatusCode::BAD_GATEWAY,
+                Json(json!({ "error": format!("failed to reach registry: {}", e) })),
+            )
+        })?;
+
+    if !status.is_success() {
+        return Err((
+            StatusCode::BAD_GATEWAY,
+            Json(json!({ "error": "registry refused to issue proxy ticket" })),
+        ));
+    }
+
+    let body = body.ok_or_else(|| {
+        (
+            StatusCode::BAD_GATEWAY,
+            Json(json!({ "error": "registry returned empty proxy ticket response" })),
+        )
+    })?;
+
+    let payload = body["payload"].as_str().ok_or_else(|| {
+        (
+            StatusCode::BAD_GATEWAY,
+            Json(json!({ "error": "malformed proxy ticket payload" })),
+        )
+    })?;
+    let signature = body["signature"].as_str().ok_or_else(|| {
+        (
+            StatusCode::BAD_GATEWAY,
+            Json(json!({ "error": "malformed proxy ticket signature" })),
+        )
+    })?;
+
+    Ok(format!("{}.{}", payload, signature))
+}
+
+pub async fn stream_workload_logs(
+    CanViewWorkloads(_claims): CanViewWorkloads,
+    State(state): State<AppState>,
+    Path(workload_id): Path<Uuid>,
+) -> Result<impl IntoResponse, (StatusCode, Json<serde_json::Value>)> {
+    let (tunnel_ip, agent_id) = resolve_agent_target(&state, workload_id).await?;
+    let ticket = fetch_proxy_ticket(&state, agent_id, &workload_id.to_string()).await?;
+
+    let agent_port: u16 = std::env::var(CSFX_AGENT_PORT_ENV)
+        .ok()
+        .and_then(|v| v.parse().ok())
+        .unwrap_or(7443);
+
+    let url = format!("http://{}:{}/logs/{}", tunnel_ip, agent_port, workload_id);
+
+    let client = reqwest::Client::new();
+    let resp = client
+        .get(&url)
+        .header("X-Csfx-Proxy-Ticket", ticket)
+        .send()
+        .await
+        .map_err(|e| {
+            (
+                StatusCode::BAD_GATEWAY,
+                Json(json!({ "error": format!("failed to reach agent: {}", e) })),
+            )
+        })?;
+
+    if !resp.status().is_success() {
+        let status =
+            StatusCode::from_u16(resp.status().as_u16()).unwrap_or(StatusCode::BAD_GATEWAY);
+        return Err((
+            status,
+            Json(json!({ "error": "agent refused log stream request" })),
+        ));
+    }
+
+    let stream = resp.bytes_stream();
+    Ok(Body::from_stream(stream))
+}
+
+pub async fn issue_exec_ticket(
+    CanManageWorkloads(claims): CanManageWorkloads,
+    Path(workload_id): Path<Uuid>,
+) -> Result<impl IntoResponse, (StatusCode, Json<serde_json::Value>)> {
+    let ticket = create_exec_ticket(workload_id, claims.user_id).map_err(|e| {
+        (
+            StatusCode::INTERNAL_SERVER_ERROR,
+            Json(json!({ "error": format!("failed to issue exec ticket: {}", e) })),
+        )
+    })?;
+
+    Ok(Json(json!({ "ticket": ticket })))
+}
+
+#[derive(Deserialize)]
+pub struct ExecQuery {
+    ticket: String,
+}
+
+pub async fn exec_workload(
+    State(state): State<AppState>,
+    Path(workload_id): Path<Uuid>,
+    Query(query): Query<ExecQuery>,
+    ws: WebSocketUpgrade,
+) -> Result<axum::response::Response, (StatusCode, Json<serde_json::Value>)> {
+    verify_exec_ticket(&query.ticket, workload_id).map_err(|_| {
+        (
+            StatusCode::UNAUTHORIZED,
+            Json(json!({ "error": "invalid or expired exec ticket" })),
+        )
+    })?;
+
+    let (tunnel_ip, agent_id) = resolve_agent_target(&state, workload_id).await?;
+    let proxy_ticket = fetch_proxy_ticket(&state, agent_id, &workload_id.to_string()).await?;
+
+    let agent_port: u16 = std::env::var(CSFX_AGENT_PORT_ENV)
+        .ok()
+        .and_then(|v| v.parse().ok())
+        .unwrap_or(7443);
+
+    let agent_url = format!("ws://{}:{}/exec/{}", tunnel_ip, agent_port, workload_id);
+
+    let mut request = agent_url.into_client_request().map_err(|e| {
+        (
+            StatusCode::INTERNAL_SERVER_ERROR,
+            Json(json!({ "error": format!("invalid agent exec url: {}", e) })),
+        )
+    })?;
+    request.headers_mut().insert(
+        "X-Csfx-Proxy-Ticket",
+        proxy_ticket.parse().map_err(|_| {
+            (
+                StatusCode::INTERNAL_SERVER_ERROR,
+                Json(json!({ "error": "invalid proxy ticket header" })),
+            )
+        })?,
+    );
+
+    let (agent_socket, _) = tokio_tungstenite::connect_async(request)
+        .await
+        .map_err(|e| {
+            (
+                StatusCode::BAD_GATEWAY,
+                Json(json!({ "error": format!("failed to connect to agent exec socket: {}", e) })),
+            )
+        })?;
+
+    Ok(ws.on_upgrade(move |browser_socket| bridge_exec_sockets(browser_socket, agent_socket)))
+}
+
+async fn bridge_exec_sockets(
+    browser_socket: WebSocket,
+    agent_socket: tokio_tungstenite::WebSocketStream<
+        tokio_tungstenite::MaybeTlsStream<tokio::net::TcpStream>,
+    >,
+) {
+    let (mut browser_sink, mut browser_stream) = browser_socket.split();
+    let (mut agent_sink, mut agent_stream) = agent_socket.split();
+
+    let browser_to_agent = tokio::spawn(async move {
+        while let Some(Ok(msg)) = browser_stream.next().await {
+            let forwarded = match msg {
+                Message::Binary(data) => TungsteniteMessage::Binary(data),
+                Message::Text(text) => TungsteniteMessage::Text(text.as_str().into()),
+                Message::Close(_) => break,
+                _ => continue,
+            };
+            if agent_sink.send(forwarded).await.is_err() {
+                break;
+            }
+        }
+    });
+
+    let agent_to_browser = tokio::spawn(async move {
+        while let Some(Ok(msg)) = agent_stream.next().await {
+            let forwarded = match msg {
+                TungsteniteMessage::Binary(data) => Message::Binary(data),
+                TungsteniteMessage::Text(text) => Message::Text(text.as_str().into()),
+                TungsteniteMessage::Close(_) => break,
+                _ => continue,
+            };
+            if browser_sink.send(forwarded).await.is_err() {
+                break;
+            }
+        }
+    });
+
+    tokio::select! {
+        _ = browser_to_agent => {}
+        _ = agent_to_browser => {}
+    }
+}
+
+pub async fn issue_node_metrics_ticket(
+    CanViewAgents(claims): CanViewAgents,
+    Path(agent_id): Path<Uuid>,
+) -> Result<impl IntoResponse, (StatusCode, Json<serde_json::Value>)> {
+    let ticket = create_node_metrics_ticket(agent_id, claims.user_id).map_err(|e| {
+        (
+            StatusCode::INTERNAL_SERVER_ERROR,
+            Json(json!({ "error": format!("failed to issue node metrics ticket: {}", e) })),
+        )
+    })?;
+
+    Ok(Json(json!({ "ticket": ticket })))
+}
+
+#[derive(Deserialize)]
+pub struct NodeMetricsQuery {
+    ticket: String,
+}
+
+pub async fn stream_node_metrics(
+    State(state): State<AppState>,
+    Path(agent_id): Path<Uuid>,
+    Query(query): Query<NodeMetricsQuery>,
+    ws: WebSocketUpgrade,
+) -> Result<axum::response::Response, (StatusCode, Json<serde_json::Value>)> {
+    verify_node_metrics_ticket(&query.ticket, agent_id).map_err(|_| {
+        (
+            StatusCode::UNAUTHORIZED,
+            Json(json!({ "error": "invalid or expired node metrics ticket" })),
+        )
+    })?;
+
+    let tunnel_ip = resolve_agent_tunnel_ip(&state, agent_id).await?;
+    let proxy_ticket = fetch_proxy_ticket(&state, agent_id, METRICS_TICKET_SCOPE).await?;
+
+    let agent_port: u16 = std::env::var(CSFX_AGENT_PORT_ENV)
+        .ok()
+        .and_then(|v| v.parse().ok())
+        .unwrap_or(7443);
+
+    let agent_url = format!("ws://{}:{}/metrics/stream", tunnel_ip, agent_port);
+
+    let mut request = agent_url.into_client_request().map_err(|e| {
+        (
+            StatusCode::INTERNAL_SERVER_ERROR,
+            Json(json!({ "error": format!("invalid agent metrics url: {}", e) })),
+        )
+    })?;
+    request.headers_mut().insert(
+        "X-Csfx-Proxy-Ticket",
+        proxy_ticket.parse().map_err(|_| {
+            (
+                StatusCode::INTERNAL_SERVER_ERROR,
+                Json(json!({ "error": "invalid proxy ticket header" })),
+            )
+        })?,
+    );
+
+    let (agent_socket, _) = tokio_tungstenite::connect_async(request)
+        .await
+        .map_err(|e| {
+            (
+                StatusCode::BAD_GATEWAY,
+                Json(
+                    json!({ "error": format!("failed to connect to agent metrics socket: {}", e) }),
+                ),
+            )
+        })?;
+
+    Ok(ws.on_upgrade(move |browser_socket| bridge_metrics_socket(browser_socket, agent_socket)))
+}
+
+async fn bridge_metrics_socket(
+    browser_socket: WebSocket,
+    agent_socket: tokio_tungstenite::WebSocketStream<
+        tokio_tungstenite::MaybeTlsStream<tokio::net::TcpStream>,
+    >,
+) {
+    let (mut browser_sink, _browser_stream) = browser_socket.split();
+    let (_agent_sink, mut agent_stream) = agent_socket.split();
+
+    while let Some(Ok(msg)) = agent_stream.next().await {
+        let forwarded = match msg {
+            TungsteniteMessage::Text(text) => Message::Text(text.as_str().into()),
+            TungsteniteMessage::Close(_) => break,
+            _ => continue,
+        };
+        if browser_sink.send(forwarded).await.is_err() {
+            break;
+        }
+    }
+}
+
+pub fn agent_proxy_routes() -> Router<AppState> {
+    Router::new()
+        .route("/workloads/{id}/logs", get(stream_workload_logs))
+        .route(
+            "/workloads/{id}/exec/ticket",
+            axum::routing::post(issue_exec_ticket),
+        )
+        .route("/workloads/{id}/exec", get(exec_workload))
+        .route(
+            "/agents/{id}/metrics/ticket",
+            axum::routing::post(issue_node_metrics_ticket),
+        )
+        .route("/agents/{id}/metrics/stream", get(stream_node_metrics))
+}
diff --git a/control-plane/api-gateway/src/routes/agents.rs b/control-plane/api-gateway/src/routes/agents.rs
index c5f1c4d1..f82f60e3 100644
--- a/control-plane/api-gateway/src/routes/agents.rs
+++ b/control-plane/api-gateway/src/routes/agents.rs
@@ -168,6 +168,7 @@ pub async fn register_agent(
             public_key_pem: ActiveValue::Set(None),
             wg_public_key: ActiveValue::Set(None),
             wg_endpoint: ActiveValue::Set(None),
+            wg_tunnel_ip: ActiveValue::Set(None),
         };
 
         new_agent.insert(&state.db_conn).await.map_err(|e| {
diff --git a/control-plane/api-gateway/src/routes/logs.rs b/control-plane/api-gateway/src/routes/logs.rs
index e8734885..11ec9113 100644
--- a/control-plane/api-gateway/src/routes/logs.rs
+++ b/control-plane/api-gateway/src/routes/logs.rs
@@ -40,10 +40,7 @@ pub struct LogsResponse {
     pub has_more: bool,
 }
 
-fn apply_filters(
-    mut query: sea_orm::Select<Logs>,
-    params: &LogsQuery,
-) -> sea_orm::Select<Logs> {
+fn apply_filters(mut query: sea_orm::Select<Logs>, params: &LogsQuery) -> sea_orm::Select<Logs> {
     if let Some(service) = &params.service {
         query = query.filter(logs::Column::Service.eq(service));
     }
diff --git a/control-plane/api-gateway/src/routes/mod.rs b/control-plane/api-gateway/src/routes/mod.rs
index e9229fd5..288c6488 100644
--- a/control-plane/api-gateway/src/routes/mod.rs
+++ b/control-plane/api-gateway/src/routes/mod.rs
@@ -17,6 +17,7 @@ use tower_http::services::{ServeDir, ServeFile};
 use tower_http::trace::TraceLayer;
 use tracing::{info_span, Span};
 
+pub mod agent_proxy;
 pub mod agents;
 pub mod events;
 pub mod logs;
@@ -110,6 +111,7 @@ pub fn create_router() -> Router<AppState> {
         .merge(ssh_keys::ssh_keys_internal_routes());
 
     let rate_limited_router = Router::new()
+        .merge(agent_proxy::agent_proxy_routes())
         .merge(agents::agents_routes())
         .merge(networks::networks_routes())
         .merge(organizations::routes())
diff --git a/control-plane/api-gateway/src/routes/networks.rs b/control-plane/api-gateway/src/routes/networks.rs
index d9301db4..45d947a5 100644
--- a/control-plane/api-gateway/src/routes/networks.rs
+++ b/control-plane/api-gateway/src/routes/networks.rs
@@ -215,5 +215,8 @@ pub fn networks_routes() -> Router<AppState> {
             get(list_policies).post(create_policy),
         )
         .route("/networks/{id}/members", get(list_members).post(add_member))
-        .route("/networks/{id}/members/{workload_id}", delete(remove_member))
+        .route(
+            "/networks/{id}/members/{workload_id}",
+            delete(remove_member),
+        )
 }
diff --git a/control-plane/api-gateway/src/routes/organizations.rs b/control-plane/api-gateway/src/routes/organizations.rs
index 2e3eb203..0fd01469 100644
--- a/control-plane/api-gateway/src/routes/organizations.rs
+++ b/control-plane/api-gateway/src/routes/organizations.rs
@@ -19,7 +19,10 @@ pub fn routes() -> Router<AppState> {
         // User management endpoints
         .route("/organization/users", axum::routing::get(list_users))
         .route("/organization/users", axum::routing::post(create_user))
-        .route("/organization/users/{user_id}", axum::routing::get(get_user))
+        .route(
+            "/organization/users/{user_id}",
+            axum::routing::get(get_user),
+        )
         .route(
             "/organization/users/{user_id}",
             axum::routing::put(update_user),
diff --git a/control-plane/api-gateway/src/routes/releases.rs b/control-plane/api-gateway/src/routes/releases.rs
index 1f6e2dc1..c0453ae6 100644
--- a/control-plane/api-gateway/src/routes/releases.rs
+++ b/control-plane/api-gateway/src/routes/releases.rs
@@ -116,16 +116,26 @@ fn semver_is_newer(candidate: &str, current: &str) -> bool {
         .unwrap_or(false)
 }
 
-fn parse_semver(v: &str) -> Option<(u32, u32, u32)> {
+fn parse_semver(v: &str) -> Option<(u32, u32, u32, u32)> {
     let v = v.trim_start_matches('v');
-    let base = v.split('-').next().unwrap_or(v);
+    let mut segments = v.splitn(2, '-');
+    let base = segments.next().unwrap_or(v);
+    let pre_release = segments.next();
+
     let parts: Vec<&str> = base.split('.').collect();
     if parts.len() != 3 {
         return None;
     }
+
+    let pre_release_number = pre_release
+        .and_then(|p| p.rsplit('.').next())
+        .and_then(|n| n.parse().ok())
+        .unwrap_or(u32::MAX);
+
     Some((
         parts[0].parse().ok()?,
         parts[1].parse().ok()?,
         parts[2].parse().ok()?,
+        pre_release_number,
     ))
 }
diff --git a/control-plane/api-gateway/src/routes/resource_groups.rs b/control-plane/api-gateway/src/routes/resource_groups.rs
index 559cf8d1..36cd0cf4 100644
--- a/control-plane/api-gateway/src/routes/resource_groups.rs
+++ b/control-plane/api-gateway/src/routes/resource_groups.rs
@@ -109,7 +109,9 @@ pub async fn create_resource_group(
     if existing.is_some() {
         return Err((
             StatusCode::CONFLICT,
-            Json(json!({ "error": format!("CIDR {} is already in use by another resource group", req.internal_cidr) })),
+            Json(
+                json!({ "error": format!("CIDR {} is already in use by another resource group", req.internal_cidr) }),
+            ),
         ));
     }
 
@@ -133,7 +135,10 @@ pub async fn create_resource_group(
         )
     })?;
 
-    Ok((StatusCode::CREATED, Json(json!(ResourceGroupResponse::from(inserted)))))
+    Ok((
+        StatusCode::CREATED,
+        Json(json!(ResourceGroupResponse::from(inserted))),
+    ))
 }
 
 pub async fn get_resource_group(
@@ -161,7 +166,10 @@ pub async fn get_resource_group(
             )
         })?;
 
-    Ok((StatusCode::OK, Json(json!(ResourceGroupResponse::from(group)))))
+    Ok((
+        StatusCode::OK,
+        Json(json!(ResourceGroupResponse::from(group))),
+    ))
 }
 
 pub async fn delete_resource_group(
@@ -452,10 +460,7 @@ fn first_host_ip(cidr: &str) -> Option<String> {
     if parts.len() != 2 {
         return None;
     }
-    let octets: Vec<u8> = parts[0]
-        .split('.')
-        .filter_map(|o| o.parse().ok())
-        .collect();
+    let octets: Vec<u8> = parts[0].split('.').filter_map(|o| o.parse().ok()).collect();
     if octets.len() != 4 {
         return None;
     }
diff --git a/control-plane/api-gateway/src/routes/ssh_keys.rs b/control-plane/api-gateway/src/routes/ssh_keys.rs
index 96ea05b7..5b2e48a0 100644
--- a/control-plane/api-gateway/src/routes/ssh_keys.rs
+++ b/control-plane/api-gateway/src/routes/ssh_keys.rs
@@ -144,7 +144,7 @@ pub async fn get_keys_for_agent(
 
     let keys: Vec<String> = all_keys
         .into_iter()
-        .filter(|k| k.expires_at.map_or(true, |exp| exp > now))
+        .filter(|k| k.expires_at.is_none_or(|exp| exp > now))
         .map(|k| k.public_key)
         .collect();
 
@@ -161,5 +161,8 @@ pub fn ssh_keys_routes() -> Router<AppState> {
 }
 
 pub fn ssh_keys_internal_routes() -> Router<AppState> {
-    Router::new().route("/agents/{agent_id}/authorized-keys", get(get_keys_for_agent))
+    Router::new().route(
+        "/agents/{agent_id}/authorized-keys",
+        get(get_keys_for_agent),
+    )
 }
diff --git a/control-plane/api-gateway/src/routes/update.rs b/control-plane/api-gateway/src/routes/update.rs
index 124928b1..9cf6a899 100644
--- a/control-plane/api-gateway/src/routes/update.rs
+++ b/control-plane/api-gateway/src/routes/update.rs
@@ -18,6 +18,7 @@ const ETCD_DESIRED_FLAKE_REV_KEY: &str = "/csfx/config/desired_flake_rev";
 const ETCD_BUILD_STATUS_KEY: &str = "/csfx/config/cp_build_status";
 const ETCD_RESULT_KEY: &str = "/csfx/config/last_build_result";
 const ETCD_PAUSED_KEY: &str = "/csfx/config/update_paused";
+const ETCD_FORCE_UPDATE_KEY: &str = "/csfx/config/update_force";
 
 #[derive(Debug, Deserialize)]
 pub struct UpdateRequest {
@@ -79,6 +80,14 @@ async fn trigger_update(
             StatusCode::INTERNAL_SERVER_ERROR
         })?;
 
+    client
+        .put(ETCD_FORCE_UPDATE_KEY, b"true", None)
+        .await
+        .map_err(|e| {
+            tracing::error!(error = %e, "failed to write force update flag to etcd");
+            StatusCode::INTERNAL_SERVER_ERROR
+        })?;
+
     tracing::info!(version = %req.version, "update requested");
 
     Ok(Json(UpdateResponse {
diff --git a/control-plane/api-gateway/src/routes/workloads.rs b/control-plane/api-gateway/src/routes/workloads.rs
index df1e0a81..80d61e73 100644
--- a/control-plane/api-gateway/src/routes/workloads.rs
+++ b/control-plane/api-gateway/src/routes/workloads.rs
@@ -96,6 +96,24 @@ pub async fn delete_workload(
     .await
 }
 
+pub async fn create_stack(
+    CanManageWorkloads(_claims): CanManageWorkloads,
+    State(state): State<AppState>,
+    headers: HeaderMap,
+    body: String,
+) -> Result<impl IntoResponse, (StatusCode, Json<serde_json::Value>)> {
+    let body_json: Option<serde_json::Value> = serde_json::from_str(&body).ok();
+    let header_map = header_vec(&headers);
+    proxy_to_scheduler(
+        &state,
+        reqwest::Method::POST,
+        "/workload-stacks",
+        body_json,
+        Some(header_map),
+    )
+    .await
+}
+
 fn header_vec(headers: &HeaderMap) -> Vec<(String, String)> {
     headers
         .iter()
@@ -108,4 +126,5 @@ pub fn workloads_routes() -> Router<AppState> {
         .route("/workloads", post(create_workload))
         .route("/workloads", get(list_workloads))
         .route("/workloads/{id}", delete(delete_workload))
+        .route("/workload-stacks", post(create_stack))
 }
diff --git a/control-plane/api-gateway/src/self_monitor.rs b/control-plane/api-gateway/src/self_monitor.rs
index c0d7ace0..8551e506 100644
--- a/control-plane/api-gateway/src/self_monitor.rs
+++ b/control-plane/api-gateway/src/self_monitor.rs
@@ -92,6 +92,7 @@ impl SelfMonitor {
                 public_key_pem: ActiveValue::Set(None),
                 wg_public_key: ActiveValue::Set(None),
                 wg_endpoint: ActiveValue::Set(None),
+                wg_tunnel_ip: ActiveValue::Set(None),
             };
 
             let agent = new_agent.insert(db_conn.as_ref()).await?;
diff --git a/control-plane/csfx-updater/src/etcd.rs b/control-plane/csfx-updater/src/etcd.rs
index 7052752e..0cf40f64 100644
--- a/control-plane/csfx-updater/src/etcd.rs
+++ b/control-plane/csfx-updater/src/etcd.rs
@@ -8,6 +8,7 @@ pub const DESIRED_FLAKE_REV_KEY: &str = "/csfx/config/desired_flake_rev";
 pub const BUILD_STATUS_KEY: &str = "/csfx/config/cp_build_status";
 pub const RESULT_KEY: &str = "/csfx/config/last_build_result";
 pub const PAUSED_KEY: &str = "/csfx/config/update_paused";
+pub const FORCE_UPDATE_KEY: &str = "/csfx/config/update_force";
 pub const NODE_HEARTBEAT_PREFIX: &str = "/csfx/nodes/";
 
 pub struct Client {
@@ -35,6 +36,11 @@ impl Client {
         Ok(())
     }
 
+    pub async fn delete(&mut self, key: &str) -> Result<()> {
+        self.inner.delete(key, None).await?;
+        Ok(())
+    }
+
     pub async fn delete_prefix(&mut self, prefix: &str) -> Result<()> {
         use etcd_client::DeleteOptions;
         self.inner
diff --git a/control-plane/csfx-updater/src/main.rs b/control-plane/csfx-updater/src/main.rs
index 8f57875d..224cc40d 100644
--- a/control-plane/csfx-updater/src/main.rs
+++ b/control-plane/csfx-updater/src/main.rs
@@ -102,8 +102,10 @@ async fn run_executor_loop(cfg: &config::Config) {
 async fn execute_once(cfg: &config::Config, last_applied: &str) -> anyhow::Result<Option<String>> {
     let mut etcd = etcd::Client::connect(cfg).await?;
 
-    if etcd.get(etcd::PAUSED_KEY).await?.as_deref() == Some("true") {
-        tracing::debug!("updater paused, skipping cycle");
+    let forced = etcd.get(etcd::FORCE_UPDATE_KEY).await?.as_deref() == Some("true");
+
+    if !forced && etcd.get(etcd::PAUSED_KEY).await?.as_deref() == Some("true") {
+        tracing::warn!("updater paused, skipping cycle");
         return Ok(None);
     }
 
@@ -125,6 +127,11 @@ async fn execute_once(cfg: &config::Config, last_applied: &str) -> anyhow::Resul
         return Ok(None);
     }
 
+    if forced {
+        etcd.delete(etcd::FORCE_UPDATE_KEY).await?;
+        info!(flake_rev = %desired, "forced update requested, bypassing pause");
+    }
+
     if !is_valid_sha(&desired) {
         tracing::warn!(flake_rev = %desired, "rejected invalid flake rev");
         etcd.put(etcd::RESULT_KEY, "failed").await?;
diff --git a/control-plane/registry/Cargo.toml b/control-plane/registry/Cargo.toml
index 22b5d361..28a21091 100644
--- a/control-plane/registry/Cargo.toml
+++ b/control-plane/registry/Cargo.toml
@@ -46,6 +46,7 @@ rustls = { workspace = true }
 sha2 = { workspace = true }
 rcgen = { workspace = true }
 x509-parser = { workspace = true }
+base64 = { workspace = true }
 prometheus = { workspace = true }
 opentelemetry = { workspace = true }
 opentelemetry_sdk = { workspace = true }
diff --git a/control-plane/registry/src/db/agents.rs b/control-plane/registry/src/db/agents.rs
index 263848a4..6166d7ae 100644
--- a/control-plane/registry/src/db/agents.rs
+++ b/control-plane/registry/src/db/agents.rs
@@ -80,6 +80,7 @@ pub async fn create(
         public_key_pem: Set(public_key_pem),
         wg_public_key: Set(None),
         wg_endpoint: Set(None),
+        wg_tunnel_ip: Set(None),
     };
 
     Ok(model.insert(db).await?)
@@ -99,6 +100,8 @@ pub async fn update_heartbeat(
     status: String,
     wg_public_key: Option<String>,
     wg_endpoint: Option<String>,
+    wg_tunnel_ip: Option<String>,
+    agent_version: Option<String>,
 ) -> Result<()> {
     let mut agent: agents::ActiveModel = agents::Entity::find_by_id(agent_id)
         .one(db)
@@ -115,6 +118,12 @@ pub async fn update_heartbeat(
     if wg_endpoint.is_some() {
         agent.wg_endpoint = Set(wg_endpoint);
     }
+    if wg_tunnel_ip.is_some() {
+        agent.wg_tunnel_ip = Set(wg_tunnel_ip);
+    }
+    if let Some(agent_version) = agent_version {
+        agent.agent_version = Set(agent_version);
+    }
     agent.update(db).await?;
 
     Ok(())
diff --git a/control-plane/registry/src/db/api_keys.rs b/control-plane/registry/src/db/api_keys.rs
index 1f1f1456..ffea9a10 100644
--- a/control-plane/registry/src/db/api_keys.rs
+++ b/control-plane/registry/src/db/api_keys.rs
@@ -7,7 +7,11 @@ use uuid::Uuid;
 pub fn hash_key(key: &str) -> String {
     let mut hasher = Sha256::new();
     hasher.update(key.as_bytes());
-    hasher.finalize().iter().map(|b| format!("{:02x}", b)).collect()
+    hasher
+        .finalize()
+        .iter()
+        .map(|b| format!("{:02x}", b))
+        .collect()
 }
 
 pub async fn create(
diff --git a/control-plane/registry/src/handlers/agent.rs b/control-plane/registry/src/handlers/agent.rs
index eb8f8a9a..7cf14472 100644
--- a/control-plane/registry/src/handlers/agent.rs
+++ b/control-plane/registry/src/handlers/agent.rs
@@ -210,7 +210,13 @@ pub async fn heartbeat(
 
     match state
         .agent_registry
-        .update_heartbeat(agent_id, request.wg_public_key.clone(), request.wg_endpoint.clone())
+        .update_heartbeat(
+            agent_id,
+            request.wg_public_key.clone(),
+            request.wg_endpoint.clone(),
+            request.wg_tunnel_ip.clone(),
+            request.agent_version.clone(),
+        )
         .await
     {
         Ok(_) => {
diff --git a/control-plane/registry/src/handlers/pki.rs b/control-plane/registry/src/handlers/pki.rs
index b087147b..7dc686cf 100644
--- a/control-plane/registry/src/handlers/pki.rs
+++ b/control-plane/registry/src/handlers/pki.rs
@@ -1,9 +1,11 @@
 use axum::{
-    extract::{Path, State},
+    extract::{ConnectInfo, Path, State},
     http::{HeaderMap, StatusCode},
     response::Json,
 };
 use chrono::Utc;
+use serde::{Deserialize, Serialize};
+use std::net::SocketAddr;
 use uuid::Uuid;
 
 use crate::{
@@ -176,6 +178,62 @@ pub async fn get_crl(
     }))
 }
 
+#[derive(Deserialize)]
+pub struct ProxyTicketRequest {
+    pub agent_id: Uuid,
+    pub workload_id: String,
+}
+
+#[derive(Serialize)]
+pub struct ProxyTicketResponse {
+    pub payload: String,
+    pub signature: String,
+}
+
+pub async fn issue_proxy_ticket(
+    State(state): State<AppState>,
+    ConnectInfo(addr): ConnectInfo<SocketAddr>,
+    Json(request): Json<ProxyTicketRequest>,
+) -> Result<Json<ProxyTicketResponse>, (StatusCode, Json<ErrorResponse>)> {
+    let ip = addr.ip();
+    let allowed = ip.is_loopback()
+        || match ip {
+            std::net::IpAddr::V4(v4) => {
+                let octets = v4.octets();
+                octets[0] == 10
+                    || (octets[0] == 172 && octets[1] >= 16 && octets[1] <= 31)
+                    || (octets[0] == 192 && octets[1] == 168)
+            }
+            std::net::IpAddr::V6(_) => false,
+        };
+
+    if !allowed {
+        return Err((
+            StatusCode::FORBIDDEN,
+            Json(ErrorResponse {
+                error: "internal endpoint not accessible from this network".to_string(),
+            }),
+        ));
+    }
+
+    let ticket = state
+        .pki_service
+        .sign_proxy_ticket(request.agent_id, &request.workload_id)
+        .map_err(|e| {
+            (
+                StatusCode::INTERNAL_SERVER_ERROR,
+                Json(ErrorResponse {
+                    error: format!("Failed to sign proxy ticket: {}", e),
+                }),
+            )
+        })?;
+
+    Ok(Json(ProxyTicketResponse {
+        payload: ticket.payload,
+        signature: ticket.signature,
+    }))
+}
+
 pub async fn get_agent_endpoint(
     State(state): State<AppState>,
     Path(agent_id): Path<Uuid>,
diff --git a/control-plane/registry/src/main.rs b/control-plane/registry/src/main.rs
index e686381c..d850973f 100644
--- a/control-plane/registry/src/main.rs
+++ b/control-plane/registry/src/main.rs
@@ -113,7 +113,12 @@ async fn main() -> anyhow::Result<()> {
     let listener = tokio::net::TcpListener::bind(addr).await?;
 
     let server_handle = tokio::spawn(async move {
-        axum::serve(listener, app).await.unwrap();
+        axum::serve(
+            listener,
+            app.into_make_service_with_connect_info::<SocketAddr>(),
+        )
+        .await
+        .unwrap();
     });
 
     tokio::select! {
diff --git a/control-plane/registry/src/models/agent.rs b/control-plane/registry/src/models/agent.rs
index ac65f3b5..52cc8913 100644
--- a/control-plane/registry/src/models/agent.rs
+++ b/control-plane/registry/src/models/agent.rs
@@ -130,6 +130,8 @@ pub struct HeartbeatRequest {
     pub uptime_seconds: Option<u64>,
     pub wg_public_key: Option<String>,
     pub wg_endpoint: Option<String>,
+    pub wg_tunnel_ip: Option<String>,
+    pub agent_version: Option<String>,
 }
 
 #[derive(Debug, Serialize, Deserialize)]
diff --git a/control-plane/registry/src/server.rs b/control-plane/registry/src/server.rs
index be89018d..7d6eeacf 100644
--- a/control-plane/registry/src/server.rs
+++ b/control-plane/registry/src/server.rs
@@ -71,6 +71,10 @@ pub fn create_router(state: AppState) -> Router {
             get(pki::get_agent_endpoint),
         )
         .route("/pki/crl", get(pki::get_crl))
+        .route(
+            "/internal/agent-proxy-ticket",
+            post(pki::issue_proxy_ticket),
+        )
         .route("/agents/register", post(agent::register_agent))
         .route("/agents/{agent_id}/heartbeat", post(agent::heartbeat))
         .route(
diff --git a/control-plane/registry/src/services/pki.rs b/control-plane/registry/src/services/pki.rs
index 8f6ba565..700cae06 100644
--- a/control-plane/registry/src/services/pki.rs
+++ b/control-plane/registry/src/services/pki.rs
@@ -1,8 +1,9 @@
 use anyhow::{anyhow, Result};
+use base64::{engine::general_purpose::URL_SAFE_NO_PAD, Engine};
 use chrono::{DateTime, Utc};
 use rcgen::{
     BasicConstraints, CertificateParams, CertificateSigningRequestParams, DnType, IsCa, Issuer,
-    KeyPair, KeyUsagePurpose, PKCS_ECDSA_P256_SHA256,
+    KeyPair, KeyUsagePurpose, SigningKey, PKCS_ECDSA_P256_SHA256,
 };
 use sea_orm::DatabaseConnection;
 use std::sync::atomic::{AtomicI64, Ordering};
@@ -15,6 +16,13 @@ pub struct IssuedCertificate {
     pub expires_at: DateTime<Utc>,
 }
 
+pub struct ProxyTicket {
+    pub payload: String,
+    pub signature: String,
+}
+
+const PROXY_TICKET_TTL_SECS: i64 = 60;
+
 struct CaState {
     ca_cert_pem: String,
     ca_key_pem: String,
@@ -208,4 +216,21 @@ impl PkiService {
             .await
             .map_err(|e| anyhow!("Failed to build CRL: {}", e))
     }
+
+    pub fn sign_proxy_ticket(&self, agent_id: Uuid, workload_id: &str) -> Result<ProxyTicket> {
+        let expires_at = Utc::now() + chrono::Duration::seconds(PROXY_TICKET_TTL_SECS);
+        let payload = format!("{}.{}.{}", agent_id, workload_id, expires_at.timestamp());
+
+        let key_pair = KeyPair::from_pem(&self.ca.ca_key_pem)
+            .map_err(|e| anyhow!("Failed to load CA key: {}", e))?;
+
+        let signature = key_pair
+            .sign(payload.as_bytes())
+            .map_err(|e| anyhow!("Failed to sign proxy ticket: {}", e))?;
+
+        Ok(ProxyTicket {
+            payload: URL_SAFE_NO_PAD.encode(payload.as_bytes()),
+            signature: URL_SAFE_NO_PAD.encode(signature),
+        })
+    }
 }
diff --git a/control-plane/registry/src/services/registry.rs b/control-plane/registry/src/services/registry.rs
index 73fa39a8..82851fc0 100644
--- a/control-plane/registry/src/services/registry.rs
+++ b/control-plane/registry/src/services/registry.rs
@@ -214,6 +214,8 @@ impl AgentRegistry {
         agent_id: Uuid,
         wg_public_key: Option<String>,
         wg_endpoint: Option<String>,
+        wg_tunnel_ip: Option<String>,
+        agent_version: Option<String>,
     ) -> Result<(), String> {
         crate::db::agents::update_heartbeat(
             &self.db,
@@ -221,6 +223,8 @@ impl AgentRegistry {
             "Online".to_string(),
             wg_public_key,
             wg_endpoint,
+            wg_tunnel_ip,
+            agent_version,
         )
         .await
         .map_err(|e| format!("Failed to update heartbeat: {}", e))?;
diff --git a/control-plane/scheduler/Cargo.toml b/control-plane/scheduler/Cargo.toml
index 1a8ef34d..e867f558 100644
--- a/control-plane/scheduler/Cargo.toml
+++ b/control-plane/scheduler/Cargo.toml
@@ -20,8 +20,10 @@ tracing = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 serde = { workspace = true }
 serde_json = { workspace = true }
+serde_yaml = { workspace = true }
 dotenvy = { workspace = true }
 anyhow = { workspace = true }
+thiserror = { workspace = true }
 uuid = { workspace = true, features = ["v4", "serde"] }
 chrono = { workspace = true, features = ["serde"] }
 sea-orm = { workspace = true }
diff --git a/control-plane/scheduler/src/db/mod.rs b/control-plane/scheduler/src/db/mod.rs
index c94899ea..1e7c9165 100644
--- a/control-plane/scheduler/src/db/mod.rs
+++ b/control-plane/scheduler/src/db/mod.rs
@@ -1,2 +1,3 @@
 pub mod agents;
+pub mod workload_stacks;
 pub mod workloads;
diff --git a/control-plane/scheduler/src/db/workload_stacks.rs b/control-plane/scheduler/src/db/workload_stacks.rs
new file mode 100644
index 00000000..d5f56c84
--- /dev/null
+++ b/control-plane/scheduler/src/db/workload_stacks.rs
@@ -0,0 +1,41 @@
+use chrono::Utc;
+use entity::entities::workload_stacks;
+use sea_orm::{ActiveModelTrait, ActiveValue::Set, DatabaseConnection, EntityTrait};
+use uuid::Uuid;
+
+pub async fn create(
+    db: &DatabaseConnection,
+    resource_group_id: Uuid,
+    name: &str,
+    compose_source: &str,
+) -> Result<workload_stacks::Model, sea_orm::DbErr> {
+    let model = workload_stacks::ActiveModel {
+        id: Set(Uuid::new_v4()),
+        resource_group_id: Set(resource_group_id),
+        name: Set(name.to_string()),
+        compose_source: Set(Some(compose_source.to_string())),
+        status: Set("pending".to_string()),
+        created_at: Set(Utc::now().naive_utc()),
+        updated_at: Set(None),
+    };
+
+    model.insert(db).await
+}
+
+pub async fn update_status(
+    db: &DatabaseConnection,
+    stack_id: Uuid,
+    status: &str,
+) -> Result<(), sea_orm::DbErr> {
+    let stack = workload_stacks::Entity::find_by_id(stack_id)
+        .one(db)
+        .await?
+        .ok_or(sea_orm::DbErr::RecordNotFound(stack_id.to_string()))?;
+
+    let mut active: workload_stacks::ActiveModel = stack.into();
+    active.status = Set(status.to_string());
+    active.updated_at = Set(Some(Utc::now().naive_utc()));
+
+    active.update(db).await?;
+    Ok(())
+}
diff --git a/control-plane/scheduler/src/db/workloads.rs b/control-plane/scheduler/src/db/workloads.rs
index 8ea7d69d..91141337 100644
--- a/control-plane/scheduler/src/db/workloads.rs
+++ b/control-plane/scheduler/src/db/workloads.rs
@@ -38,6 +38,8 @@ pub async fn create(
         created_by: Set(None),
         organization_id: Set(None),
         resource_group_id: Set(req.resource_group_id),
+        stack_id: Set(req.stack_id),
+        service_name: Set(req.service_name.clone()),
         created_at: Set(Utc::now().naive_utc()),
         updated_at: Set(None),
     };
@@ -80,7 +82,9 @@ pub async fn update_container_status(
         .ok_or(sea_orm::DbErr::RecordNotFound(workload_id.to_string()))?;
 
     let mut active: workloads::ActiveModel = workload.into();
-    active.container_id = Set(Some(container_id.to_string()));
+    if !container_id.is_empty() {
+        active.container_id = Set(Some(container_id.to_string()));
+    }
     active.status = Set(status.to_string());
     active.updated_at = Set(Some(Utc::now().naive_utc()));
 
@@ -116,6 +120,8 @@ fn into_response(m: workloads::Model) -> WorkloadResponse {
         container_id: m.container_id,
         volume_mounts,
         resource_group_id: m.resource_group_id,
+        stack_id: m.stack_id,
+        service_name: m.service_name,
         created_at: m.created_at.and_utc(),
         updated_at: m.updated_at.map(|dt| dt.and_utc()),
     }
diff --git a/control-plane/scheduler/src/handlers/mod.rs b/control-plane/scheduler/src/handlers/mod.rs
index 474d2676..3f038ecf 100644
--- a/control-plane/scheduler/src/handlers/mod.rs
+++ b/control-plane/scheduler/src/handlers/mod.rs
@@ -1,2 +1,3 @@
 pub mod internal;
+pub mod stacks;
 pub mod workloads;
diff --git a/control-plane/scheduler/src/handlers/stacks.rs b/control-plane/scheduler/src/handlers/stacks.rs
new file mode 100644
index 00000000..7fefacfe
--- /dev/null
+++ b/control-plane/scheduler/src/handlers/stacks.rs
@@ -0,0 +1,17 @@
+use axum::{extract::State, http::StatusCode, response::IntoResponse, Json};
+
+use crate::{models::compose::CreateStackRequest, server::AppState};
+
+pub async fn create_stack(
+    State(state): State<AppState>,
+    Json(req): Json<CreateStackRequest>,
+) -> impl IntoResponse {
+    match state.scheduler.schedule_stack(req).await {
+        Ok(resp) => (StatusCode::CREATED, Json(serde_json::json!(resp))).into_response(),
+        Err(e) => (
+            StatusCode::INTERNAL_SERVER_ERROR,
+            Json(serde_json::json!({ "error": e })),
+        )
+            .into_response(),
+    }
+}
diff --git a/control-plane/scheduler/src/models/compose.rs b/control-plane/scheduler/src/models/compose.rs
new file mode 100644
index 00000000..abd47fe3
--- /dev/null
+++ b/control-plane/scheduler/src/models/compose.rs
@@ -0,0 +1,28 @@
+use std::collections::HashMap;
+use uuid::Uuid;
+
+use crate::models::workload::PortMapping;
+
+#[derive(Debug, Clone)]
+pub struct ComposeServiceSpec {
+    pub service_name: String,
+    pub image: String,
+    pub env_vars: Option<HashMap<String, String>>,
+    pub ports: Option<Vec<PortMapping>>,
+    pub cpu_millicores: i32,
+    pub memory_bytes: i64,
+    pub disk_bytes: i64,
+}
+
+#[derive(Debug, Clone, serde::Deserialize)]
+pub struct CreateStackRequest {
+    pub name: String,
+    pub resource_group_id: Uuid,
+    pub compose_yaml: String,
+}
+
+#[derive(Debug, Clone, serde::Serialize)]
+pub struct CreateStackResponse {
+    pub stack_id: Uuid,
+    pub workloads: Vec<crate::models::workload::CreateWorkloadResponse>,
+}
diff --git a/control-plane/scheduler/src/models/mod.rs b/control-plane/scheduler/src/models/mod.rs
index 8580f7df..748da2a6 100644
--- a/control-plane/scheduler/src/models/mod.rs
+++ b/control-plane/scheduler/src/models/mod.rs
@@ -1 +1,2 @@
+pub mod compose;
 pub mod workload;
diff --git a/control-plane/scheduler/src/models/workload.rs b/control-plane/scheduler/src/models/workload.rs
index 676d178a..fdc5888b 100644
--- a/control-plane/scheduler/src/models/workload.rs
+++ b/control-plane/scheduler/src/models/workload.rs
@@ -8,6 +8,9 @@ use uuid::Uuid;
 pub enum WorkloadStatus {
     Pending,
     Scheduled,
+    Pulling,
+    Creating,
+    Starting,
     Running,
     Failed,
     Stopped,
@@ -18,6 +21,9 @@ impl WorkloadStatus {
         match self {
             WorkloadStatus::Pending => "pending",
             WorkloadStatus::Scheduled => "scheduled",
+            WorkloadStatus::Pulling => "pulling",
+            WorkloadStatus::Creating => "creating",
+            WorkloadStatus::Starting => "starting",
             WorkloadStatus::Running => "running",
             WorkloadStatus::Failed => "failed",
             WorkloadStatus::Stopped => "stopped",
@@ -27,6 +33,9 @@ impl WorkloadStatus {
     pub fn from_str(s: &str) -> Self {
         match s {
             "scheduled" => WorkloadStatus::Scheduled,
+            "pulling" => WorkloadStatus::Pulling,
+            "creating" => WorkloadStatus::Creating,
+            "starting" => WorkloadStatus::Starting,
             "running" => WorkloadStatus::Running,
             "failed" => WorkloadStatus::Failed,
             "stopped" => WorkloadStatus::Stopped,
@@ -52,6 +61,10 @@ pub struct CreateWorkloadRequest {
     pub ports: Option<Vec<PortMapping>>,
     pub volume_mounts: Option<Vec<VolumeMount>>,
     pub resource_group_id: Option<Uuid>,
+    #[serde(default)]
+    pub stack_id: Option<Uuid>,
+    #[serde(default)]
+    pub service_name: Option<String>,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -82,6 +95,8 @@ pub struct WorkloadResponse {
     pub container_id: Option<String>,
     pub volume_mounts: Option<Vec<VolumeMount>>,
     pub resource_group_id: Option<Uuid>,
+    pub stack_id: Option<Uuid>,
+    pub service_name: Option<String>,
     pub created_at: DateTime<Utc>,
     pub updated_at: Option<DateTime<Utc>>,
 }
diff --git a/control-plane/scheduler/src/server.rs b/control-plane/scheduler/src/server.rs
index 0b85206e..b03e0795 100644
--- a/control-plane/scheduler/src/server.rs
+++ b/control-plane/scheduler/src/server.rs
@@ -5,7 +5,7 @@ use std::sync::Arc;
 use tokio::sync::Mutex;
 
 use crate::{
-    handlers::{internal, workloads},
+    handlers::{internal, stacks, workloads},
     metrics,
     services::scheduler::SchedulerService,
 };
@@ -34,6 +34,10 @@ pub fn create_router(state: AppState) -> Router {
             "/workloads/{id}",
             axum::routing::delete(workloads::delete_workload),
         )
+        .route(
+            "/workload-stacks",
+            axum::routing::post(stacks::create_stack),
+        )
         .route(
             "/internal/workloads/status",
             axum::routing::post(internal::update_container_statuses),
diff --git a/control-plane/scheduler/src/services/compose_parser.rs b/control-plane/scheduler/src/services/compose_parser.rs
new file mode 100644
index 00000000..a05a8ffc
--- /dev/null
+++ b/control-plane/scheduler/src/services/compose_parser.rs
@@ -0,0 +1,109 @@
+use std::collections::HashMap;
+
+use crate::models::compose::ComposeServiceSpec;
+use crate::models::workload::PortMapping;
+
+const DEFAULT_CPU_MILLICORES: i32 = 500;
+const DEFAULT_MEMORY_BYTES: i64 = 512 * 1024 * 1024;
+const DEFAULT_DISK_BYTES: i64 = 1024 * 1024 * 1024;
+
+#[derive(Debug, thiserror::Error)]
+pub enum ComposeParseError {
+    #[error("invalid compose yaml: {0}")]
+    InvalidYaml(String),
+    #[error("compose file defines no services")]
+    NoServicesDefined,
+    #[error("service '{0}' uses build, only image is supported")]
+    UnsupportedBuildDirective(String),
+    #[error("service '{0}' has no image")]
+    MissingImage(String),
+}
+
+#[derive(Debug, serde::Deserialize)]
+struct RawCompose {
+    services: HashMap<String, RawService>,
+}
+
+#[derive(Debug, serde::Deserialize)]
+struct RawService {
+    image: Option<String>,
+    build: Option<serde_yaml::Value>,
+    ports: Option<Vec<String>>,
+    environment: Option<RawEnvironment>,
+}
+
+#[derive(Debug, serde::Deserialize)]
+#[serde(untagged)]
+enum RawEnvironment {
+    List(Vec<String>),
+    Map(HashMap<String, String>),
+}
+
+pub fn parse_compose(yaml: &str) -> Result<Vec<ComposeServiceSpec>, ComposeParseError> {
+    let raw: RawCompose =
+        serde_yaml::from_str(yaml).map_err(|e| ComposeParseError::InvalidYaml(e.to_string()))?;
+
+    if raw.services.is_empty() {
+        return Err(ComposeParseError::NoServicesDefined);
+    }
+
+    raw.services
+        .into_iter()
+        .map(|(service_name, service)| build_service_spec(service_name, service))
+        .collect()
+}
+
+fn build_service_spec(
+    service_name: String,
+    service: RawService,
+) -> Result<ComposeServiceSpec, ComposeParseError> {
+    if service.build.is_some() {
+        return Err(ComposeParseError::UnsupportedBuildDirective(service_name));
+    }
+    let image = service
+        .image
+        .ok_or_else(|| ComposeParseError::MissingImage(service_name.clone()))?;
+
+    Ok(ComposeServiceSpec {
+        service_name,
+        image,
+        env_vars: normalize_environment(service.environment),
+        ports: service.ports.map(|raw| parse_compose_ports(&raw)),
+        cpu_millicores: DEFAULT_CPU_MILLICORES,
+        memory_bytes: DEFAULT_MEMORY_BYTES,
+        disk_bytes: DEFAULT_DISK_BYTES,
+    })
+}
+
+fn normalize_environment(raw: Option<RawEnvironment>) -> Option<HashMap<String, String>> {
+    match raw? {
+        RawEnvironment::Map(map) => Some(map),
+        RawEnvironment::List(list) => Some(
+            list.into_iter()
+                .filter_map(|entry| {
+                    let (key, value) = entry.split_once('=')?;
+                    Some((key.to_string(), value.to_string()))
+                })
+                .collect(),
+        ),
+    }
+}
+
+fn parse_compose_ports(raw: &[String]) -> Vec<PortMapping> {
+    raw.iter()
+        .filter_map(|entry| parse_compose_port(entry))
+        .collect()
+}
+
+fn parse_compose_port(entry: &str) -> Option<PortMapping> {
+    let (node_port, container_port) = match entry.split_once(':') {
+        Some((host, container)) => (host.parse().ok(), container),
+        None => (None, entry),
+    };
+
+    Some(PortMapping {
+        container_port: container_port.parse().ok()?,
+        protocol: None,
+        node_port,
+    })
+}
diff --git a/control-plane/scheduler/src/services/etcd.rs b/control-plane/scheduler/src/services/etcd.rs
index ec826a65..1eefdeaa 100644
--- a/control-plane/scheduler/src/services/etcd.rs
+++ b/control-plane/scheduler/src/services/etcd.rs
@@ -13,6 +13,10 @@ pub struct PlacementRecord {
     pub memory_bytes: i64,
     pub disk_bytes: i64,
     pub scheduled_at: String,
+    #[serde(default)]
+    pub stack_id: Option<Uuid>,
+    #[serde(default)]
+    pub service_name: Option<String>,
 }
 
 pub async fn put_placement(
diff --git a/control-plane/scheduler/src/services/mod.rs b/control-plane/scheduler/src/services/mod.rs
index d5016dca..9655cca1 100644
--- a/control-plane/scheduler/src/services/mod.rs
+++ b/control-plane/scheduler/src/services/mod.rs
@@ -1,2 +1,3 @@
+pub mod compose_parser;
 pub mod etcd;
 pub mod scheduler;
diff --git a/control-plane/scheduler/src/services/scheduler.rs b/control-plane/scheduler/src/services/scheduler.rs
index 8ae77ebc..80a5463c 100644
--- a/control-plane/scheduler/src/services/scheduler.rs
+++ b/control-plane/scheduler/src/services/scheduler.rs
@@ -5,9 +5,11 @@ use std::sync::Arc;
 use tokio::sync::Mutex;
 use uuid::Uuid;
 
+use crate::models::compose::{ComposeServiceSpec, CreateStackRequest, CreateStackResponse};
 use crate::models::workload::{
     AgentResources, CreateWorkloadRequest, CreateWorkloadResponse, WorkloadStatus,
 };
+use crate::services::compose_parser::{self, ComposeParseError};
 use crate::services::etcd::{delete_placement, put_placement, PlacementRecord};
 
 pub struct SchedulerService {
@@ -63,6 +65,8 @@ impl SchedulerService {
                     memory_bytes: req.memory_bytes,
                     disk_bytes: req.disk_bytes,
                     scheduled_at: Utc::now().to_rfc3339(),
+                    stack_id: req.stack_id,
+                    service_name: req.service_name.clone(),
                 };
 
                 put_placement(&self.etcd, &record).await?;
@@ -98,6 +102,139 @@ impl SchedulerService {
         }
     }
 
+    pub async fn schedule_stack(
+        &self,
+        req: CreateStackRequest,
+    ) -> Result<CreateStackResponse, String> {
+        let services = compose_parser::parse_compose(&req.compose_yaml)
+            .map_err(|e| format_compose_error(&e))?;
+
+        let stack = crate::db::workload_stacks::create(
+            &self.db,
+            req.resource_group_id,
+            &req.name,
+            &req.compose_yaml,
+        )
+        .await
+        .map_err(|e| format!("Failed to persist stack: {}", e))?;
+
+        let workloads = self
+            .place_stack_workloads(stack.id, req.resource_group_id, &services)
+            .await?;
+
+        crate::db::workload_stacks::update_status(
+            &self.db,
+            stack.id,
+            if workloads.iter().all(|w| w.assigned_agent_id.is_some()) {
+                "active"
+            } else {
+                "pending"
+            },
+        )
+        .await
+        .map_err(|e| format!("Failed to update stack status: {}", e))?;
+
+        Ok(CreateStackResponse {
+            stack_id: stack.id,
+            workloads,
+        })
+    }
+
+    async fn place_stack_workloads(
+        &self,
+        stack_id: Uuid,
+        resource_group_id: Uuid,
+        services: &[ComposeServiceSpec],
+    ) -> Result<Vec<CreateWorkloadResponse>, String> {
+        let mut agents = crate::db::agents::get_online_agents_with_resources(&self.db)
+            .await
+            .map_err(|e| format!("Failed to fetch agent resources: {}", e))?;
+
+        for agent in agents.iter_mut() {
+            let (reserved_cpu, reserved_mem, reserved_disk) =
+                crate::db::agents::get_assigned_workload_resources(&self.db, agent.agent_id)
+                    .await
+                    .map_err(|e| format!("Failed to fetch reserved resources: {}", e))?;
+
+            agent.free_cpu_millicores -= reserved_cpu;
+            agent.free_memory_bytes -= reserved_mem;
+            agent.free_disk_bytes -= reserved_disk;
+        }
+
+        let total_cpu: i32 = services.iter().map(|s| s.cpu_millicores).sum();
+        let total_memory: i64 = services.iter().map(|s| s.memory_bytes).sum();
+        let total_disk: i64 = services.iter().map(|s| s.disk_bytes).sum();
+
+        let agent_id = self.first_fit_resources(total_cpu, total_memory, total_disk, &agents);
+
+        let mut responses = Vec::with_capacity(services.len());
+        for service in services {
+            let req = CreateWorkloadRequest {
+                name: format!("{}-{}", stack_id, service.service_name),
+                image: service.image.clone(),
+                cpu_millicores: service.cpu_millicores,
+                memory_bytes: service.memory_bytes,
+                disk_bytes: service.disk_bytes,
+                env_vars: service.env_vars.clone(),
+                ports: service.ports.clone(),
+                volume_mounts: None,
+                resource_group_id: Some(resource_group_id),
+                stack_id: Some(stack_id),
+                service_name: Some(service.service_name.clone()),
+            };
+
+            let workload = crate::db::workloads::create(&self.db, &req)
+                .await
+                .map_err(|e| format!("Failed to persist workload: {}", e))?;
+
+            responses.push(match agent_id {
+                Some(agent_id) => {
+                    crate::db::workloads::assign(&self.db, workload.id, agent_id)
+                        .await
+                        .map_err(|e| format!("Failed to assign workload: {}", e))?;
+
+                    let record = PlacementRecord {
+                        workload_id: workload.id,
+                        agent_id,
+                        image: req.image.clone(),
+                        cpu_millicores: req.cpu_millicores,
+                        memory_bytes: req.memory_bytes,
+                        disk_bytes: req.disk_bytes,
+                        scheduled_at: Utc::now().to_rfc3339(),
+                        stack_id: Some(stack_id),
+                        service_name: Some(service.service_name.clone()),
+                    };
+                    put_placement(&self.etcd, &record).await?;
+
+                    CreateWorkloadResponse {
+                        workload_id: workload.id,
+                        status: WorkloadStatus::Scheduled,
+                        assigned_agent_id: Some(agent_id),
+                        message: format!("Workload assigned to agent {}", agent_id),
+                    }
+                }
+                None => CreateWorkloadResponse {
+                    workload_id: workload.id,
+                    status: WorkloadStatus::Pending,
+                    assigned_agent_id: None,
+                    message: "No agent with sufficient resources available".to_string(),
+                },
+            });
+        }
+
+        crate::log_info!(
+            "scheduler",
+            &format!(
+                "Stack scheduled stack_id={} agent_id={:?} services={}",
+                stack_id,
+                agent_id,
+                services.len()
+            )
+        );
+
+        Ok(responses)
+    }
+
     async fn resolve_volume_affinity(
         &self,
         req: &CreateWorkloadRequest,
@@ -110,10 +247,9 @@ impl SchedulerService {
         let mut pinned: Option<Uuid> = None;
 
         for mount in mounts {
-            let agent_id =
-                crate::db::agents::get_volume_agent(&self.db, mount.volume_id)
-                    .await
-                    .map_err(|e| format!("Failed to check volume affinity: {}", e))?;
+            let agent_id = crate::db::agents::get_volume_agent(&self.db, mount.volume_id)
+                .await
+                .map_err(|e| format!("Failed to check volume affinity: {}", e))?;
 
             if let Some(aid) = agent_id {
                 match pinned {
@@ -133,6 +269,16 @@ impl SchedulerService {
     }
 
     fn first_fit(&self, req: &CreateWorkloadRequest, agents: &[AgentResources]) -> Option<Uuid> {
+        self.first_fit_resources(req.cpu_millicores, req.memory_bytes, req.disk_bytes, agents)
+    }
+
+    fn first_fit_resources(
+        &self,
+        cpu_millicores: i32,
+        memory_bytes: i64,
+        disk_bytes: i64,
+        agents: &[AgentResources],
+    ) -> Option<Uuid> {
         let mut sorted: Vec<&AgentResources> = agents.iter().collect();
         sorted.sort_by(|a, b| {
             let score_a = a.free_cpu_millicores as i64 + a.free_memory_bytes / (1024 * 1024);
@@ -143,9 +289,9 @@ impl SchedulerService {
         sorted
             .into_iter()
             .find(|a| {
-                a.free_cpu_millicores >= req.cpu_millicores
-                    && a.free_memory_bytes >= req.memory_bytes
-                    && a.free_disk_bytes >= req.disk_bytes
+                a.free_cpu_millicores >= cpu_millicores
+                    && a.free_memory_bytes >= memory_bytes
+                    && a.free_disk_bytes >= disk_bytes
             })
             .map(|a| a.agent_id)
     }
@@ -173,3 +319,16 @@ impl SchedulerService {
         Ok(())
     }
 }
+
+fn format_compose_error(error: &ComposeParseError) -> String {
+    match error {
+        ComposeParseError::InvalidYaml(detail) => format!("invalid compose yaml: {}", detail),
+        ComposeParseError::NoServicesDefined => "compose file defines no services".to_string(),
+        ComposeParseError::UnsupportedBuildDirective(service) => {
+            format!("service '{}' uses build, only image is supported", service)
+        }
+        ComposeParseError::MissingImage(service) => {
+            format!("service '{}' has no image", service)
+        }
+    }
+}
diff --git a/control-plane/shared/entity/src/entities/agents.rs b/control-plane/shared/entity/src/entities/agents.rs
index b26103df..79a12948 100644
--- a/control-plane/shared/entity/src/entities/agents.rs
+++ b/control-plane/shared/entity/src/entities/agents.rs
@@ -23,6 +23,7 @@ pub struct Model {
     pub public_key_pem: Option<String>,
     pub wg_public_key: Option<String>,
     pub wg_endpoint: Option<String>,
+    pub wg_tunnel_ip: Option<String>,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
diff --git a/control-plane/shared/entity/src/entities/mod.rs b/control-plane/shared/entity/src/entities/mod.rs
index 31e24b11..8b1b761b 100644
--- a/control-plane/shared/entity/src/entities/mod.rs
+++ b/control-plane/shared/entity/src/entities/mod.rs
@@ -23,6 +23,7 @@ pub mod user_organization;
 pub mod user_ssh_keys;
 pub mod volume_snapshots;
 pub mod volumes;
+pub mod workload_stacks;
 pub mod workloads;
 
 pub use agent_api_keys::Entity as AgentApiKeys;
@@ -50,4 +51,5 @@ pub use user_organization::Entity as UserOrganization;
 pub use user_ssh_keys::Entity as UserSshKeys;
 pub use volume_snapshots::Entity as VolumeSnapshots;
 pub use volumes::Entity as Volumes;
+pub use workload_stacks::Entity as WorkloadStacks;
 pub use workloads::Entity as Workloads;
diff --git a/control-plane/shared/entity/src/entities/resource_groups.rs b/control-plane/shared/entity/src/entities/resource_groups.rs
index cc63a440..1b8febac 100644
--- a/control-plane/shared/entity/src/entities/resource_groups.rs
+++ b/control-plane/shared/entity/src/entities/resource_groups.rs
@@ -30,6 +30,8 @@ pub enum Relation {
     Volumes,
     #[sea_orm(has_many = "super::networks::Entity")]
     Networks,
+    #[sea_orm(has_many = "super::workload_stacks::Entity")]
+    WorkloadStacks,
 }
 
 impl Related<super::organization::Entity> for Entity {
@@ -56,4 +58,10 @@ impl Related<super::networks::Entity> for Entity {
     }
 }
 
+impl Related<super::workload_stacks::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::WorkloadStacks.def()
+    }
+}
+
 impl ActiveModelBehavior for ActiveModel {}
diff --git a/control-plane/shared/entity/src/entities/workload_stacks.rs b/control-plane/shared/entity/src/entities/workload_stacks.rs
new file mode 100644
index 00000000..74b87305
--- /dev/null
+++ b/control-plane/shared/entity/src/entities/workload_stacks.rs
@@ -0,0 +1,42 @@
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Serialize, Deserialize)]
+#[sea_orm(table_name = "workload_stacks")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: Uuid,
+    pub resource_group_id: Uuid,
+    pub name: String,
+    pub compose_source: Option<String>,
+    pub status: String,
+    pub created_at: chrono::NaiveDateTime,
+    pub updated_at: Option<chrono::NaiveDateTime>,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::resource_groups::Entity",
+        from = "Column::ResourceGroupId",
+        to = "super::resource_groups::Column::Id",
+        on_delete = "Cascade"
+    )]
+    ResourceGroup,
+    #[sea_orm(has_many = "super::workloads::Entity")]
+    Workloads,
+}
+
+impl Related<super::resource_groups::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::ResourceGroup.def()
+    }
+}
+
+impl Related<super::workloads::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Workloads.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/control-plane/shared/entity/src/entities/workloads.rs b/control-plane/shared/entity/src/entities/workloads.rs
index b4c662d9..ee82536f 100644
--- a/control-plane/shared/entity/src/entities/workloads.rs
+++ b/control-plane/shared/entity/src/entities/workloads.rs
@@ -20,6 +20,8 @@ pub struct Model {
     pub created_by: Option<Uuid>,
     pub organization_id: Option<Uuid>,
     pub resource_group_id: Option<Uuid>,
+    pub stack_id: Option<Uuid>,
+    pub service_name: Option<String>,
     pub created_at: DateTime,
     pub updated_at: Option<DateTime>,
 }
@@ -42,6 +44,14 @@ pub enum Relation {
         on_delete = "SetNull"
     )]
     ResourceGroup,
+    #[sea_orm(
+        belongs_to = "super::workload_stacks::Entity",
+        from = "Column::StackId",
+        to = "super::workload_stacks::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    Stack,
 }
 
 impl Related<super::agents::Entity> for Entity {
@@ -56,4 +66,10 @@ impl Related<super::resource_groups::Entity> for Entity {
     }
 }
 
+impl Related<super::workload_stacks::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Stack.def()
+    }
+}
+
 impl ActiveModelBehavior for ActiveModel {}
diff --git a/control-plane/shared/migration/src/lib.rs b/control-plane/shared/migration/src/lib.rs
index 32a4836d..111dbc3a 100644
--- a/control-plane/shared/migration/src/lib.rs
+++ b/control-plane/shared/migration/src/lib.rs
@@ -22,6 +22,8 @@ mod m20260625_000000_add_resource_groups;
 mod m20260628_000000_add_volume_mounts;
 mod m20260628_100000_rg_cidr_unique_agent_wg;
 mod m20260701_000000_add_logs_and_settings;
+mod m20260702_000000_add_agent_wg_tunnel_ip;
+mod m20260704_000000_add_workload_stacks;
 
 pub struct Migrator;
 
@@ -51,6 +53,8 @@ impl MigratorTrait for Migrator {
             Box::new(m20260628_000000_add_volume_mounts::Migration),
             Box::new(m20260628_100000_rg_cidr_unique_agent_wg::Migration),
             Box::new(m20260701_000000_add_logs_and_settings::Migration),
+            Box::new(m20260702_000000_add_agent_wg_tunnel_ip::Migration),
+            Box::new(m20260704_000000_add_workload_stacks::Migration),
         ]
     }
 }
diff --git a/control-plane/shared/migration/src/m20260625_000000_add_resource_groups.rs b/control-plane/shared/migration/src/m20260625_000000_add_resource_groups.rs
index a862ff88..62068db2 100644
--- a/control-plane/shared/migration/src/m20260625_000000_add_resource_groups.rs
+++ b/control-plane/shared/migration/src/m20260625_000000_add_resource_groups.rs
@@ -11,13 +11,35 @@ impl MigrationTrait for Migration {
                 Table::create()
                     .table(ResourceGroups::Table)
                     .if_not_exists()
-                    .col(ColumnDef::new(ResourceGroups::Id).uuid().not_null().primary_key())
-                    .col(ColumnDef::new(ResourceGroups::OrganizationId).uuid().not_null())
+                    .col(
+                        ColumnDef::new(ResourceGroups::Id)
+                            .uuid()
+                            .not_null()
+                            .primary_key(),
+                    )
+                    .col(
+                        ColumnDef::new(ResourceGroups::OrganizationId)
+                            .uuid()
+                            .not_null(),
+                    )
                     .col(ColumnDef::new(ResourceGroups::Name).string().not_null())
                     .col(ColumnDef::new(ResourceGroups::Description).string().null())
-                    .col(ColumnDef::new(ResourceGroups::InternalCidr).string().not_null())
-                    .col(ColumnDef::new(ResourceGroups::Status).string().not_null().default("active"))
-                    .col(ColumnDef::new(ResourceGroups::CreatedAt).date_time().not_null())
+                    .col(
+                        ColumnDef::new(ResourceGroups::InternalCidr)
+                            .string()
+                            .not_null(),
+                    )
+                    .col(
+                        ColumnDef::new(ResourceGroups::Status)
+                            .string()
+                            .not_null()
+                            .default("active"),
+                    )
+                    .col(
+                        ColumnDef::new(ResourceGroups::CreatedAt)
+                            .date_time()
+                            .not_null(),
+                    )
                     .col(ColumnDef::new(ResourceGroups::UpdatedAt).date_time().null())
                     .foreign_key(
                         ForeignKey::create()
@@ -101,13 +123,25 @@ impl MigrationTrait for Migration {
 
     async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
         manager
-            .drop_index(Index::drop().name("idx_networks_resource_group_id").to_owned())
+            .drop_index(
+                Index::drop()
+                    .name("idx_networks_resource_group_id")
+                    .to_owned(),
+            )
             .await?;
         manager
-            .drop_index(Index::drop().name("idx_volumes_resource_group_id").to_owned())
+            .drop_index(
+                Index::drop()
+                    .name("idx_volumes_resource_group_id")
+                    .to_owned(),
+            )
             .await?;
         manager
-            .drop_index(Index::drop().name("idx_workloads_resource_group_id").to_owned())
+            .drop_index(
+                Index::drop()
+                    .name("idx_workloads_resource_group_id")
+                    .to_owned(),
+            )
             .await?;
         manager
             .drop_index(
diff --git a/control-plane/shared/migration/src/m20260628_000000_add_volume_mounts.rs b/control-plane/shared/migration/src/m20260628_000000_add_volume_mounts.rs
index 450fb41e..027878c4 100644
--- a/control-plane/shared/migration/src/m20260628_000000_add_volume_mounts.rs
+++ b/control-plane/shared/migration/src/m20260628_000000_add_volume_mounts.rs
@@ -11,9 +11,7 @@ impl MigrationTrait for Migration {
                 Table::alter()
                     .table(Alias::new("workloads"))
                     .add_column_if_not_exists(
-                        ColumnDef::new(Alias::new("volume_mounts"))
-                            .json()
-                            .null(),
+                        ColumnDef::new(Alias::new("volume_mounts")).json().null(),
                     )
                     .to_owned(),
             )
diff --git a/control-plane/shared/migration/src/m20260628_100000_rg_cidr_unique_agent_wg.rs b/control-plane/shared/migration/src/m20260628_100000_rg_cidr_unique_agent_wg.rs
index e1f0eb75..fce0a25d 100644
--- a/control-plane/shared/migration/src/m20260628_100000_rg_cidr_unique_agent_wg.rs
+++ b/control-plane/shared/migration/src/m20260628_100000_rg_cidr_unique_agent_wg.rs
@@ -22,14 +22,10 @@ impl MigrationTrait for Migration {
                 Table::alter()
                     .table(Alias::new("agents"))
                     .add_column_if_not_exists(
-                        ColumnDef::new(Alias::new("wg_public_key"))
-                            .text()
-                            .null(),
+                        ColumnDef::new(Alias::new("wg_public_key")).text().null(),
                     )
                     .add_column_if_not_exists(
-                        ColumnDef::new(Alias::new("wg_endpoint"))
-                            .string()
-                            .null(),
+                        ColumnDef::new(Alias::new("wg_endpoint")).string().null(),
                     )
                     .to_owned(),
             )
diff --git a/control-plane/shared/migration/src/m20260701_000000_add_logs_and_settings.rs b/control-plane/shared/migration/src/m20260701_000000_add_logs_and_settings.rs
index 84c8df68..d7b79e87 100644
--- a/control-plane/shared/migration/src/m20260701_000000_add_logs_and_settings.rs
+++ b/control-plane/shared/migration/src/m20260701_000000_add_logs_and_settings.rs
@@ -99,9 +99,7 @@ impl MigrationTrait for Migration {
 
         manager
             .get_connection()
-            .execute_unprepared(
-                "CREATE INDEX idx_logs_created_at ON logs (created_at DESC)",
-            )
+            .execute_unprepared("CREATE INDEX idx_logs_created_at ON logs (created_at DESC)")
             .await?;
 
         Ok(())
diff --git a/control-plane/shared/migration/src/m20260702_000000_add_agent_wg_tunnel_ip.rs b/control-plane/shared/migration/src/m20260702_000000_add_agent_wg_tunnel_ip.rs
new file mode 100644
index 00000000..2cf4edb1
--- /dev/null
+++ b/control-plane/shared/migration/src/m20260702_000000_add_agent_wg_tunnel_ip.rs
@@ -0,0 +1,31 @@
+use sea_orm_migration::prelude::*;
+
+#[derive(DeriveMigrationName)]
+pub struct Migration;
+
+#[async_trait::async_trait]
+impl MigrationTrait for Migration {
+    async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+        manager
+            .alter_table(
+                Table::alter()
+                    .table(Alias::new("agents"))
+                    .add_column_if_not_exists(
+                        ColumnDef::new(Alias::new("wg_tunnel_ip")).string().null(),
+                    )
+                    .to_owned(),
+            )
+            .await
+    }
+
+    async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+        manager
+            .alter_table(
+                Table::alter()
+                    .table(Alias::new("agents"))
+                    .drop_column(Alias::new("wg_tunnel_ip"))
+                    .to_owned(),
+            )
+            .await
+    }
+}
diff --git a/control-plane/shared/migration/src/m20260704_000000_add_workload_stacks.rs b/control-plane/shared/migration/src/m20260704_000000_add_workload_stacks.rs
new file mode 100644
index 00000000..6cbb3664
--- /dev/null
+++ b/control-plane/shared/migration/src/m20260704_000000_add_workload_stacks.rs
@@ -0,0 +1,155 @@
+use sea_orm_migration::prelude::*;
+
+#[derive(DeriveMigrationName)]
+pub struct Migration;
+
+#[async_trait::async_trait]
+impl MigrationTrait for Migration {
+    async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+        manager
+            .create_table(
+                Table::create()
+                    .table(WorkloadStacks::Table)
+                    .if_not_exists()
+                    .col(
+                        ColumnDef::new(WorkloadStacks::Id)
+                            .uuid()
+                            .not_null()
+                            .primary_key(),
+                    )
+                    .col(
+                        ColumnDef::new(WorkloadStacks::ResourceGroupId)
+                            .uuid()
+                            .not_null(),
+                    )
+                    .col(ColumnDef::new(WorkloadStacks::Name).string().not_null())
+                    .col(ColumnDef::new(WorkloadStacks::ComposeSource).text().null())
+                    .col(
+                        ColumnDef::new(WorkloadStacks::Status)
+                            .string()
+                            .not_null()
+                            .default("pending"),
+                    )
+                    .col(
+                        ColumnDef::new(WorkloadStacks::CreatedAt)
+                            .date_time()
+                            .not_null(),
+                    )
+                    .col(ColumnDef::new(WorkloadStacks::UpdatedAt).date_time().null())
+                    .foreign_key(
+                        ForeignKey::create()
+                            .from(WorkloadStacks::Table, WorkloadStacks::ResourceGroupId)
+                            .to(ResourceGroups::Table, ResourceGroups::Id)
+                            .on_delete(ForeignKeyAction::Cascade),
+                    )
+                    .to_owned(),
+            )
+            .await?;
+
+        manager
+            .alter_table(
+                Table::alter()
+                    .table(Workloads::Table)
+                    .add_column(ColumnDef::new(Workloads::StackId).uuid().null())
+                    .add_column(ColumnDef::new(Workloads::ServiceName).string().null())
+                    .to_owned(),
+            )
+            .await?;
+
+        manager
+            .create_foreign_key(
+                ForeignKey::create()
+                    .name("fk_workloads_stack_id")
+                    .from(Workloads::Table, Workloads::StackId)
+                    .to(WorkloadStacks::Table, WorkloadStacks::Id)
+                    .on_delete(ForeignKeyAction::Cascade)
+                    .to_owned(),
+            )
+            .await?;
+
+        manager
+            .create_index(
+                Index::create()
+                    .table(WorkloadStacks::Table)
+                    .col(WorkloadStacks::ResourceGroupId)
+                    .name("idx_workload_stacks_resource_group_id")
+                    .to_owned(),
+            )
+            .await?;
+
+        manager
+            .create_index(
+                Index::create()
+                    .table(Workloads::Table)
+                    .col(Workloads::StackId)
+                    .name("idx_workloads_stack_id")
+                    .to_owned(),
+            )
+            .await?;
+
+        Ok(())
+    }
+
+    async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+        manager
+            .drop_index(Index::drop().name("idx_workloads_stack_id").to_owned())
+            .await?;
+        manager
+            .drop_index(
+                Index::drop()
+                    .name("idx_workload_stacks_resource_group_id")
+                    .to_owned(),
+            )
+            .await?;
+
+        manager
+            .drop_foreign_key(
+                ForeignKey::drop()
+                    .name("fk_workloads_stack_id")
+                    .table(Workloads::Table)
+                    .to_owned(),
+            )
+            .await?;
+
+        manager
+            .alter_table(
+                Table::alter()
+                    .table(Workloads::Table)
+                    .drop_column(Workloads::ServiceName)
+                    .drop_column(Workloads::StackId)
+                    .to_owned(),
+            )
+            .await?;
+
+        manager
+            .drop_table(Table::drop().table(WorkloadStacks::Table).to_owned())
+            .await?;
+
+        Ok(())
+    }
+}
+
+#[derive(DeriveIden)]
+enum WorkloadStacks {
+    Table,
+    Id,
+    ResourceGroupId,
+    Name,
+    ComposeSource,
+    Status,
+    CreatedAt,
+    UpdatedAt,
+}
+
+#[derive(DeriveIden)]
+enum ResourceGroups {
+    Table,
+    Id,
+}
+
+#[derive(DeriveIden)]
+enum Workloads {
+    Table,
+    StackId,
+    ServiceName,
+}
diff --git a/control-plane/shared/shared/src/db_log_layer.rs b/control-plane/shared/shared/src/db_log_layer.rs
index d091b1c0..ce5f103d 100644
--- a/control-plane/shared/shared/src/db_log_layer.rs
+++ b/control-plane/shared/shared/src/db_log_layer.rs
@@ -38,7 +38,10 @@ impl LogClassification {
             Self::Security
         } else if target.contains("scheduler") || target.contains("metrics") {
             Self::Performance
-        } else if target.contains("network") || target.contains("sdn") || target.contains("wireguard") {
+        } else if target.contains("network")
+            || target.contains("sdn")
+            || target.contains("wireguard")
+        {
             Self::Network
         } else if target.contains("volume") || target.contains("storage") {
             Self::Storage
@@ -120,8 +123,7 @@ const NOISY_TARGET_PREFIXES: [&str; 2] = ["sea_orm", "sqlx"];
 const NOISY_MESSAGE_SUBSTRINGS: [&str; 1] = ["heartbeat processed"];
 
 fn is_routine_access_event(event: &Event<'_>) -> bool {
-    event.metadata().target() == NOISY_ACCESS_TARGET
-        && *event.metadata().level() == Level::INFO
+    event.metadata().target() == NOISY_ACCESS_TARGET && *event.metadata().level() == Level::INFO
 }
 
 fn is_sql_trace_event(event: &Event<'_>) -> bool {
@@ -133,7 +135,8 @@ fn is_sql_trace_event(event: &Event<'_>) -> bool {
 
 fn is_performance_event(event: &Event<'_>) -> bool {
     *event.metadata().level() == Level::INFO
-        && LogClassification::from_target(event.metadata().target()) == LogClassification::Performance
+        && LogClassification::from_target(event.metadata().target())
+            == LogClassification::Performance
 }
 
 fn is_noisy_message_event(visitor: &EventVisitor) -> bool {
@@ -148,7 +151,10 @@ impl<S: Subscriber> Layer<S> for DbLogLayer {
             return;
         }
 
-        if is_routine_access_event(event) || is_sql_trace_event(event) || is_performance_event(event) {
+        if is_routine_access_event(event)
+            || is_sql_trace_event(event)
+            || is_performance_event(event)
+        {
             return;
         }
 
diff --git a/control-plane/volume-manager/src/ceph/core/mod.rs b/control-plane/volume-manager/src/ceph/core/mod.rs
index 3fcb51a1..614cd952 100644
--- a/control-plane/volume-manager/src/ceph/core/mod.rs
+++ b/control-plane/volume-manager/src/ceph/core/mod.rs
@@ -4,4 +4,3 @@ pub mod error;
 
 pub use client::CephClient;
 pub use config::CephConfig;
-pub use error::{CephError, Result};
diff --git a/control-plane/volume-manager/src/ceph/ops/mod.rs b/control-plane/volume-manager/src/ceph/ops/mod.rs
index 14f353d7..7314f87a 100644
--- a/control-plane/volume-manager/src/ceph/ops/mod.rs
+++ b/control-plane/volume-manager/src/ceph/ops/mod.rs
@@ -1,3 +1,3 @@
 pub mod init;
 
-pub use init::{create_postgres_volumes, init_ceph, CephManager};
+pub use init::{init_ceph, CephManager};
diff --git a/control-plane/volume-manager/src/etcd/core/client.rs b/control-plane/volume-manager/src/etcd/core/client.rs
index 07e3ff24..57a4cf8f 100644
--- a/control-plane/volume-manager/src/etcd/core/client.rs
+++ b/control-plane/volume-manager/src/etcd/core/client.rs
@@ -180,7 +180,7 @@ impl EtcdClient {
 
         let txn = Txn::new().when([compare]).and_then([put]).or_else([get]);
 
-        let txn_resp = client.txn(txn).await.map_err(|e| EtcdError::Client(e))?;
+        let txn_resp = client.txn(txn).await.map_err(EtcdError::Client)?;
 
         // Wenn succeeded = true, war die Transaction erfolgreich (Key nicht vorhanden)
         Ok(txn_resp.succeeded())
@@ -219,7 +219,7 @@ impl EtcdClient {
         let resp = client
             .lease_grant(ttl, None)
             .await
-            .map_err(|e| EtcdError::Client(e))?;
+            .map_err(EtcdError::Client)?;
 
         Ok(resp.id())
     }
@@ -230,12 +230,9 @@ impl EtcdClient {
         let (mut keeper, _stream) = client
             .lease_keep_alive(lease_id)
             .await
-            .map_err(|e| EtcdError::Client(e))?;
+            .map_err(EtcdError::Client)?;
 
-        keeper
-            .keep_alive()
-            .await
-            .map_err(|e| EtcdError::Client(e))?;
+        keeper.keep_alive().await.map_err(EtcdError::Client)?;
         Ok(())
     }
 
@@ -245,7 +242,7 @@ impl EtcdClient {
         client
             .lease_revoke(lease_id)
             .await
-            .map_err(|e| EtcdError::Client(e))?;
+            .map_err(EtcdError::Client)?;
 
         Ok(())
     }
diff --git a/control-plane/volume-manager/src/etcd/ha/leader_election.rs b/control-plane/volume-manager/src/etcd/ha/leader_election.rs
index f424074b..21db6a1f 100644
--- a/control-plane/volume-manager/src/etcd/ha/leader_election.rs
+++ b/control-plane/volume-manager/src/etcd/ha/leader_election.rs
@@ -16,7 +16,7 @@ pub struct LeaderElection {
 
 impl LeaderElection {
     pub fn new(client: Arc<EtcdClient>, node_id: String) -> Self {
-        let election_key = format!("election/leader");
+        let election_key = "election/leader".to_string();
         Self {
             client,
             node_id,
@@ -184,7 +184,7 @@ impl LeaderElection {
     }
 
     /// Wartet auf Leadership Changes (Watch)
-    pub async fn watch_leadership<F>(&self, callback: F) -> Result<(), EtcdError>
+    pub async fn watch_leadership<F>(&self, _callback: F) -> Result<(), EtcdError>
     where
         F: FnMut(Option<String>) + Send + 'static,
     {
diff --git a/control-plane/volume-manager/src/etcd/ha/mod.rs b/control-plane/volume-manager/src/etcd/ha/mod.rs
index 59d7759c..31724a6a 100644
--- a/control-plane/volume-manager/src/etcd/ha/mod.rs
+++ b/control-plane/volume-manager/src/etcd/ha/mod.rs
@@ -3,5 +3,5 @@
 pub mod health;
 pub mod leader_election;
 
-pub use health::{HealthChecker, NodeHealthStatus};
+pub use health::HealthChecker;
 pub use leader_election::LeaderElection;
diff --git a/control-plane/volume-manager/src/etcd/sync/watcher.rs b/control-plane/volume-manager/src/etcd/sync/watcher.rs
index 05606bf9..46116a96 100644
--- a/control-plane/volume-manager/src/etcd/sync/watcher.rs
+++ b/control-plane/volume-manager/src/etcd/sync/watcher.rs
@@ -13,7 +13,7 @@ impl StateWatcher {
     }
 
     /// Beobachtet einen Key-Prefix für Änderungen
-    pub async fn watch_prefix<F>(&self, prefix: &str, callback: F) -> Result<(), EtcdError>
+    pub async fn watch_prefix<F>(&self, prefix: &str, _callback: F) -> Result<(), EtcdError>
     where
         F: FnMut(WatchEvent) + Send + 'static,
     {
@@ -31,7 +31,7 @@ impl StateWatcher {
     }
 
     /// Beobachtet einen spezifischen Key
-    pub async fn watch_key<F>(&self, key: &str, callback: F) -> Result<(), EtcdError>
+    pub async fn watch_key<F>(&self, key: &str, _callback: F) -> Result<(), EtcdError>
     where
         F: FnMut(WatchEvent) + Send + 'static,
     {
diff --git a/control-plane/volume-manager/src/patroni/mod.rs b/control-plane/volume-manager/src/patroni/mod.rs
index 665b95a7..a6773e3d 100644
--- a/control-plane/volume-manager/src/patroni/mod.rs
+++ b/control-plane/volume-manager/src/patroni/mod.rs
@@ -1,6 +1,3 @@
 pub mod client;
 pub mod monitor;
 pub mod types;
-
-pub use client::PatroniClient;
-pub use monitor::PatroniMonitor;