From 025b9e89387a2412047c96119d731b051a1f6957 Mon Sep 17 00:00:00 2001
From: Justin Schneck <j.schneck@peridio.com>
Date: Sun, 11 Jan 2026 16:21:13 -0500
Subject: [PATCH] avocado-cli update commands and config schema for 0.23

---
 .../tools/avocado-cli/commands/build.md       |   5 +-
 .../tools/avocado-cli/commands/clean.md       |  16 +
 .../tools/avocado-cli/commands/deploy.md      |   5 +-
 .../tools/avocado-cli/commands/ext/build.md   |   5 +-
 .../avocado-cli/commands/ext/checkout.md      |   8 +-
 .../tools/avocado-cli/commands/ext/clean.md   |   5 +-
 .../tools/avocado-cli/commands/ext/deps.md    |   5 +-
 .../tools/avocado-cli/commands/ext/dnf.md     |   5 +-
 .../tools/avocado-cli/commands/ext/fetch.md   |  18 +
 .../tools/avocado-cli/commands/ext/image.md   |   5 +-
 .../tools/avocado-cli/commands/ext/install.md |   5 +-
 .../tools/avocado-cli/commands/ext/list.md    |   9 +-
 .../tools/avocado-cli/commands/ext/package.md |   5 +-
 .../tools/avocado-cli/commands/fetch.md       |   5 +-
 .../tools/avocado-cli/commands/hitl/server.md |   6 +-
 .../tools/avocado-cli/commands/init.md        |  20 +-
 .../tools/avocado-cli/commands/install.md     |   5 +-
 .../tools/avocado-cli/commands/provision.md   |  34 +-
 .../tools/avocado-cli/commands/prune.md       |  22 +
 .../avocado-cli/commands/runtime/build.md     |   5 +-
 .../avocado-cli/commands/runtime/clean.md     |   5 +-
 .../avocado-cli/commands/runtime/deploy.md    |   5 +-
 .../avocado-cli/commands/runtime/deps.md      |  11 +-
 .../tools/avocado-cli/commands/runtime/dnf.md |   5 +-
 .../avocado-cli/commands/runtime/install.md   |   5 +-
 .../avocado-cli/commands/runtime/list.md      |   9 +-
 .../avocado-cli/commands/runtime/provision.md |  34 +-
 .../avocado-cli/commands/runtime/sign.md      |  18 +
 .../tools/avocado-cli/commands/sdk/clean.md   |  12 +-
 .../tools/avocado-cli/commands/sdk/compile.md |   5 +-
 .../tools/avocado-cli/commands/sdk/deps.md    |   5 +-
 .../tools/avocado-cli/commands/sdk/dnf.md     |   5 +-
 .../tools/avocado-cli/commands/sdk/install.md |   5 +-
 .../tools/avocado-cli/commands/sdk/run.md     |   7 +-
 .../tools/avocado-cli/commands/sign.md        |  18 +
 .../commands/signing-keys/_category_.json     |   6 +
 .../commands/signing-keys/create.md           |  21 +
 .../avocado-cli/commands/signing-keys/list.md |  12 +
 .../commands/signing-keys/remove.md           |  16 +
 .../tools/avocado-cli/commands/unlock.md      |  18 +
 .../tools/avocado-cli/commands/upgrade.md     |   9 +-
 src/package-lock.json                         |  44 +-
 src/schemas/avocado-config.json               | 589 +++++++++++-------
 43 files changed, 742 insertions(+), 315 deletions(-)
 create mode 100644 src/docs/avocado-linux/tools/avocado-cli/commands/ext/fetch.md
 create mode 100644 src/docs/avocado-linux/tools/avocado-cli/commands/prune.md
 create mode 100644 src/docs/avocado-linux/tools/avocado-cli/commands/runtime/sign.md
 create mode 100644 src/docs/avocado-linux/tools/avocado-cli/commands/sign.md
 create mode 100644 src/docs/avocado-linux/tools/avocado-cli/commands/signing-keys/_category_.json
 create mode 100644 src/docs/avocado-linux/tools/avocado-cli/commands/signing-keys/create.md
 create mode 100644 src/docs/avocado-linux/tools/avocado-cli/commands/signing-keys/list.md
 create mode 100644 src/docs/avocado-linux/tools/avocado-cli/commands/signing-keys/remove.md
 create mode 100644 src/docs/avocado-linux/tools/avocado-cli/commands/unlock.md

diff --git a/src/docs/avocado-linux/tools/avocado-cli/commands/build.md b/src/docs/avocado-linux/tools/avocado-cli/commands/build.md
index da53b8ab..f7e346aa 100644
--- a/src/docs/avocado-linux/tools/avocado-cli/commands/build.md
+++ b/src/docs/avocado-linux/tools/avocado-cli/commands/build.md
@@ -4,13 +4,16 @@ Build all components (SDK compile, extensions, and runtime images)
 Usage: avocado build [OPTIONS]
 
 Options:
-  -C, --config <CONFIG>                 Path to avocado.toml configuration file [default: avocado.toml]
+  -C, --config <CONFIG>                 Path to avocado.yaml configuration file [default: avocado.yaml]
   -v, --verbose                         Enable verbose output
   -r, --runtime <RUNTIME>               Runtime name to build (if not provided, builds all runtimes)
   -e, --extension <EXTENSION>           Extension name to build (if not provided, builds all required extensions)
   -t, --target <TARGET>                 Target architecture
       --container-arg <CONTAINER_ARGS>  Additional arguments to pass to the container runtime
       --dnf-arg <DNF_ARGS>              Additional arguments to pass to DNF commands
+      --runs-on <USER@HOST>             Run command on remote host using local volume via NFS (format: user@host)
+      --nfs-port <NFS_PORT>             NFS port for remote execution (auto-selects from 12050-12099 if not specified)
+      --sdk-arch <ARCH>                 SDK container architecture for cross-arch emulation via Docker buildx/QEMU (aarch64 or x86-64)
   -h, --help                            Print help
 
 ```
diff --git a/src/docs/avocado-linux/tools/avocado-cli/commands/clean.md b/src/docs/avocado-linux/tools/avocado-cli/commands/clean.md
index ae0da771..e3d3985e 100644
--- a/src/docs/avocado-linux/tools/avocado-cli/commands/clean.md
+++ b/src/docs/avocado-linux/tools/avocado-cli/commands/clean.md
@@ -13,6 +13,22 @@ Options:
           Container tool to use (docker/podman) [default: docker]
   -v, --verbose
           Enable verbose output
+      --stamps
+          Also remove stamp files (requires -C/--config and --target)
+  -C, --config <CONFIG>
+          Path to avocado.yaml configuration file (required when --stamps or --unlock is used)
+      --target <TARGET>
+          Target architecture (required when --stamps or --unlock is used)
+  -f, --force
+          Force removal by killing and removing containers using the volume
+      --unlock
+          Also unlock (clear lock file entries) for all sysroots (requires -C/--config)
+      --runs-on <USER@HOST>
+          Run command on remote host using local volume via NFS (format: user@host)
+      --nfs-port <NFS_PORT>
+          NFS port for remote execution (auto-selects from 12050-12099 if not specified)
+      --sdk-arch <ARCH>
+          SDK container architecture for cross-arch emulation via Docker buildx/QEMU (aarch64 or x86-64)
   -h, --help
           Print help
 
diff --git a/src/docs/avocado-linux/tools/avocado-cli/commands/deploy.md b/src/docs/avocado-linux/tools/avocado-cli/commands/deploy.md
index aed82dba..9391aae5 100644
--- a/src/docs/avocado-linux/tools/avocado-cli/commands/deploy.md
+++ b/src/docs/avocado-linux/tools/avocado-cli/commands/deploy.md
@@ -4,13 +4,16 @@ Deploy a runtime to a device (shortcut for 'runtime deploy')
 Usage: avocado deploy [OPTIONS] --runtime <RUNTIME> --device <DEVICE>
 
 Options:
-  -C, --config <CONFIG>                 Path to avocado.toml configuration file [default: avocado.toml]
+  -C, --config <CONFIG>                 Path to avocado.yaml configuration file [default: avocado.yaml]
   -v, --verbose                         Enable verbose output
   -r, --runtime <RUNTIME>               Runtime name to deploy
   -t, --target <TARGET>                 Target architecture
   -d, --device <DEVICE>                 Device IP address or hostname to deploy to
       --container-arg <CONTAINER_ARGS>  Additional arguments to pass to the container runtime
       --dnf-arg <DNF_ARGS>              Additional arguments to pass to DNF commands
+      --runs-on <USER@HOST>             Run command on remote host using local volume via NFS (format: user@host)
+      --nfs-port <NFS_PORT>             NFS port for remote execution (auto-selects from 12050-12099 if not specified)
+      --sdk-arch <ARCH>                 SDK container architecture for cross-arch emulation via Docker buildx/QEMU (aarch64 or x86-64)
   -h, --help                            Print help
 
 ```
diff --git a/src/docs/avocado-linux/tools/avocado-cli/commands/ext/build.md b/src/docs/avocado-linux/tools/avocado-cli/commands/ext/build.md
index 1510991b..8a893e07 100644
--- a/src/docs/avocado-linux/tools/avocado-cli/commands/ext/build.md
+++ b/src/docs/avocado-linux/tools/avocado-cli/commands/ext/build.md
@@ -4,12 +4,15 @@ Build sysext and/or confext extensions from configuration
 Usage: avocado ext build [OPTIONS] --extension <EXTENSION>
 
 Options:
-  -C, --config <CONFIG>                 Path to avocado.toml configuration file [default: avocado.toml]
+  -C, --config <CONFIG>                 Path to avocado.yaml configuration file [default: avocado.yaml]
   -v, --verbose                         Enable verbose output
   -e, --extension <EXTENSION>           Name of the extension to build (must be defined in config)
   -t, --target <TARGET>                 Target architecture
       --container-arg <CONTAINER_ARGS>  Additional arguments to pass to the container runtime
       --dnf-arg <DNF_ARGS>              Additional arguments to pass to DNF commands
+      --runs-on <USER@HOST>             Run command on remote host using local volume via NFS (format: user@host)
+      --nfs-port <NFS_PORT>             NFS port for remote execution (auto-selects from 12050-12099 if not specified)
+      --sdk-arch <ARCH>                 SDK container architecture for cross-arch emulation via Docker buildx/QEMU (aarch64 or x86-64)
   -h, --help                            Print help
 
 ```
diff --git a/src/docs/avocado-linux/tools/avocado-cli/commands/ext/checkout.md b/src/docs/avocado-linux/tools/avocado-cli/commands/ext/checkout.md
index 965ee770..1d5c41bf 100644
--- a/src/docs/avocado-linux/tools/avocado-cli/commands/ext/checkout.md
+++ b/src/docs/avocado-linux/tools/avocado-cli/commands/ext/checkout.md
@@ -5,7 +5,7 @@ Usage: avocado ext checkout [OPTIONS] --extension <EXTENSION> --ext-path <EXT_PA
 
 Options:
   -C, --config <CONFIG>
-          Path to avocado.toml configuration file [default: avocado.toml]
+          Path to avocado.yaml configuration file [default: avocado.yaml]
   -v, --verbose
           Enable verbose output
   -e, --extension <EXTENSION>
@@ -18,6 +18,12 @@ Options:
           Destination path in source directory (relative to src root)
       --container-tool <CONTAINER_TOOL>
           Container tool to use (docker/podman) [default: docker]
+      --runs-on <USER@HOST>
+          Run command on remote host using local volume via NFS (format: user@host)
+      --nfs-port <NFS_PORT>
+          NFS port for remote execution (auto-selects from 12050-12099 if not specified)
+      --sdk-arch <ARCH>
+          SDK container architecture for cross-arch emulation via Docker buildx/QEMU (aarch64 or x86-64)
   -h, --help
           Print help
 
diff --git a/src/docs/avocado-linux/tools/avocado-cli/commands/ext/clean.md b/src/docs/avocado-linux/tools/avocado-cli/commands/ext/clean.md
index a190208a..e5201eed 100644
--- a/src/docs/avocado-linux/tools/avocado-cli/commands/ext/clean.md
+++ b/src/docs/avocado-linux/tools/avocado-cli/commands/ext/clean.md
@@ -4,12 +4,15 @@ Clean an extension's sysroot
 Usage: avocado ext clean [OPTIONS] --extension <EXTENSION>
 
 Options:
-  -C, --config <CONFIG>                 Path to avocado.toml configuration file [default: avocado.toml]
+  -C, --config <CONFIG>                 Path to avocado.yaml configuration file [default: avocado.yaml]
   -v, --verbose                         Enable verbose output
   -e, --extension <EXTENSION>           Name of the extension to clean
   -t, --target <TARGET>                 Target architecture
       --container-arg <CONTAINER_ARGS>  Additional arguments to pass to the container runtime
       --dnf-arg <DNF_ARGS>              Additional arguments to pass to DNF commands
+      --runs-on <USER@HOST>             Run command on remote host using local volume via NFS (format: user@host)
+      --nfs-port <NFS_PORT>             NFS port for remote execution (auto-selects from 12050-12099 if not specified)
+      --sdk-arch <ARCH>                 SDK container architecture for cross-arch emulation via Docker buildx/QEMU (aarch64 or x86-64)
   -h, --help                            Print help
 
 ```
diff --git a/src/docs/avocado-linux/tools/avocado-cli/commands/ext/deps.md b/src/docs/avocado-linux/tools/avocado-cli/commands/ext/deps.md
index 9d439b4a..ec1f027a 100644
--- a/src/docs/avocado-linux/tools/avocado-cli/commands/ext/deps.md
+++ b/src/docs/avocado-linux/tools/avocado-cli/commands/ext/deps.md
@@ -4,9 +4,12 @@ List dependencies for extensions
 Usage: avocado ext deps [OPTIONS]
 
 Options:
-  -C, --config <CONFIG>        Path to avocado.toml configuration file [default: avocado.toml]
+  -C, --config <CONFIG>        Path to avocado.yaml configuration file [default: avocado.yaml]
   -e, --extension <EXTENSION>  Name of the extension to show dependencies for (if not provided, shows all extensions)
   -t, --target <TARGET>        Target architecture
+      --runs-on <USER@HOST>    Run command on remote host using local volume via NFS (format: user@host)
+      --nfs-port <NFS_PORT>    NFS port for remote execution (auto-selects from 12050-12099 if not specified)
+      --sdk-arch <ARCH>        SDK container architecture for cross-arch emulation via Docker buildx/QEMU (aarch64 or x86-64)
   -h, --help                   Print help
 
 ```
diff --git a/src/docs/avocado-linux/tools/avocado-cli/commands/ext/dnf.md b/src/docs/avocado-linux/tools/avocado-cli/commands/ext/dnf.md
index 0cbb79ad..ce456b8e 100644
--- a/src/docs/avocado-linux/tools/avocado-cli/commands/ext/dnf.md
+++ b/src/docs/avocado-linux/tools/avocado-cli/commands/ext/dnf.md
@@ -7,12 +7,15 @@ Arguments:
   [COMMAND]...  DNF command and arguments to execute
 
 Options:
-  -C, --config <CONFIG>                 Path to avocado.toml configuration file [default: avocado.toml]
+  -C, --config <CONFIG>                 Path to avocado.yaml configuration file [default: avocado.yaml]
   -v, --verbose                         Enable verbose output
   -e, --extension <EXTENSION>           Name of the extension to operate on
   -t, --target <TARGET>                 Target architecture
       --container-arg <CONTAINER_ARGS>  Additional arguments to pass to the container runtime
       --dnf-arg <DNF_ARGS>              Additional arguments to pass to DNF commands
+      --runs-on <USER@HOST>             Run command on remote host using local volume via NFS (format: user@host)
+      --nfs-port <NFS_PORT>             NFS port for remote execution (auto-selects from 12050-12099 if not specified)
+      --sdk-arch <ARCH>                 SDK container architecture for cross-arch emulation via Docker buildx/QEMU (aarch64 or x86-64)
   -h, --help                            Print help
 
 ```
diff --git a/src/docs/avocado-linux/tools/avocado-cli/commands/ext/fetch.md b/src/docs/avocado-linux/tools/avocado-cli/commands/ext/fetch.md
new file mode 100644
index 00000000..94635bd5
--- /dev/null
+++ b/src/docs/avocado-linux/tools/avocado-cli/commands/ext/fetch.md
@@ -0,0 +1,18 @@
+```
+Fetch remote extensions from repo, git, or path sources
+
+Usage: avocado ext fetch [OPTIONS]
+
+Options:
+  -C, --config <CONFIG>                 Path to avocado.yaml configuration file [default: avocado.yaml]
+  -v, --verbose                         Enable verbose output
+  -f, --force                           Force re-fetch even if already installed
+  -e, --extension <EXTENSION>           Name of the extension to fetch (if not provided, fetches all remote extensions)
+  -t, --target <TARGET>                 Target architecture
+      --container-arg <CONTAINER_ARGS>  Additional arguments to pass to the container runtime
+      --runs-on <USER@HOST>             Run command on remote host using local volume via NFS (format: user@host)
+      --nfs-port <NFS_PORT>             NFS port for remote execution (auto-selects from 12050-12099 if not specified)
+      --sdk-arch <ARCH>                 SDK container architecture for cross-arch emulation via Docker buildx/QEMU (aarch64 or x86-64)
+  -h, --help                            Print help
+
+```
diff --git a/src/docs/avocado-linux/tools/avocado-cli/commands/ext/image.md b/src/docs/avocado-linux/tools/avocado-cli/commands/ext/image.md
index 069826cc..7cfe2180 100644
--- a/src/docs/avocado-linux/tools/avocado-cli/commands/ext/image.md
+++ b/src/docs/avocado-linux/tools/avocado-cli/commands/ext/image.md
@@ -4,12 +4,15 @@ Create squashfs image from system extension
 Usage: avocado ext image [OPTIONS] --extension <EXTENSION>
 
 Options:
-  -C, --config <CONFIG>                 Path to avocado.toml configuration file [default: avocado.toml]
+  -C, --config <CONFIG>                 Path to avocado.yaml configuration file [default: avocado.yaml]
   -v, --verbose                         Enable verbose output
   -e, --extension <EXTENSION>           Name of the extension to create image for
   -t, --target <TARGET>                 Target architecture
       --container-arg <CONTAINER_ARGS>  Additional arguments to pass to the container runtime
       --dnf-arg <DNF_ARGS>              Additional arguments to pass to DNF commands
+      --runs-on <USER@HOST>             Run command on remote host using local volume via NFS (format: user@host)
+      --nfs-port <NFS_PORT>             NFS port for remote execution (auto-selects from 12050-12099 if not specified)
+      --sdk-arch <ARCH>                 SDK container architecture for cross-arch emulation via Docker buildx/QEMU (aarch64 or x86-64)
   -h, --help                            Print help
 
 ```
diff --git a/src/docs/avocado-linux/tools/avocado-cli/commands/ext/install.md b/src/docs/avocado-linux/tools/avocado-cli/commands/ext/install.md
index 06891cd7..402e926a 100644
--- a/src/docs/avocado-linux/tools/avocado-cli/commands/ext/install.md
+++ b/src/docs/avocado-linux/tools/avocado-cli/commands/ext/install.md
@@ -4,13 +4,16 @@ Install dependencies into extension sysroots
 Usage: avocado ext install [OPTIONS]
 
 Options:
-  -C, --config <CONFIG>                 Path to avocado.toml configuration file [default: avocado.toml]
+  -C, --config <CONFIG>                 Path to avocado.yaml configuration file [default: avocado.yaml]
   -v, --verbose                         Enable verbose output
   -f, --force                           Force the operation to proceed, bypassing warnings or confirmation prompts
   -e, --extension <EXTENSION>           Name of the extension to install (if not provided, installs all extensions)
   -t, --target <TARGET>                 Target architecture
       --container-arg <CONTAINER_ARGS>  Additional arguments to pass to the container runtime
       --dnf-arg <DNF_ARGS>              Additional arguments to pass to DNF commands
+      --runs-on <USER@HOST>             Run command on remote host using local volume via NFS (format: user@host)
+      --nfs-port <NFS_PORT>             NFS port for remote execution (auto-selects from 12050-12099 if not specified)
+      --sdk-arch <ARCH>                 SDK container architecture for cross-arch emulation via Docker buildx/QEMU (aarch64 or x86-64)
   -h, --help                            Print help
 
 ```
diff --git a/src/docs/avocado-linux/tools/avocado-cli/commands/ext/list.md b/src/docs/avocado-linux/tools/avocado-cli/commands/ext/list.md
index b036f77a..4598fa68 100644
--- a/src/docs/avocado-linux/tools/avocado-cli/commands/ext/list.md
+++ b/src/docs/avocado-linux/tools/avocado-cli/commands/ext/list.md
@@ -4,8 +4,11 @@ List extension names
 Usage: avocado ext list [OPTIONS]
 
 Options:
-  -C, --config <CONFIG>  Path to avocado.toml configuration file [default: avocado.toml]
-  -t, --target <TARGET>  Target architecture
-  -h, --help             Print help
+  -C, --config <CONFIG>      Path to avocado.yaml configuration file [default: avocado.yaml]
+  -t, --target <TARGET>      Target architecture
+      --runs-on <USER@HOST>  Run command on remote host using local volume via NFS (format: user@host)
+      --nfs-port <NFS_PORT>  NFS port for remote execution (auto-selects from 12050-12099 if not specified)
+      --sdk-arch <ARCH>      SDK container architecture for cross-arch emulation via Docker buildx/QEMU (aarch64 or x86-64)
+  -h, --help                 Print help
 
 ```
diff --git a/src/docs/avocado-linux/tools/avocado-cli/commands/ext/package.md b/src/docs/avocado-linux/tools/avocado-cli/commands/ext/package.md
index 8fce5057..aeda8405 100644
--- a/src/docs/avocado-linux/tools/avocado-cli/commands/ext/package.md
+++ b/src/docs/avocado-linux/tools/avocado-cli/commands/ext/package.md
@@ -4,13 +4,16 @@ Package extension sysroot into an RPM
 Usage: avocado ext package [OPTIONS] --extension <EXTENSION>
 
 Options:
-  -C, --config <CONFIG>                 Path to avocado.toml configuration file [default: avocado.toml]
+  -C, --config <CONFIG>                 Path to avocado.yaml configuration file [default: avocado.yaml]
   -v, --verbose                         Enable verbose output
   -e, --extension <EXTENSION>           Name of the extension to package
   -t, --target <TARGET>                 Target architecture
       --out-dir <OUTPUT_DIR>            Output directory on host for the RPM package (relative or absolute path). If not specified, RPM stays in container at $AVOCADO_PREFIX/output/extensions
       --container-arg <CONTAINER_ARGS>  Additional arguments to pass to the container runtime
       --dnf-arg <DNF_ARGS>              Additional arguments to pass to DNF commands
+      --runs-on <USER@HOST>             Run command on remote host using local volume via NFS (format: user@host)
+      --nfs-port <NFS_PORT>             NFS port for remote execution (auto-selects from 12050-12099 if not specified)
+      --sdk-arch <ARCH>                 SDK container architecture for cross-arch emulation via Docker buildx/QEMU (aarch64 or x86-64)
   -h, --help                            Print help
 
 ```
diff --git a/src/docs/avocado-linux/tools/avocado-cli/commands/fetch.md b/src/docs/avocado-linux/tools/avocado-cli/commands/fetch.md
index cbea2c6f..4bf73b3c 100644
--- a/src/docs/avocado-linux/tools/avocado-cli/commands/fetch.md
+++ b/src/docs/avocado-linux/tools/avocado-cli/commands/fetch.md
@@ -4,13 +4,16 @@ Fetch and refresh repository metadata for sysroots
 Usage: avocado fetch [OPTIONS]
 
 Options:
-  -C, --config <CONFIG>                 Path to avocado.toml configuration file [default: avocado.toml]
+  -C, --config <CONFIG>                 Path to avocado.yaml configuration file [default: avocado.yaml]
   -v, --verbose                         Enable verbose output
   -e, --extension <EXTENSION>           Extension name to fetch metadata for (if not provided, fetches for all sysroots)
   -r, --runtime <RUNTIME>               Runtime name to fetch metadata for (if not provided, fetches for all sysroots)
   -t, --target <TARGET>                 Target architecture
       --container-arg <CONTAINER_ARGS>  Additional arguments to pass to the container runtime
       --dnf-arg <DNF_ARGS>              Additional arguments to pass to DNF commands
+      --runs-on <USER@HOST>             Run command on remote host using local volume via NFS (format: user@host)
+      --nfs-port <NFS_PORT>             NFS port for remote execution (auto-selects from 12050-12099 if not specified)
+      --sdk-arch <ARCH>                 SDK container architecture for cross-arch emulation via Docker buildx/QEMU (aarch64 or x86-64)
   -h, --help                            Print help
 
 ```
diff --git a/src/docs/avocado-linux/tools/avocado-cli/commands/hitl/server.md b/src/docs/avocado-linux/tools/avocado-cli/commands/hitl/server.md
index 980b839f..5c8af9b9 100644
--- a/src/docs/avocado-linux/tools/avocado-cli/commands/hitl/server.md
+++ b/src/docs/avocado-linux/tools/avocado-cli/commands/hitl/server.md
@@ -4,13 +4,17 @@ Start a HITL server container with preconfigured settings
 Usage: avocado hitl server [OPTIONS]
 
 Options:
-  -C, --config-path <CONFIG_PATH>       Path to avocado.toml configuration file [default: avocado.toml]
+  -C, --config-path <CONFIG_PATH>       Path to avocado.yaml configuration file [default: avocado.yaml]
   -e, --extension <EXTENSIONS>          Extensions to create NFS exports for
       --container-arg <CONTAINER_ARGS>  Additional container arguments
       --dnf-arg <DNF_ARGS>              Additional arguments to pass to DNF commands
   -t, --target <TARGET>                 Target to build for
   -v, --verbose                         Enable verbose output
   -p, --port <PORT>                     NFS port number to use
+      --no-stamps                       Disable stamp validation
+      --runs-on <USER@HOST>             Run command on remote host using local volume via NFS (format: user@host)
+      --nfs-port <NFS_PORT>             NFS port for remote execution (auto-selects from 12050-12099 if not specified)
+      --sdk-arch <ARCH>                 SDK container architecture for cross-arch emulation via Docker buildx/QEMU (aarch64 or x86-64)
   -h, --help                            Print help
 
 ```
diff --git a/src/docs/avocado-linux/tools/avocado-cli/commands/init.md b/src/docs/avocado-linux/tools/avocado-cli/commands/init.md
index 00806d84..17a6b98a 100644
--- a/src/docs/avocado-linux/tools/avocado-cli/commands/init.md
+++ b/src/docs/avocado-linux/tools/avocado-cli/commands/init.md
@@ -7,7 +7,23 @@ Arguments:
   [DIRECTORY]  Directory to initialize (defaults to current directory)
 
 Options:
-      --target <TARGET>  Target architecture (e.g., "qemux86-64")
-  -h, --help             Print help
+      --target <TARGET>
+          Target architecture (e.g., "qemux86-64")
+      --reference <REFERENCE>
+          Reference example to initialize from (downloads from avocado-os/references)
+      --reference-branch <REFERENCE_BRANCH>
+          Branch to fetch reference from (defaults to "main")
+      --reference-commit <REFERENCE_COMMIT>
+          Specific commit SHA to fetch reference from
+      --reference-repo <REFERENCE_REPO>
+          Repository to fetch reference from (format: "owner/repo", defaults to "avocado-linux/avocado-os")
+      --runs-on <USER@HOST>
+          Run command on remote host using local volume via NFS (format: user@host)
+      --nfs-port <NFS_PORT>
+          NFS port for remote execution (auto-selects from 12050-12099 if not specified)
+      --sdk-arch <ARCH>
+          SDK container architecture for cross-arch emulation via Docker buildx/QEMU (aarch64 or x86-64)
+  -h, --help
+          Print help
 
 ```
diff --git a/src/docs/avocado-linux/tools/avocado-cli/commands/install.md b/src/docs/avocado-linux/tools/avocado-cli/commands/install.md
index 8b6f8418..fb8ec92e 100644
--- a/src/docs/avocado-linux/tools/avocado-cli/commands/install.md
+++ b/src/docs/avocado-linux/tools/avocado-cli/commands/install.md
@@ -4,13 +4,16 @@ Install all components (SDK, extensions, and runtime dependencies)
 Usage: avocado install [OPTIONS]
 
 Options:
-  -C, --config <CONFIG>                 Path to avocado.toml configuration file [default: avocado.toml]
+  -C, --config <CONFIG>                 Path to avocado.yaml configuration file [default: avocado.yaml]
   -v, --verbose                         Enable verbose output
   -f, --force                           Force the operation to proceed, bypassing warnings or confirmation prompts
   -r, --runtime <RUNTIME>               Runtime name to install dependencies for (if not provided, installs for all runtimes)
   -t, --target <TARGET>                 Target architecture
       --container-arg <CONTAINER_ARGS>  Additional arguments to pass to the container runtime
       --dnf-arg <DNF_ARGS>              Additional arguments to pass to DNF commands
+      --runs-on <USER@HOST>             Run command on remote host using local volume via NFS (format: user@host)
+      --nfs-port <NFS_PORT>             NFS port for remote execution (auto-selects from 12050-12099 if not specified)
+      --sdk-arch <ARCH>                 SDK container architecture for cross-arch emulation via Docker buildx/QEMU (aarch64 or x86-64)
   -h, --help                            Print help
 
 ```
diff --git a/src/docs/avocado-linux/tools/avocado-cli/commands/provision.md b/src/docs/avocado-linux/tools/avocado-cli/commands/provision.md
index 56bc5934..ae0ea4cd 100644
--- a/src/docs/avocado-linux/tools/avocado-cli/commands/provision.md
+++ b/src/docs/avocado-linux/tools/avocado-cli/commands/provision.md
@@ -4,25 +4,19 @@ Provision a runtime (shortcut for 'runtime provision')
 Usage: avocado provision [OPTIONS] --runtime <RUNTIME>
 
 Options:
-  -C, --config <CONFIG>
-          Path to avocado.toml configuration file [default: avocado.toml]
-  -v, --verbose
-          Enable verbose output
-  -f, --force
-          Force the operation to proceed, bypassing warnings or confirmation prompts
-  -r, --runtime <RUNTIME>
-          Runtime name to provision
-  -t, --target <TARGET>
-          Target architecture
-      --provision-profile <PROVISION_PROFILE>
-          Provision profile to use
-      --env <ENV>
-          Environment variables to pass to the provision process
-      --container-arg <CONTAINER_ARGS>
-          Additional arguments to pass to the container runtime
-      --dnf-arg <DNF_ARGS>
-          Additional arguments to pass to DNF commands
-  -h, --help
-          Print help
+  -C, --config <CONFIG>                 Path to avocado.yaml configuration file [default: avocado.yaml]
+  -v, --verbose                         Enable verbose output
+  -f, --force                           Force the operation to proceed, bypassing warnings or confirmation prompts
+  -r, --runtime <RUNTIME>               Runtime name to provision
+  -t, --target <TARGET>                 Target architecture
+      --profile <PROVISION_PROFILE>     Provision profile to use
+      --env <ENV>                       Environment variables to pass to the provision process
+      --out <OUT>                       Output path relative to src_dir for provisioning artifacts
+      --container-arg <CONTAINER_ARGS>  Additional arguments to pass to the container runtime
+      --dnf-arg <DNF_ARGS>              Additional arguments to pass to DNF commands
+      --runs-on <USER@HOST>             Run command on remote host using local volume via NFS (format: user@host)
+      --nfs-port <NFS_PORT>             NFS port for remote execution (auto-selects from 12050-12099 if not specified)
+      --sdk-arch <ARCH>                 SDK container architecture for cross-arch emulation via Docker buildx/QEMU (aarch64 or x86-64)
+  -h, --help                            Print help
 
 ```
diff --git a/src/docs/avocado-linux/tools/avocado-cli/commands/prune.md b/src/docs/avocado-linux/tools/avocado-cli/commands/prune.md
new file mode 100644
index 00000000..b08ba2db
--- /dev/null
+++ b/src/docs/avocado-linux/tools/avocado-cli/commands/prune.md
@@ -0,0 +1,22 @@
+```
+Remove abandoned Docker volumes no longer associated with active configs
+
+Usage: avocado prune [OPTIONS]
+
+Options:
+      --container-tool <CONTAINER_TOOL>
+          Container tool to use (docker/podman) [default: docker]
+  -v, --verbose
+          Enable verbose output
+      --dry-run
+          Perform a dry run without actually removing volumes
+      --runs-on <USER@HOST>
+          Run command on remote host using local volume via NFS (format: user@host)
+      --nfs-port <NFS_PORT>
+          NFS port for remote execution (auto-selects from 12050-12099 if not specified)
+      --sdk-arch <ARCH>
+          SDK container architecture for cross-arch emulation via Docker buildx/QEMU (aarch64 or x86-64)
+  -h, --help
+          Print help
+
+```
diff --git a/src/docs/avocado-linux/tools/avocado-cli/commands/runtime/build.md b/src/docs/avocado-linux/tools/avocado-cli/commands/runtime/build.md
index 06dbce08..cc029736 100644
--- a/src/docs/avocado-linux/tools/avocado-cli/commands/runtime/build.md
+++ b/src/docs/avocado-linux/tools/avocado-cli/commands/runtime/build.md
@@ -4,13 +4,16 @@ Build a runtime
 Usage: avocado runtime build [OPTIONS] --runtime <RUNTIME>
 
 Options:
-  -C, --config <CONFIG>                 Path to avocado.toml configuration file [default: avocado.toml]
+  -C, --config <CONFIG>                 Path to avocado.yaml configuration file [default: avocado.yaml]
   -v, --verbose                         Enable verbose output
   -f, --force                           Force the operation to proceed, bypassing warnings or confirmation prompts
   -r, --runtime <RUNTIME>               Runtime name to build
   -t, --target <TARGET>                 Target architecture
       --container-arg <CONTAINER_ARGS>  Additional arguments to pass to the container runtime
       --dnf-arg <DNF_ARGS>              Additional arguments to pass to DNF commands
+      --runs-on <USER@HOST>             Run command on remote host using local volume via NFS (format: user@host)
+      --nfs-port <NFS_PORT>             NFS port for remote execution (auto-selects from 12050-12099 if not specified)
+      --sdk-arch <ARCH>                 SDK container architecture for cross-arch emulation via Docker buildx/QEMU (aarch64 or x86-64)
   -h, --help                            Print help
 
 ```
diff --git a/src/docs/avocado-linux/tools/avocado-cli/commands/runtime/clean.md b/src/docs/avocado-linux/tools/avocado-cli/commands/runtime/clean.md
index 1044ad47..3b1b8595 100644
--- a/src/docs/avocado-linux/tools/avocado-cli/commands/runtime/clean.md
+++ b/src/docs/avocado-linux/tools/avocado-cli/commands/runtime/clean.md
@@ -4,12 +4,15 @@ Clean runtime installroot directory
 Usage: avocado runtime clean [OPTIONS] --runtime <RUNTIME>
 
 Options:
-  -C, --config <CONFIG>                 Path to avocado.toml configuration file [default: avocado.toml]
+  -C, --config <CONFIG>                 Path to avocado.yaml configuration file [default: avocado.yaml]
   -v, --verbose                         Enable verbose output
   -r, --runtime <RUNTIME>               Name of the runtime to clean
   -t, --target <TARGET>                 Target architecture
       --container-arg <CONTAINER_ARGS>  Additional arguments to pass to the container runtime
       --dnf-arg <DNF_ARGS>              Additional arguments to pass to DNF commands
+      --runs-on <USER@HOST>             Run command on remote host using local volume via NFS (format: user@host)
+      --nfs-port <NFS_PORT>             NFS port for remote execution (auto-selects from 12050-12099 if not specified)
+      --sdk-arch <ARCH>                 SDK container architecture for cross-arch emulation via Docker buildx/QEMU (aarch64 or x86-64)
   -h, --help                            Print help
 
 ```
diff --git a/src/docs/avocado-linux/tools/avocado-cli/commands/runtime/deploy.md b/src/docs/avocado-linux/tools/avocado-cli/commands/runtime/deploy.md
index ef5fea61..d2ff1552 100644
--- a/src/docs/avocado-linux/tools/avocado-cli/commands/runtime/deploy.md
+++ b/src/docs/avocado-linux/tools/avocado-cli/commands/runtime/deploy.md
@@ -4,13 +4,16 @@ Deploy a runtime to a device
 Usage: avocado runtime deploy [OPTIONS] --runtime <RUNTIME> --device <DEVICE>
 
 Options:
-  -C, --config <CONFIG>                 Path to avocado.toml configuration file [default: avocado.toml]
+  -C, --config <CONFIG>                 Path to avocado.yaml configuration file [default: avocado.yaml]
   -v, --verbose                         Enable verbose output
   -r, --runtime <RUNTIME>               Runtime name to deploy
   -t, --target <TARGET>                 Target architecture
   -d, --device <DEVICE>                 Device IP address or hostname to deploy to
       --container-arg <CONTAINER_ARGS>  Additional arguments to pass to the container runtime
       --dnf-arg <DNF_ARGS>              Additional arguments to pass to DNF commands
+      --runs-on <USER@HOST>             Run command on remote host using local volume via NFS (format: user@host)
+      --nfs-port <NFS_PORT>             NFS port for remote execution (auto-selects from 12050-12099 if not specified)
+      --sdk-arch <ARCH>                 SDK container architecture for cross-arch emulation via Docker buildx/QEMU (aarch64 or x86-64)
   -h, --help                            Print help
 
 ```
diff --git a/src/docs/avocado-linux/tools/avocado-cli/commands/runtime/deps.md b/src/docs/avocado-linux/tools/avocado-cli/commands/runtime/deps.md
index 99a97b9f..160f00df 100644
--- a/src/docs/avocado-linux/tools/avocado-cli/commands/runtime/deps.md
+++ b/src/docs/avocado-linux/tools/avocado-cli/commands/runtime/deps.md
@@ -4,9 +4,12 @@ List dependencies for a runtime
 Usage: avocado runtime deps [OPTIONS] --runtime <RUNTIME>
 
 Options:
-  -C, --config <CONFIG>    Path to avocado.toml configuration file [default: avocado.toml]
-  -r, --runtime <RUNTIME>  Runtime name to list dependencies for
-  -t, --target <TARGET>    Target architecture
-  -h, --help               Print help
+  -C, --config <CONFIG>      Path to avocado.yaml configuration file [default: avocado.yaml]
+  -r, --runtime <RUNTIME>    Runtime name to list dependencies for
+  -t, --target <TARGET>      Target architecture
+      --runs-on <USER@HOST>  Run command on remote host using local volume via NFS (format: user@host)
+      --nfs-port <NFS_PORT>  NFS port for remote execution (auto-selects from 12050-12099 if not specified)
+      --sdk-arch <ARCH>      SDK container architecture for cross-arch emulation via Docker buildx/QEMU (aarch64 or x86-64)
+  -h, --help                 Print help
 
 ```
diff --git a/src/docs/avocado-linux/tools/avocado-cli/commands/runtime/dnf.md b/src/docs/avocado-linux/tools/avocado-cli/commands/runtime/dnf.md
index aaa0f841..6241b8bb 100644
--- a/src/docs/avocado-linux/tools/avocado-cli/commands/runtime/dnf.md
+++ b/src/docs/avocado-linux/tools/avocado-cli/commands/runtime/dnf.md
@@ -7,12 +7,15 @@ Arguments:
   [COMMAND]...  DNF command and arguments to execute
 
 Options:
-  -C, --config <CONFIG>                 Path to avocado.toml configuration file [default: avocado.toml]
+  -C, --config <CONFIG>                 Path to avocado.yaml configuration file [default: avocado.yaml]
   -v, --verbose                         Enable verbose output
   -r, --runtime <RUNTIME>               Name of the runtime to operate on
   -t, --target <TARGET>                 Target architecture
       --container-arg <CONTAINER_ARGS>  Additional arguments to pass to the container runtime
       --dnf-arg <DNF_ARGS>              Additional arguments to pass to DNF commands
+      --runs-on <USER@HOST>             Run command on remote host using local volume via NFS (format: user@host)
+      --nfs-port <NFS_PORT>             NFS port for remote execution (auto-selects from 12050-12099 if not specified)
+      --sdk-arch <ARCH>                 SDK container architecture for cross-arch emulation via Docker buildx/QEMU (aarch64 or x86-64)
   -h, --help                            Print help
 
 ```
diff --git a/src/docs/avocado-linux/tools/avocado-cli/commands/runtime/install.md b/src/docs/avocado-linux/tools/avocado-cli/commands/runtime/install.md
index d36748e2..1ed39caf 100644
--- a/src/docs/avocado-linux/tools/avocado-cli/commands/runtime/install.md
+++ b/src/docs/avocado-linux/tools/avocado-cli/commands/runtime/install.md
@@ -4,13 +4,16 @@ Install dependencies into runtime installroots
 Usage: avocado runtime install [OPTIONS]
 
 Options:
-  -C, --config <CONFIG>                 Path to avocado.toml configuration file [default: avocado.toml]
+  -C, --config <CONFIG>                 Path to avocado.yaml configuration file [default: avocado.yaml]
   -v, --verbose                         Enable verbose output
   -f, --force                           Force the operation to proceed, bypassing warnings or confirmation prompts
   -r, --runtime <RUNTIME>               Runtime name to install dependencies for (if not provided, installs for all runtimes)
   -t, --target <TARGET>                 Target architecture
       --container-arg <CONTAINER_ARGS>  Additional arguments to pass to the container runtime
       --dnf-arg <DNF_ARGS>              Additional arguments to pass to DNF commands
+      --runs-on <USER@HOST>             Run command on remote host using local volume via NFS (format: user@host)
+      --nfs-port <NFS_PORT>             NFS port for remote execution (auto-selects from 12050-12099 if not specified)
+      --sdk-arch <ARCH>                 SDK container architecture for cross-arch emulation via Docker buildx/QEMU (aarch64 or x86-64)
   -h, --help                            Print help
 
 ```
diff --git a/src/docs/avocado-linux/tools/avocado-cli/commands/runtime/list.md b/src/docs/avocado-linux/tools/avocado-cli/commands/runtime/list.md
index ab0620d9..67c87811 100644
--- a/src/docs/avocado-linux/tools/avocado-cli/commands/runtime/list.md
+++ b/src/docs/avocado-linux/tools/avocado-cli/commands/runtime/list.md
@@ -4,8 +4,11 @@ List runtime names
 Usage: avocado runtime list [OPTIONS]
 
 Options:
-  -C, --config <CONFIG>  Path to avocado.toml configuration file [default: avocado.toml]
-  -t, --target <TARGET>  Target architecture
-  -h, --help             Print help
+  -C, --config <CONFIG>      Path to avocado.yaml configuration file [default: avocado.yaml]
+  -t, --target <TARGET>      Target architecture
+      --runs-on <USER@HOST>  Run command on remote host using local volume via NFS (format: user@host)
+      --nfs-port <NFS_PORT>  NFS port for remote execution (auto-selects from 12050-12099 if not specified)
+      --sdk-arch <ARCH>      SDK container architecture for cross-arch emulation via Docker buildx/QEMU (aarch64 or x86-64)
+  -h, --help                 Print help
 
 ```
diff --git a/src/docs/avocado-linux/tools/avocado-cli/commands/runtime/provision.md b/src/docs/avocado-linux/tools/avocado-cli/commands/runtime/provision.md
index be7baa92..0925bd64 100644
--- a/src/docs/avocado-linux/tools/avocado-cli/commands/runtime/provision.md
+++ b/src/docs/avocado-linux/tools/avocado-cli/commands/runtime/provision.md
@@ -4,25 +4,19 @@ Provision a runtime
 Usage: avocado runtime provision [OPTIONS] --runtime <RUNTIME>
 
 Options:
-  -C, --config <CONFIG>
-          Path to avocado.toml configuration file [default: avocado.toml]
-  -v, --verbose
-          Enable verbose output
-  -f, --force
-          Force the operation to proceed, bypassing warnings or confirmation prompts
-  -r, --runtime <RUNTIME>
-          Runtime name to provision
-  -t, --target <TARGET>
-          Target architecture
-      --provision-profile <PROVISION_PROFILE>
-          Provision profile to use
-      --env <ENV>
-          Environment variables to pass to the provision process
-      --container-arg <CONTAINER_ARGS>
-          Additional arguments to pass to the container runtime
-      --dnf-arg <DNF_ARGS>
-          Additional arguments to pass to DNF commands
-  -h, --help
-          Print help
+  -C, --config <CONFIG>                 Path to avocado.yaml configuration file [default: avocado.yaml]
+  -v, --verbose                         Enable verbose output
+  -f, --force                           Force the operation to proceed, bypassing warnings or confirmation prompts
+  -r, --runtime <RUNTIME>               Runtime name to provision
+  -t, --target <TARGET>                 Target architecture
+      --profile <PROVISION_PROFILE>     Provision profile to use
+      --env <ENV>                       Environment variables to pass to the provision process
+      --out <OUT>                       Output path relative to src_dir for provisioning artifacts
+      --container-arg <CONTAINER_ARGS>  Additional arguments to pass to the container runtime
+      --dnf-arg <DNF_ARGS>              Additional arguments to pass to DNF commands
+      --runs-on <USER@HOST>             Run command on remote host using local volume via NFS (format: user@host)
+      --nfs-port <NFS_PORT>             NFS port for remote execution (auto-selects from 12050-12099 if not specified)
+      --sdk-arch <ARCH>                 SDK container architecture for cross-arch emulation via Docker buildx/QEMU (aarch64 or x86-64)
+  -h, --help                            Print help
 
 ```
diff --git a/src/docs/avocado-linux/tools/avocado-cli/commands/runtime/sign.md b/src/docs/avocado-linux/tools/avocado-cli/commands/runtime/sign.md
new file mode 100644
index 00000000..628c8339
--- /dev/null
+++ b/src/docs/avocado-linux/tools/avocado-cli/commands/runtime/sign.md
@@ -0,0 +1,18 @@
+```
+Sign runtime images
+
+Usage: avocado runtime sign [OPTIONS] --runtime <RUNTIME>
+
+Options:
+  -C, --config <CONFIG>                 Path to avocado.yaml configuration file [default: avocado.yaml]
+  -v, --verbose                         Enable verbose output
+  -r, --runtime <RUNTIME>               Runtime name to sign
+  -t, --target <TARGET>                 Target architecture
+      --container-arg <CONTAINER_ARGS>  Additional arguments to pass to the container runtime
+      --dnf-arg <DNF_ARGS>              Additional arguments to pass to DNF commands
+      --runs-on <USER@HOST>             Run command on remote host using local volume via NFS (format: user@host)
+      --nfs-port <NFS_PORT>             NFS port for remote execution (auto-selects from 12050-12099 if not specified)
+      --sdk-arch <ARCH>                 SDK container architecture for cross-arch emulation via Docker buildx/QEMU (aarch64 or x86-64)
+  -h, --help                            Print help
+
+```
diff --git a/src/docs/avocado-linux/tools/avocado-cli/commands/sdk/clean.md b/src/docs/avocado-linux/tools/avocado-cli/commands/sdk/clean.md
index bba40be1..5939886c 100644
--- a/src/docs/avocado-linux/tools/avocado-cli/commands/sdk/clean.md
+++ b/src/docs/avocado-linux/tools/avocado-cli/commands/sdk/clean.md
@@ -1,14 +1,20 @@
 ```
-Remove the SDK directory
+Remove the SDK directory Clean the SDK or run clean scripts for specific compile sections
 
-Usage: avocado sdk clean [OPTIONS]
+Usage: avocado sdk clean [OPTIONS] [SECTIONS]...
+
+Arguments:
+  [SECTIONS]...  Specific compile sections to clean (runs their clean scripts)
 
 Options:
-  -C, --config <CONFIG>                 Path to avocado.toml configuration file [default: avocado.toml]
+  -C, --config <CONFIG>                 Path to avocado.yaml configuration file [default: avocado.yaml]
   -v, --verbose                         Enable verbose output
   -t, --target <TARGET>                 Target architecture
       --container-arg <CONTAINER_ARGS>  Additional arguments to pass to the container runtime
       --dnf-arg <DNF_ARGS>              Additional arguments to pass to DNF commands
+      --runs-on <USER@HOST>             Run command on remote host using local volume via NFS (format: user@host)
+      --nfs-port <NFS_PORT>             NFS port for remote execution (auto-selects from 12050-12099 if not specified)
+      --sdk-arch <ARCH>                 SDK container architecture for cross-arch emulation via Docker buildx/QEMU (aarch64 or x86-64)
   -h, --help                            Print help
 
 ```
diff --git a/src/docs/avocado-linux/tools/avocado-cli/commands/sdk/compile.md b/src/docs/avocado-linux/tools/avocado-cli/commands/sdk/compile.md
index 813a2de9..4f7a2168 100644
--- a/src/docs/avocado-linux/tools/avocado-cli/commands/sdk/compile.md
+++ b/src/docs/avocado-linux/tools/avocado-cli/commands/sdk/compile.md
@@ -7,11 +7,14 @@ Arguments:
   [SECTIONS]...  Specific compile sections to run
 
 Options:
-  -C, --config <CONFIG>                 Path to avocado.toml configuration file [default: avocado.toml]
+  -C, --config <CONFIG>                 Path to avocado.yaml configuration file [default: avocado.yaml]
   -v, --verbose                         Enable verbose output
   -t, --target <TARGET>                 Target architecture
       --container-arg <CONTAINER_ARGS>  Additional arguments to pass to the container runtime
       --dnf-arg <DNF_ARGS>              Additional arguments to pass to DNF commands
+      --runs-on <USER@HOST>             Run command on remote host using local volume via NFS (format: user@host)
+      --nfs-port <NFS_PORT>             NFS port for remote execution (auto-selects from 12050-12099 if not specified)
+      --sdk-arch <ARCH>                 SDK container architecture for cross-arch emulation via Docker buildx/QEMU (aarch64 or x86-64)
   -h, --help                            Print help
 
 ```
diff --git a/src/docs/avocado-linux/tools/avocado-cli/commands/sdk/deps.md b/src/docs/avocado-linux/tools/avocado-cli/commands/sdk/deps.md
index b9a9c6c3..96efde7d 100644
--- a/src/docs/avocado-linux/tools/avocado-cli/commands/sdk/deps.md
+++ b/src/docs/avocado-linux/tools/avocado-cli/commands/sdk/deps.md
@@ -4,10 +4,13 @@ List SDK dependencies
 Usage: avocado sdk deps [OPTIONS]
 
 Options:
-  -C, --config <CONFIG>                 Path to avocado.toml configuration file [default: avocado.toml]
+  -C, --config <CONFIG>                 Path to avocado.yaml configuration file [default: avocado.yaml]
   -t, --target <TARGET>                 Target architecture
       --container-arg <CONTAINER_ARGS>  Additional arguments to pass to the container runtime
       --dnf-arg <DNF_ARGS>              Additional arguments to pass to DNF commands
+      --runs-on <USER@HOST>             Run command on remote host using local volume via NFS (format: user@host)
+      --nfs-port <NFS_PORT>             NFS port for remote execution (auto-selects from 12050-12099 if not specified)
+      --sdk-arch <ARCH>                 SDK container architecture for cross-arch emulation via Docker buildx/QEMU (aarch64 or x86-64)
   -h, --help                            Print help
 
 ```
diff --git a/src/docs/avocado-linux/tools/avocado-cli/commands/sdk/dnf.md b/src/docs/avocado-linux/tools/avocado-cli/commands/sdk/dnf.md
index f2de926e..4586956d 100644
--- a/src/docs/avocado-linux/tools/avocado-cli/commands/sdk/dnf.md
+++ b/src/docs/avocado-linux/tools/avocado-cli/commands/sdk/dnf.md
@@ -7,11 +7,14 @@ Arguments:
   [COMMAND]...  DNF command and arguments to execute
 
 Options:
-  -C, --config <CONFIG>                 Path to avocado.toml configuration file [default: avocado.toml]
+  -C, --config <CONFIG>                 Path to avocado.yaml configuration file [default: avocado.yaml]
   -v, --verbose                         Enable verbose output
   -t, --target <TARGET>                 Target architecture
       --container-arg <CONTAINER_ARGS>  Additional arguments to pass to the container runtime
       --dnf-arg <DNF_ARGS>              Additional arguments to pass to DNF commands
+      --runs-on <USER@HOST>             Run command on remote host using local volume via NFS (format: user@host)
+      --nfs-port <NFS_PORT>             NFS port for remote execution (auto-selects from 12050-12099 if not specified)
+      --sdk-arch <ARCH>                 SDK container architecture for cross-arch emulation via Docker buildx/QEMU (aarch64 or x86-64)
   -h, --help                            Print help
 
 ```
diff --git a/src/docs/avocado-linux/tools/avocado-cli/commands/sdk/install.md b/src/docs/avocado-linux/tools/avocado-cli/commands/sdk/install.md
index 6e762974..bb7329d9 100644
--- a/src/docs/avocado-linux/tools/avocado-cli/commands/sdk/install.md
+++ b/src/docs/avocado-linux/tools/avocado-cli/commands/sdk/install.md
@@ -4,12 +4,15 @@ Install dependencies into the SDK
 Usage: avocado sdk install [OPTIONS]
 
 Options:
-  -C, --config <CONFIG>                 Path to avocado.toml configuration file [default: avocado.toml]
+  -C, --config <CONFIG>                 Path to avocado.yaml configuration file [default: avocado.yaml]
   -v, --verbose                         Enable verbose output
   -f, --force                           Force the operation to proceed, bypassing warnings or confirmation prompts
   -t, --target <TARGET>                 Target architecture
       --container-arg <CONTAINER_ARGS>  Additional arguments to pass to the container runtime
       --dnf-arg <DNF_ARGS>              Additional arguments to pass to DNF commands
+      --runs-on <USER@HOST>             Run command on remote host using local volume via NFS (format: user@host)
+      --nfs-port <NFS_PORT>             NFS port for remote execution (auto-selects from 12050-12099 if not specified)
+      --sdk-arch <ARCH>                 SDK container architecture for cross-arch emulation via Docker buildx/QEMU (aarch64 or x86-64)
   -h, --help                            Print help
 
 ```
diff --git a/src/docs/avocado-linux/tools/avocado-cli/commands/sdk/run.md b/src/docs/avocado-linux/tools/avocado-cli/commands/sdk/run.md
index 533be911..a15604da 100644
--- a/src/docs/avocado-linux/tools/avocado-cli/commands/sdk/run.md
+++ b/src/docs/avocado-linux/tools/avocado-cli/commands/sdk/run.md
@@ -7,11 +7,11 @@ Arguments:
   [COMMAND]...  Command and arguments to run in container
 
 Options:
-  -C, --config <CONFIG>                 Path to avocado.toml configuration file [default: avocado.toml]
+  -C, --config <CONFIG>                 Path to avocado.yaml configuration file [default: avocado.yaml]
   -t, --target <TARGET>                 Target architecture
       --name <NAME>                     Assign a name to the container
   -d, --detach                          Run container in background and print container ID
-      --rm                              Automatically remove the container when it exits
+      --rm <RM>                         Automatically remove the container when it exits (default: true) [default: true] [possible values: true, false]
   -i, --interactive                     Drop into interactive shell in container
   -v, --verbose                         Enable verbose output
   -E, --env                             Source the avocado SDK environment before running command
@@ -20,6 +20,9 @@ Options:
       --container-arg <CONTAINER_ARGS>  Additional arguments to pass to the container runtime
       --dnf-arg <DNF_ARGS>              Additional arguments to pass to DNF commands
       --no-bootstrap                    Skip SDK bootstrap initialization and go directly to container prompt
+      --runs-on <USER@HOST>             Run command on remote host using local volume via NFS (format: user@host)
+      --nfs-port <NFS_PORT>             NFS port for remote execution (auto-selects from 12050-12099 if not specified)
+      --sdk-arch <ARCH>                 SDK container architecture for cross-arch emulation via Docker buildx/QEMU (aarch64 or x86-64)
   -h, --help                            Print help
 
 ```
diff --git a/src/docs/avocado-linux/tools/avocado-cli/commands/sign.md b/src/docs/avocado-linux/tools/avocado-cli/commands/sign.md
new file mode 100644
index 00000000..dcc71b27
--- /dev/null
+++ b/src/docs/avocado-linux/tools/avocado-cli/commands/sign.md
@@ -0,0 +1,18 @@
+```
+Sign runtime images (shortcut for 'runtime sign')
+
+Usage: avocado sign [OPTIONS]
+
+Options:
+  -C, --config <CONFIG>                 Path to avocado.yaml configuration file [default: avocado.yaml]
+  -v, --verbose                         Enable verbose output
+  -r, --runtime <RUNTIME>               Runtime name to sign (if not provided, signs all runtimes with signing config)
+  -t, --target <TARGET>                 Target architecture
+      --container-arg <CONTAINER_ARGS>  Additional arguments to pass to the container runtime
+      --dnf-arg <DNF_ARGS>              Additional arguments to pass to DNF commands
+      --runs-on <USER@HOST>             Run command on remote host using local volume via NFS (format: user@host)
+      --nfs-port <NFS_PORT>             NFS port for remote execution (auto-selects from 12050-12099 if not specified)
+      --sdk-arch <ARCH>                 SDK container architecture for cross-arch emulation via Docker buildx/QEMU (aarch64 or x86-64)
+  -h, --help                            Print help
+
+```
diff --git a/src/docs/avocado-linux/tools/avocado-cli/commands/signing-keys/_category_.json b/src/docs/avocado-linux/tools/avocado-cli/commands/signing-keys/_category_.json
new file mode 100644
index 00000000..6c1477ba
--- /dev/null
+++ b/src/docs/avocado-linux/tools/avocado-cli/commands/signing-keys/_category_.json
@@ -0,0 +1,6 @@
+{
+  "label": "signing-keys",
+  "position": 10,
+  "collapsible": true,
+  "collapsed": true
+}
diff --git a/src/docs/avocado-linux/tools/avocado-cli/commands/signing-keys/create.md b/src/docs/avocado-linux/tools/avocado-cli/commands/signing-keys/create.md
new file mode 100644
index 00000000..1f08d044
--- /dev/null
+++ b/src/docs/avocado-linux/tools/avocado-cli/commands/signing-keys/create.md
@@ -0,0 +1,21 @@
+```
+Create a new signing key or register an external PKCS#11 key
+
+Usage: avocado signing-keys create [OPTIONS] [NAME]
+
+Arguments:
+  [NAME]  Name for the key (defaults to key ID if not provided)
+
+Options:
+      --uri <URI>               PKCS#11 URI for hardware-backed keys (e.g., 'pkcs11:token=YubiKey;object=signing-key')
+      --pkcs11-device <DEVICE>  Hardware device type (tpm, yubikey, or auto-detect)
+      --token <TOKEN>           PKCS#11 token label (e.g., 'avocado', 'YubiKey PIV'). If not provided, uses the first available token
+      --key-label <LABEL>       Label of existing key to reference in the device
+      --generate                Generate a new key in the device
+      --auth <METHOD>           Authentication method for PKCS#11 device (none, prompt, env) [default: prompt]
+      --runs-on <USER@HOST>     Run command on remote host using local volume via NFS (format: user@host)
+      --nfs-port <NFS_PORT>     NFS port for remote execution (auto-selects from 12050-12099 if not specified)
+      --sdk-arch <ARCH>         SDK container architecture for cross-arch emulation via Docker buildx/QEMU (aarch64 or x86-64)
+  -h, --help                    Print help
+
+```
diff --git a/src/docs/avocado-linux/tools/avocado-cli/commands/signing-keys/list.md b/src/docs/avocado-linux/tools/avocado-cli/commands/signing-keys/list.md
new file mode 100644
index 00000000..caa1c436
--- /dev/null
+++ b/src/docs/avocado-linux/tools/avocado-cli/commands/signing-keys/list.md
@@ -0,0 +1,12 @@
+```
+List all registered signing keys
+
+Usage: avocado signing-keys list [OPTIONS]
+
+Options:
+      --runs-on <USER@HOST>  Run command on remote host using local volume via NFS (format: user@host)
+      --nfs-port <NFS_PORT>  NFS port for remote execution (auto-selects from 12050-12099 if not specified)
+      --sdk-arch <ARCH>      SDK container architecture for cross-arch emulation via Docker buildx/QEMU (aarch64 or x86-64)
+  -h, --help                 Print help
+
+```
diff --git a/src/docs/avocado-linux/tools/avocado-cli/commands/signing-keys/remove.md b/src/docs/avocado-linux/tools/avocado-cli/commands/signing-keys/remove.md
new file mode 100644
index 00000000..0c85b7ae
--- /dev/null
+++ b/src/docs/avocado-linux/tools/avocado-cli/commands/signing-keys/remove.md
@@ -0,0 +1,16 @@
+```
+Remove a signing key
+
+Usage: avocado signing-keys remove [OPTIONS] <NAME>
+
+Arguments:
+  <NAME>  Name or key ID of the key to remove
+
+Options:
+      --delete               Delete hardware key from device (requires confirmation)
+      --runs-on <USER@HOST>  Run command on remote host using local volume via NFS (format: user@host)
+      --nfs-port <NFS_PORT>  NFS port for remote execution (auto-selects from 12050-12099 if not specified)
+      --sdk-arch <ARCH>      SDK container architecture for cross-arch emulation via Docker buildx/QEMU (aarch64 or x86-64)
+  -h, --help                 Print help
+
+```
diff --git a/src/docs/avocado-linux/tools/avocado-cli/commands/unlock.md b/src/docs/avocado-linux/tools/avocado-cli/commands/unlock.md
new file mode 100644
index 00000000..cc709f8f
--- /dev/null
+++ b/src/docs/avocado-linux/tools/avocado-cli/commands/unlock.md
@@ -0,0 +1,18 @@
+```
+Unlock (remove lock entries for) sysroots to allow package updates
+
+Usage: avocado unlock [OPTIONS]
+
+Options:
+  -C, --config <CONFIG>        Path to avocado.yaml configuration file [default: avocado.yaml]
+  -v, --verbose                Enable verbose output
+  -t, --target <TARGET>        Target architecture
+  -e, --extension <EXTENSION>  Unlock a specific extension
+  -r, --runtime <RUNTIME>      Unlock a specific runtime
+      --sdk                    Unlock SDK (rootfs, target-sysroot, and all SDK arches)
+      --runs-on <USER@HOST>    Run command on remote host using local volume via NFS (format: user@host)
+      --nfs-port <NFS_PORT>    NFS port for remote execution (auto-selects from 12050-12099 if not specified)
+      --sdk-arch <ARCH>        SDK container architecture for cross-arch emulation via Docker buildx/QEMU (aarch64 or x86-64)
+  -h, --help                   Print help
+
+```
diff --git a/src/docs/avocado-linux/tools/avocado-cli/commands/upgrade.md b/src/docs/avocado-linux/tools/avocado-cli/commands/upgrade.md
index 6e05b8dc..54537612 100644
--- a/src/docs/avocado-linux/tools/avocado-cli/commands/upgrade.md
+++ b/src/docs/avocado-linux/tools/avocado-cli/commands/upgrade.md
@@ -1,10 +1,13 @@
 ```
 Upgrade the CLI to the latest (or specified) version
 
-Usage: avocado upgrade
+Usage: avocado upgrade [OPTIONS]
 
 Options:
-      --version <VERSION>  Controls what version to upgrade to. If not specified, the latest version will be used
-  -h, --help               Print help
+      --version <VERSION>    Controls what version to upgrade to. If not specified, the latest version will be used
+      --runs-on <USER@HOST>  Run command on remote host using local volume via NFS (format: user@host)
+      --nfs-port <NFS_PORT>  NFS port for remote execution (auto-selects from 12050-12099 if not specified)
+      --sdk-arch <ARCH>      SDK container architecture for cross-arch emulation via Docker buildx/QEMU (aarch64 or x86-64)
+  -h, --help                 Print help
 
 ```
diff --git a/src/package-lock.json b/src/package-lock.json
index f905caab..5e56790c 100644
--- a/src/package-lock.json
+++ b/src/package-lock.json
@@ -259,6 +259,7 @@
       "resolved": "https://registry.npmjs.org/@algolia/client-search/-/client-search-5.39.0.tgz",
       "integrity": "sha512-/IYpF10BpthGZEJQZMhMqV4AqWr5avcWfZm/SIKK1RvUDmzGqLoW/+xeJVX9C8ZnNkIC8hivbIQFaNaRw0BFZQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@algolia/client-common": "5.39.0",
         "@algolia/requester-browser-xhr": "5.39.0",
@@ -403,6 +404,7 @@
       "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.4.tgz",
       "integrity": "sha512-2BCOP7TN8M+gVDj7/ht3hsaO/B/n5oDbiAyyvnRlNOs+u1o+JWNYTQrmpuNp1/Wq2gcFrI01JAW+paEKDMx/CA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.27.1",
         "@babel/generator": "^7.28.3",
@@ -2157,6 +2159,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=18"
       },
@@ -2179,6 +2182,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=18"
       }
@@ -2288,6 +2292,7 @@
       "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
       "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "cssesc": "^3.0.0",
         "util-deprecate": "^1.0.2"
@@ -2709,6 +2714,7 @@
       "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
       "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "cssesc": "^3.0.0",
         "util-deprecate": "^1.0.2"
@@ -3627,6 +3633,7 @@
       "resolved": "https://registry.npmjs.org/@docusaurus/plugin-content-docs/-/plugin-content-docs-3.9.1.tgz",
       "integrity": "sha512-DyLk9BIA6I9gPIuia8XIL+XIEbNnExam6AHzRsfrEq4zJr7k/DsWW7oi4aJMepDnL7jMRhpVcdsCxdjb0/A9xg==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@docusaurus/core": "3.9.1",
         "@docusaurus/logger": "3.9.1",
@@ -3855,6 +3862,7 @@
       "resolved": "https://registry.npmjs.org/@docusaurus/theme-classic/-/theme-classic-3.9.1.tgz",
       "integrity": "sha512-LrAIu/mQ04nG6s1cssC0TMmICD8twFIIn/hJ5Pd9uIPQvtKnyAKEn12RefopAul5KfMo9kixPaqogV5jIJr26w==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@docusaurus/core": "3.9.1",
         "@docusaurus/logger": "3.9.1",
@@ -3895,6 +3903,7 @@
       "resolved": "https://registry.npmjs.org/@docusaurus/theme-common/-/theme-common-3.9.1.tgz",
       "integrity": "sha512-j9adi961F+6Ps9d0jcb5BokMcbjXAAJqKkV43eo8nh4YgmDj7KUNDX4EnOh/MjTQeO06oPY5cxp3yUXdW/8Ggw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@docusaurus/mdx-loader": "3.9.1",
         "@docusaurus/module-type-aliases": "3.9.1",
@@ -4003,6 +4012,7 @@
       "resolved": "https://registry.npmjs.org/@docusaurus/utils/-/utils-3.9.1.tgz",
       "integrity": "sha512-YAL4yhhWLl9DXuf5MVig260a6INz4MehrBGFU/CZu8yXmRiYEuQvRFWh9ZsjfAOyaG7za1MNmBVZ4VVAi/CiJA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@docusaurus/logger": "3.9.1",
         "@docusaurus/types": "3.9.1",
@@ -4577,6 +4587,7 @@
       "resolved": "https://registry.npmjs.org/@mdx-js/react/-/react-3.1.1.tgz",
       "integrity": "sha512-f++rKLQgUVYDAtECQ6fn/is15GkEH9+nZPM3MS0RcxVqoTfawHvDlSCH7JbMhAM6uJ32v3eXLvLmLvjGu7PTQw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/mdx": "^2.0.0"
       },
@@ -4639,6 +4650,7 @@
       "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.9.0.tgz",
       "integrity": "sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==",
       "license": "Apache-2.0",
+      "peer": true,
       "engines": {
         "node": ">=8.0.0"
       }
@@ -5421,6 +5433,7 @@
       "resolved": "https://registry.npmjs.org/@svgr/core/-/core-8.1.0.tgz",
       "integrity": "sha512-8QqtOQT5ACVlmsvKOJNEaWmRPmcojMOzCz4Hs2BGG/toAp/K38LcsMRyLp349glq5AzJbCEeimEoxaX6v/fLrA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/core": "^7.21.3",
         "@svgr/babel-preset": "8.1.0",
@@ -5798,6 +5811,7 @@
       "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.0.tgz",
       "integrity": "sha512-1LOH8xovvsKsCBq1wnT4ntDUdCJKmnEakhsuoUSy6ExlHCkGP2hqnatagYTgFk6oeL0VU31u7SNjunPN+GchtA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "csstype": "^3.0.2"
       }
@@ -5998,6 +6012,7 @@
       "integrity": "sha512-TGf22kon8KW+DeKaUmOibKWktRY8b2NSAZNdtWh798COm1NWx8+xJ6iFBtk3IvLdv6+LGLJLRlyhrhEDZWargQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "8.45.0",
         "@typescript-eslint/types": "8.45.0",
@@ -6561,6 +6576,7 @@
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
       "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "license": "MIT",
+      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -6655,6 +6671,7 @@
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
       "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
         "fast-uri": "^3.0.1",
@@ -6700,6 +6717,7 @@
       "resolved": "https://registry.npmjs.org/algoliasearch/-/algoliasearch-5.39.0.tgz",
       "integrity": "sha512-DzTfhUxzg9QBNGzU/0kZkxEV72TeA4MmPJ7RVfLnQwHNhhliPo7ynglEWJS791rNlLFoTyrKvkapwr/P3EXV9A==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@algolia/abtesting": "1.5.0",
         "@algolia/client-abtesting": "5.39.0",
@@ -7389,6 +7407,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "baseline-browser-mapping": "^2.8.9",
         "caniuse-lite": "^1.0.30001746",
@@ -8238,6 +8257,7 @@
       "integrity": "sha512-L4NPsJlCfZsPeXukyzHFlg/i7IIVwHSItR0wg0FLNqYClJ4MQYTYLbC7EkjKYRLZF2iof2MUgN0EGy7MdQFChg==",
       "hasInstallScript": true,
       "license": "MIT",
+      "peer": true,
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/core-js"
@@ -8453,6 +8473,7 @@
       "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
       "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "cssesc": "^3.0.0",
         "util-deprecate": "^1.0.2"
@@ -9896,6 +9917,7 @@
       "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==",
       "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
@@ -10912,6 +10934,7 @@
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -13355,6 +13378,7 @@
       "integrity": "sha512-B7qPcEVE3NVkmSJbaYxvv4cHkVW7DQsZz13pUMrfS8z8Q/BuShN+gcTXrUlPiGqM2/t/EEaI030bpxMqY8gMlw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">= 10.16.0"
       }
@@ -16154,6 +16178,7 @@
       "resolved": "https://registry.npmjs.org/mobx/-/mobx-6.15.0.tgz",
       "integrity": "sha512-UczzB+0nnwGotYSgllfARAqWCJ5e/skuV2K/l+Zyck/H6pJIhLXuBnz+6vn2i211o7DtbE78HQtsYEKICHGI+g==",
       "license": "MIT",
+      "peer": true,
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/mobx"
@@ -16464,6 +16489,7 @@
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -17347,6 +17373,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "nanoid": "^3.3.11",
         "picocolors": "^1.1.1",
@@ -18262,6 +18289,7 @@
       "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
       "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "cssesc": "^3.0.0",
         "util-deprecate": "^1.0.2"
@@ -19141,6 +19169,7 @@
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -19223,6 +19252,7 @@
       "resolved": "https://registry.npmjs.org/react/-/react-19.2.0.tgz",
       "integrity": "sha512-tmbWg6W31tQLeB5cdIBOicJDJRR2KzXsV7uSK9iNfLWQ5bIZfxuPEHp7M8wiHyHnn0DD1i7w3Zmin0FtkrwoCQ==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -19232,6 +19262,7 @@
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.0.tgz",
       "integrity": "sha512-UlbRu4cAiGaIewkPyiRGJk0imDN2T3JjieT6spoL2UeSf5od4n5LB/mQ4ejmxhCFT1tYe8IvaFulzynWovsEFQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "scheduler": "^0.27.0"
       },
@@ -19296,6 +19327,7 @@
       "resolved": "https://registry.npmjs.org/react-loadable/-/react-loadable-5.5.0.tgz",
       "integrity": "sha512-C8Aui0ZpMd4KokxRdVAm2bQtI03k2RMRNzOB+IipV3yxFTSVICv7WoUr5L9ALB5BmKO1iHgZtWM8EvYG83otdg==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "prop-types": "^15.5.0"
       },
@@ -19324,6 +19356,7 @@
       "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.3.4.tgz",
       "integrity": "sha512-Ys9K+ppnJah3QuaRiLxk+jDWOR1MekYQrlytiXxC1RyfbdsZkS5pvKAzCCr031xHixZwpnsYNT5xysdFHQaYsA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.12.13",
         "history": "^4.9.0",
@@ -20304,7 +20337,8 @@
       "version": "2.17.3",
       "resolved": "https://registry.npmjs.org/search-insights/-/search-insights-2.17.3.tgz",
       "integrity": "sha512-RQPdCYTa8A68uM2jwxoY842xDhvx3E5LFL1LxvxCNMev4o5mLuokczhzjAgGwUZBAmOKZknArSxLKmXtIi2AxQ==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/section-matter": {
       "version": "1.0.0",
@@ -21396,6 +21430,7 @@
       "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-6.1.19.tgz",
       "integrity": "sha512-1v/e3Dl1BknC37cXMhwGomhO8AkYmN41CqyX9xhUDxry1ns3BFQy2lLDRQXJRdVVWB9OHemv/53xaStimvWyuA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@emotion/is-prop-valid": "1.2.2",
         "@emotion/unitless": "0.8.1",
@@ -21895,7 +21930,8 @@
       "version": "2.8.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
       "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
-      "license": "0BSD"
+      "license": "0BSD",
+      "peer": true
     },
     "node_modules/tsutils": {
       "version": "3.21.0",
@@ -22053,6 +22089,7 @@
       "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "devOptional": true,
       "license": "Apache-2.0",
+      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -22454,6 +22491,7 @@
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -22692,6 +22730,7 @@
       "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.102.0.tgz",
       "integrity": "sha512-hUtqAR3ZLVEYDEABdBioQCIqSoguHbFn1K7WlPPWSuXmx0031BD73PSE35jKyftdSh4YLDoQNgK4pqBt5Q82MA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/eslint-scope": "^3.7.7",
         "@types/estree": "^1.0.8",
@@ -23546,6 +23585,7 @@
       "resolved": "https://registry.npmjs.org/zod/-/zod-4.1.11.tgz",
       "integrity": "sha512-WPsqwxITS2tzx1bzhIKsEs19ABD5vmCVa4xBo2tq/SrV4RNZtfws1EnCWQXM6yh8bD08a1idvkB5MZSBiZsjwg==",
       "license": "MIT",
+      "peer": true,
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
       }
diff --git a/src/schemas/avocado-config.json b/src/schemas/avocado-config.json
index 92f69312..47995ad3 100644
--- a/src/schemas/avocado-config.json
+++ b/src/schemas/avocado-config.json
@@ -1,8 +1,8 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://avocado.com/schemas/avocado-config/1.1.0.json",
+  "$id": "https://avocado.com/schemas/avocado-config/1.2.0.json",
   "title": "Avocado Configuration",
-  "description": "Configuration schema for Avocado CLI avocado.toml files. Defines project settings, build configurations, dependencies, and provisioning profiles for Avocado OS projects.",
+  "description": "Configuration schema for Avocado CLI avocado.yaml files. Defines project settings, build configurations, packages, and provisioning profiles for Avocado OS projects.",
   "type": "object",
   "properties": {
     "default_target": {
@@ -37,15 +37,38 @@
       "default": ".",
       "examples": ["."]
     },
-    "runtime": {
-      "$ref": "#/definitions/runtimeConfig"
+    "distro": {
+      "title": "Distribution configuration",
+      "$ref": "#/definitions/distroConfig",
+      "description": "Distribution-specific configuration for the Avocado OS project."
+    },
+    "runtimes": {
+      "title": "Runtimes",
+      "type": "object",
+      "description": "Runtime configurations for different deployment scenarios. Each runtime can specify extensions, packages, and target-specific settings.",
+      "patternProperties": {
+        "^[a-zA-Z0-9_-]+$": {
+          "$ref": "#/definitions/runtimeConfig"
+        }
+      },
+      "additionalProperties": false,
+      "examples": [
+        {
+          "dev": {
+            "extensions": ["avocado-ext-dev", "avocado-ext-sshd-dev"],
+            "packages": {
+              "avocado-runtime": "*"
+            }
+          }
+        }
+      ]
     },
     "sdk": {
       "title": "SDK Configuration",
       "$ref": "#/definitions/sdkConfig",
       "description": "Configure the default Avocado SDK."
     },
-    "provision": {
+    "provision_profiles": {
       "title": "Provisioning profiles",
       "type": "object",
       "description": "Provisioning profiles for deploying Avocado OS images to devices. Each profile can define different settings for development, production, or custom deployment scenarios.",
@@ -63,42 +86,52 @@
         }
       ]
     },
-    "ext": {
+    "extensions": {
       "title": "Extensions",
       "type": "object",
-      "description": "Extension configurations for both local extensions (defined in this file) and external extensions (referenced through dependencies). Extensions can be system extensions (sysext) or configuration extensions (confext).",
+      "description": "Extension configurations for both local extensions (defined in this file) and remote extensions (fetched from package repositories, git, or local paths).",
       "patternProperties": {
-        "^[a-zA-Z0-9_-]+$": {
+        "^[a-zA-Z0-9_{}. -]+$": {
           "$ref": "#/definitions/extensionConfig"
         }
       },
       "additionalProperties": false,
       "examples": [
         {
-          "ext": {
-            "example-rust": {
-              "types": ["sysext", "confext"],
-              "dependencies": {
-                "example-rust-app": {
-                  "compile": "example-rust-app",
-                  "install": "example-rust-install.sh"
-                }
-              },
-              "sdk": {
-                "dependencies": {
-                  "nativesdk-rust": "*",
-                  "rust-cross-canadian-aarch64": "*",
-                  "nativesdk-cargo": "*",
-                  "nativesdk-binutils": "*",
-                  "nativesdk-gcc": "*",
-                  "nativesdk-glibc-dev": "*",
-                  "nativesdk-libgcc-dev": "*"
-                }
+          "example-rust": {
+            "types": ["sysext", "confext"],
+            "packages": {
+              "example-rust-app": {
+                "compile": "example-rust-app",
+                "install": "example-rust-install.sh"
+              }
+            },
+            "sdk": {
+              "packages": {
+                "nativesdk-rust": "*",
+                "rust-cross-canadian-aarch64": "*",
+                "nativesdk-cargo": "*"
               }
             }
           }
         }
       ]
+    },
+    "signing_keys": {
+      "title": "Signing keys",
+      "type": "array",
+      "description": "Mapping of friendly names to signing key IDs. Acts as a local bridge between the config and the global signing keys registry.",
+      "items": {
+        "type": "object",
+        "patternProperties": {
+          "^[a-zA-Z0-9_-]+$": {
+            "type": "string",
+            "description": "Signing key ID (e.g., sha256-abc123)"
+          }
+        },
+        "additionalProperties": false
+      },
+      "examples": [[{ "my-key": "sha256-abc123" }, { "other-key": "sha256-def456" }]]
     }
   },
   "additionalProperties": false,
@@ -106,9 +139,8 @@
     "version": {
       "title": "Version",
       "type": "string",
-      "enum": ["*"],
-      "description": "A semantic version string per https://semver.org/.",
-      "examples": ["*"]
+      "description": "A version string. Use '*' for any version, or a specific semantic version.",
+      "examples": ["*", "1.0.0", "0.23.0"]
     },
     "versionRequirement": {
       "title": "Version requirement",
@@ -116,39 +148,8 @@
       "description": "Semantic version requirement string. Supports exact versions (e.g., '2.1.3'), minimum versions (e.g., '>=1.0.0'), ranges, and other semver patterns.",
       "examples": ["1.0.0", ">=1.0.0", "~1.2.0", "^2.0.0", "2.1.3"]
     },
-    "versionObject": {
-      "title": "Version object",
-      "type": "object",
-      "description": "For advanced dependency configuration, an object can be supplied.",
-      "properties": {
-        "ext": {
-          "type": "string",
-          "description": "Extension name to reference.",
-          "examples": ["avocado-ext-dev"]
-        },
-        "vsn": {
-          "$ref": "#/definitions/version"
-        },
-        "config": {
-          "type": "string",
-          "description": "Include an extension from another Avocado config by specifying a path to the other config. The path is relative to the src_dir.",
-          "examples": ["extensions/sshd-dev/avocado.toml"]
-        }
-      },
-      "examples": [
-        {
-          "ext": "avocado-ext-dev",
-          "vsn": "*"
-        },
-        {
-          "ext": "avocado-rust-ext",
-          "config": "extensions/sshd-dev/avocado.toml"
-        }
-      ],
-      "additionalProperties": true
-    },
     "target": {
-      "title": "Targett",
+      "title": "Target",
       "type": "string",
       "enum": [
         "imx8mp-evk",
@@ -166,28 +167,189 @@
       "description": "An identifier for the platform for Avocado OS builds and deployments.",
       "additionalProperties": false
     },
-    "targetDependencies": {
-      "title": "Target and dependencies",
+    "distroConfig": {
+      "title": "Distribution configuration",
       "type": "object",
-      "description": "Configuration object containing target and dependencies.",
+      "description": "Distribution-specific settings.",
       "properties": {
-        "dependencies": {
-          "title": "Dependencies",
-          "$ref": "#/definitions/dependencies",
-          "description": "Runtime dependencies required for the target. Can include paths to local extensions or references to external packages."
+        "channel": {
+          "title": "Channel",
+          "type": "string",
+          "description": "Distribution channel (e.g., 'apollo', 'blackbird').",
+          "examples": ["apollo-edge", "blackbird-stable"]
+        },
+        "version": {
+          "title": "Version",
+          "type": "string",
+          "description": "Distribution version string.",
+          "examples": ["0.1.0"]
         }
       },
       "additionalProperties": false
     },
-    "targetRuntimeConfig": {
-      "title": "Target runtime configuration",
-      "description": "Runtime configuration for a specific target platform.",
-      "$ref": "#/definitions/targetDependencies",
+    "extensionSource": {
+      "title": "Extension source",
+      "type": "object",
+      "description": "Source configuration for fetching a remote extension. Supports package repositories, git repositories, and local filesystem paths.",
+      "oneOf": [
+        {
+          "type": "object",
+          "title": "Package source",
+          "description": "Extension from the Avocado package repository.",
+          "properties": {
+            "type": {
+              "type": "string",
+              "enum": ["package"],
+              "description": "Source type: package repository."
+            },
+            "version": {
+              "type": "string",
+              "description": "Version to fetch (e.g., '0.1.0' or '*').",
+              "examples": ["*", "1.0.0"]
+            },
+            "package": {
+              "type": "string",
+              "description": "Optional RPM package name (defaults to extension name if not specified).",
+              "examples": ["avocado-bsp-raspberrypi4"]
+            },
+            "repo_name": {
+              "type": "string",
+              "description": "Optional custom repository name.",
+              "examples": ["avocado-extras"]
+            },
+            "include": {
+              "type": "array",
+              "items": { "type": "string" },
+              "description": "Optional list of config sections to include from the remote extension. Supports dot-separated paths (e.g., 'provision_profiles.tegraflash') and wildcards (e.g., 'provision_profiles.*'). The extension's own section is always included.",
+              "examples": [["provision_profiles.*", "sdk.compile.tegraflash"]]
+            }
+          },
+          "required": ["type", "version"],
+          "additionalProperties": false
+        },
+        {
+          "type": "object",
+          "title": "Git source",
+          "description": "Extension from a git repository.",
+          "properties": {
+            "type": {
+              "type": "string",
+              "enum": ["git"],
+              "description": "Source type: git repository."
+            },
+            "url": {
+              "type": "string",
+              "description": "Git repository URL.",
+              "examples": ["https://github.com/avocado-linux/extensions.git"]
+            },
+            "ref": {
+              "type": "string",
+              "description": "Git ref (branch, tag, or commit hash).",
+              "examples": ["main", "v1.0.0", "abc123"]
+            },
+            "sparse_checkout": {
+              "type": "array",
+              "items": { "type": "string" },
+              "description": "Optional sparse checkout paths.",
+              "examples": [["extensions/my-ext"]]
+            },
+            "include": {
+              "type": "array",
+              "items": { "type": "string" },
+              "description": "Optional list of config sections to include from the remote extension.",
+              "examples": [["provision_profiles.*"]]
+            }
+          },
+          "required": ["type", "url"],
+          "additionalProperties": false
+        },
+        {
+          "type": "object",
+          "title": "Path source",
+          "description": "Extension from a local filesystem path.",
+          "properties": {
+            "type": {
+              "type": "string",
+              "enum": ["path"],
+              "description": "Source type: local filesystem path."
+            },
+            "path": {
+              "type": "string",
+              "description": "Path to the extension directory (relative to config or absolute).",
+              "examples": ["../extensions/my-ext", "/opt/extensions/my-ext"]
+            },
+            "include": {
+              "type": "array",
+              "items": { "type": "string" },
+              "description": "Optional list of config sections to include from the extension.",
+              "examples": [["sdk.compile.*"]]
+            }
+          },
+          "required": ["type", "path"],
+          "additionalProperties": false
+        }
+      ]
+    },
+    "runtimeConfig": {
+      "title": "Runtime configuration",
+      "type": "object",
+      "description": "Configuration for a runtime deployment scenario.",
+      "properties": {
+        "target": {
+          "type": "string",
+          "description": "Target platform for this runtime (overrides default_target)."
+        },
+        "extensions": {
+          "title": "Extensions",
+          "type": "array",
+          "items": { "type": "string" },
+          "description": "List of extension names to include in this runtime. Extensions must be defined in the 'extensions' section.",
+          "examples": [["avocado-ext-dev", "avocado-ext-sshd-dev"]]
+        },
+        "packages": {
+          "title": "Packages",
+          "$ref": "#/definitions/packages",
+          "description": "Package dependencies for this runtime."
+        },
+        "stone_include_paths": {
+          "type": "array",
+          "items": { "type": "string" },
+          "description": "Additional stone include paths for this runtime."
+        },
+        "stone_manifest": {
+          "type": "string",
+          "description": "Path to a custom stone manifest file."
+        },
+        "signing": {
+          "$ref": "#/definitions/signingConfig",
+          "description": "Signing configuration for this runtime."
+        }
+      },
+      "additionalProperties": true
+    },
+    "signingConfig": {
+      "title": "Signing configuration",
+      "type": "object",
+      "description": "Configuration for image signing.",
+      "properties": {
+        "key": {
+          "type": "string",
+          "description": "Name of the signing key to use (references a key from signing_keys section).",
+          "examples": ["my-key"]
+        },
+        "checksum_algorithm": {
+          "type": "string",
+          "enum": ["sha256", "blake3"],
+          "default": "sha256",
+          "description": "Checksum algorithm to use for signing."
+        }
+      },
+      "required": ["key"],
       "additionalProperties": false
     },
     "sdkConfig": {
       "type": "object",
-      "description": "SDK configuration for building Avocado OS projects.",
+      "description": "SDK configuration for building Avocado OS projects. Supports target-specific overrides using target names as keys.",
       "allOf": [
         {
           "$ref": "#/definitions/targetSdkConfig"
@@ -212,10 +374,10 @@
           "description": "Docker image to use for the SDK build environment. This provides the toolchain and build tools necessary for compilation.",
           "examples": ["avocado/sdk:2.0"]
         },
-        "dependencies": {
-          "title": "Dependencies",
-          "$ref": "#/definitions/dependencies",
-          "description": "SDK-level dependencies required for building the project. These are installed in the build environment.",
+        "packages": {
+          "title": "Packages",
+          "$ref": "#/definitions/packages",
+          "description": "SDK-level packages required for building the project. These are installed in the build environment.",
           "examples": [
             {
               "cmake": "*",
@@ -237,7 +399,7 @@
             {
               "wifi": {
                 "compile": "make",
-                "dependencies": {
+                "packages": {
                   "libnl": "3.5.0"
                 }
               }
@@ -264,6 +426,22 @@
           },
           "description": "Additional arguments to pass to the Docker container. Supports environment variable expansion using ${VAR_NAME} syntax.",
           "examples": [["--network", "host"]]
+        },
+        "disable_weak_dependencies": {
+          "title": "Disable weak dependencies",
+          "type": "boolean",
+          "description": "Disable installation of weak dependencies when installing packages.",
+          "default": false
+        },
+        "host_uid": {
+          "title": "Host UID",
+          "type": "integer",
+          "description": "Host UID for bindfs permission translation (overrides libc::getuid())."
+        },
+        "host_gid": {
+          "title": "Host GID",
+          "type": "integer",
+          "description": "Host GID for bindfs permission translation (overrides libc::getgid())."
         }
       },
       "additionalProperties": false
@@ -277,12 +455,18 @@
           "title": "Compile command",
           "type": "string",
           "description": "Compile command or script to execute for building this component.",
-          "examples": ["make"]
+          "examples": ["make", "./build.sh"]
         },
-        "dependencies": {
-          "title": "Dependencies",
-          "$ref": "#/definitions/dependencies",
-          "description": "Build-time dependencies required for compiling this component.",
+        "clean": {
+          "title": "Clean command",
+          "type": "string",
+          "description": "Path to clean script relative to src_dir, executed during 'ext clean' command.",
+          "examples": ["./clean.sh", "make clean"]
+        },
+        "packages": {
+          "title": "Packages",
+          "$ref": "#/definitions/packages",
+          "description": "Build-time packages required for compiling this component.",
           "examples": [
             {
               "libnl": "3.5.0",
@@ -309,6 +493,12 @@
             ["--device", "/dev/ttyUSB0"],
             ["--privileged", "--network=host"]
           ]
+        },
+        "state_file": {
+          "title": "State file",
+          "type": "string",
+          "description": "Path to state file relative to src_dir for persisting state between provision runs. Defaults to '.avocado/provision-{profile}.state' when not specified.",
+          "examples": [".avocado/provision-dev.state"]
         }
       },
       "additionalProperties": true
@@ -316,8 +506,12 @@
     "extensionConfig": {
       "title": "Extension configuration",
       "type": "object",
-      "description": "Configuration for an Avocado OS extension (system extension or configuration extension).",
+      "description": "Configuration for an Avocado OS extension (system extension or configuration extension). Extensions can be local (defined in this file) or remote (fetched from a source).",
       "properties": {
+        "source": {
+          "$ref": "#/definitions/extensionSource",
+          "description": "Source configuration for remote extensions. If not specified, the extension is considered local and must be fully defined in this config."
+        },
         "version": {
           "$ref": "#/definitions/version"
         },
@@ -329,7 +523,7 @@
             "enum": ["sysext", "confext"]
           },
           "description": "Extension types. 'sysext' for system extensions that provide system-level functionality, 'confext' for configuration extensions that provide configuration files.",
-          "examples": [["sysext"]]
+          "examples": [["sysext"], ["sysext", "confext"]]
         },
         "scopes": {
           "title": "Scopes",
@@ -343,7 +537,7 @@
         "overlay": {
           "title": "Overlay directory",
           "type": "string",
-          "description": "Path to the overlay directory containing files to be included in the extension. These files will be overlaid onto the root filesystem.",
+          "description": "Path to the overlay directory containing files to be included in the extension. The value should be relative to the src_dir. These files will be overlaid onto the root filesystem.",
           "examples": ["./overlay"]
         },
         "enable_services": {
@@ -353,76 +547,38 @@
             "type": "string"
           },
           "description": "List of systemd services to enable when the extension is active. Services must be available in the extension or base system.",
-          "examples": [
-            {
-              "ext": {
-                "example-rust": {
-                  "enable_services": ["sshd.socket"]
-                }
-              }
-            }
-          ]
+          "examples": [["sshd.socket", "my-service.service"]]
         },
         "modprobe": {
+          "title": "Kernel modules",
           "type": "array",
           "items": {
             "type": "string"
           },
           "description": "Kernel modules to load when the extension is active. Modules must be available in the kernel or provided by the extension.",
-          "examples": [["overlay"]]
+          "examples": [["overlay", "br_netfilter"]]
         },
-        "dependencies": {
-          "$ref": "#/definitions/dependencies",
-          "description": "Package dependencies required by the extension. These will be installed when the extension is built or deployed.",
-          "examples": [
-            {
-              "ext": {
-                "example-rust": {
-                  "dependencies": {
-                    "example-rust-app": {
-                      "compile": "example-rust-app",
-                      "install": "example-rust-install.sh"
-                    }
-                  }
-                }
-              }
-            }
-          ]
+        "packages": {
+          "$ref": "#/definitions/packages",
+          "description": "Package dependencies required by the extension. These will be installed when the extension is built or deployed."
         },
         "sdk": {
           "type": "object",
           "description": "SDK-specific configuration for building this extension.",
           "properties": {
-            "dependencies": {
-              "$ref": "#/definitions/dependencies",
-              "description": "Build-time dependencies specific to this extension.",
+            "packages": {
+              "$ref": "#/definitions/packages",
+              "description": "Build-time packages specific to this extension.",
               "examples": [
                 {
                   "nativesdk-rust": "*",
                   "rust-cross-canadian-aarch64": "*",
-                  "nativesdk-cargo": "*",
-                  "nativesdk-binutils": "*",
-                  "nativesdk-gcc": "*",
-                  "nativesdk-glibc-dev": "*",
-                  "nativesdk-libgcc-dev": "*"
+                  "nativesdk-cargo": "*"
                 }
               ]
             }
           },
-          "additionalProperties": true,
-          "examples": [
-            {
-              "dependencies": {
-                "nativesdk-rust": "*",
-                "rust-cross-canadian-aarch64": "*",
-                "nativesdk-cargo": "*",
-                "nativesdk-binutils": "*",
-                "nativesdk-gcc": "*",
-                "nativesdk-glibc-dev": "*",
-                "nativesdk-libgcc-dev": "*"
-              }
-            }
-          ]
+          "additionalProperties": true
         },
         "users": {
           "type": "object",
@@ -459,33 +615,7 @@
           ]
         }
       },
-      "additionalProperties": true,
-      "examples": [
-        {
-          "ext": {
-            "example-rust": {
-              "types": ["sysext", "confext"],
-              "dependencies": {
-                "example-rust-app": {
-                  "compile": "example-rust-app",
-                  "install": "example-rust-install.sh"
-                }
-              },
-              "sdk": {
-                "dependencies": {
-                  "nativesdk-rust": "*",
-                  "rust-cross-canadian-aarch64": "*",
-                  "nativesdk-cargo": "*",
-                  "nativesdk-binutils": "*",
-                  "nativesdk-gcc": "*",
-                  "nativesdk-glibc-dev": "*",
-                  "nativesdk-libgcc-dev": "*"
-                }
-              }
-            }
-          }
-        }
-      ]
+      "additionalProperties": true
     },
     "userConfig": {
       "type": "object",
@@ -531,65 +661,46 @@
       },
       "additionalProperties": false
     },
-    "runtimeConfig": {
+    "packages": {
+      "title": "Packages",
       "type": "object",
-      "description": "Default dependencies for all runtimes, as well as per-runtime overrides.",
-      "properties": {
-        "dependencies": {
-          "$ref": "#/definitions/dependencies"
-        }
-      },
-      "patternProperties": {
-        "^[a-zA-Z0-9_-]+$": {
-          "$ref": "#/definitions/targetRuntimeConfig"
-        }
-      },
-      "additionalProperties": false,
-      "examples": [
-        {
-          "raspberrypi4": {
-            "target": "raspberrypi4",
-            "dependencies": {
-              "wifi": {
-                "path": "../extensions/wifi"
-              }
-            }
-          }
-        }
-      ]
-    },
-    "dependencies": {
-      "title": "Dependencies",
-      "type": "object",
-      "description": "Object defining package and extension dependencies with version constraints.",
+      "description": "Object defining package dependencies with version constraints.",
       "patternProperties": {
         "^[a-zA-Z0-9_.-]+$": {
-          "examples": ["i2c-tools", "arbitrary-identifier"],
-          "description": "Keys specified to match this pattern are either an existing package name or an arbitrary identifier when specifying a version object with an ext key.",
+          "description": "Package name with version constraint. Can be a simple version string or an object with additional configuration.",
           "oneOf": [
             {
               "$ref": "#/definitions/version"
             },
             {
-              "$ref": "#/definitions/versionObject"
+              "type": "object",
+              "description": "Advanced package configuration.",
+              "properties": {
+                "compile": {
+                  "type": "string",
+                  "description": "Reference to a compile configuration section in sdk.compile.",
+                  "examples": ["my-app"]
+                },
+                "install": {
+                  "type": "string",
+                  "description": "Path to an install script for this package.",
+                  "examples": ["install.sh"]
+                }
+              },
+              "additionalProperties": true
             }
           ]
         }
       },
       "additionalProperties": false,
       "examples": [
+        {
+          "avocado-runtime": "*"
+        },
         {
           "avocado-img-bootfiles": "*",
           "avocado-img-rootfs": "*",
-          "avocado-img-initramfs": "*",
-          "avocado-ext-dev": {
-            "ext": "avocado-ext-dev",
-            "vsn": "*"
-          },
-          "example-rust-ext": {
-            "ext": "example-rust-ext",
-            "config": "extensions/sshd-dev/avocado.toml"
-          }
+          "avocado-img-initramfs": "*"
         }
       ]
     }
@@ -599,57 +710,73 @@
       "default_target": "jetson-orin-nano-devkit",
       "supported_targets": ["raspberrypi4", "qemuarm64"],
       "src_dir": "src",
+      "distro": {
+        "channel": "stable",
+        "version": "1.0.0"
+      },
       "sdk": {
         "image": "avocado/sdk:2.0",
-        "dependencies": {
+        "packages": {
           "cmake": "*"
         },
         "compile": {
           "wifi": {
             "compile": "make",
-            "dependencies": {
+            "clean": "./clean.sh",
+            "packages": {
               "libnl": "*"
             }
           }
         }
       },
-      "runtime": {
-        "raspberrypi4": {
-          "dependencies": {
+      "runtimes": {
+        "dev": {
+          "extensions": ["avocado-ext-dev", "wifi"],
+          "packages": {
             "avocado-img-bootfiles": "*",
-            "wifi-ext": {
-              "ext": "wifi"
-            }
+            "avocado-img-rootfs": "*"
           }
         }
       },
-      "provision": {
+      "provision_profiles": {
         "development": {
           "container_args": ["--device", "/dev/ttyUSB0"]
         }
       },
-      "ext": {
-        "example-rust": {
-          "types": ["sysext", "confext"],
-          "dependencies": {
-            "example-rust-app": {
-              "ext": "example-rust-app",
-              "vsn": "2.1.0",
-              "compile": "example-rust-app",
-              "install": "example-rust-install.sh"
+      "extensions": {
+        "avocado-ext-dev": {
+          "source": {
+            "type": "package",
+            "version": "*"
+          }
+        },
+        "avocado-bsp-{{ avocado.target }}": {
+          "source": {
+            "type": "package",
+            "version": "*",
+            "include": ["provision_profiles.*"]
+          }
+        },
+        "wifi": {
+          "types": ["sysext"],
+          "overlay": "./extensions/wifi/overlay",
+          "packages": {
+            "wifi-driver": {
+              "compile": "wifi",
+              "install": "install-wifi.sh"
             }
           },
           "sdk": {
-            "dependencies": {
-              "nativesdk-rust": "*",
-              "rust-cross-canadian-aarch64": "*",
-              "nativesdk-cargo": "*",
-              "nativesdk-binutils": "*",
-              "nativesdk-gcc": "*",
-              "nativesdk-glibc-dev": "*",
-              "nativesdk-libgcc-dev": "*"
+            "packages": {
+              "nativesdk-gcc": "*"
             }
           }
+        },
+        "my-local-ext": {
+          "source": {
+            "type": "path",
+            "path": "../extensions/my-ext"
+          }
         }
       }
     }