diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5ada56d..2c3dc56 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,55 +4,55 @@ on:
   push:
     branches: [main]
     paths:
-      - ".github/**"
-      - ".github/workflows/**"
-      - ".trunk/**"
-      - "AGENTS.md"
-      - "CHANGELOG.md"
-      - "Dockerfile"
-      - "README.md"
-      - "SECURITY.md"
-      - "SUPPORT.md"
-      - "assets/**"
-      - "cliff.toml"
-      - "components.toml"
-      - "components/**"
-      - "docs/**"
-      - "docs/upstream/**"
-      - "pyproject.toml"
-      - "renovate.json"
-      - "requirements-dev.txt"
-      - "rootfs/**"
-      - "scripts/**"
-      - "template-aio.xml"
-      - "tests/**"
-      - "upstream.toml"
+      - .github/**
+      - .github/workflows/**
+      - .trunk/**
+      - AGENTS.md
+      - CHANGELOG.md
+      - Dockerfile
+      - README.md
+      - SECURITY.md
+      - SUPPORT.md
+      - assets/**
+      - cliff.toml
+      - components.toml
+      - components/**
+      - docs/**
+      - docs/upstream/**
+      - pyproject.toml
+      - renovate.json
+      - requirements-dev.txt
+      - rootfs/**
+      - scripts/**
+      - template-aio.xml
+      - tests/**
+      - upstream.toml
   pull_request:
     branches: [main]
     paths:
-      - ".github/**"
-      - ".github/workflows/**"
-      - ".trunk/**"
-      - "AGENTS.md"
-      - "CHANGELOG.md"
-      - "Dockerfile"
-      - "README.md"
-      - "SECURITY.md"
-      - "SUPPORT.md"
-      - "assets/**"
-      - "cliff.toml"
-      - "components.toml"
-      - "components/**"
-      - "docs/**"
-      - "docs/upstream/**"
-      - "pyproject.toml"
-      - "renovate.json"
-      - "requirements-dev.txt"
-      - "rootfs/**"
-      - "scripts/**"
-      - "template-aio.xml"
-      - "tests/**"
-      - "upstream.toml"
+      - .github/**
+      - .github/workflows/**
+      - .trunk/**
+      - AGENTS.md
+      - CHANGELOG.md
+      - Dockerfile
+      - README.md
+      - SECURITY.md
+      - SUPPORT.md
+      - assets/**
+      - cliff.toml
+      - components.toml
+      - components/**
+      - docs/**
+      - docs/upstream/**
+      - pyproject.toml
+      - renovate.json
+      - requirements-dev.txt
+      - rootfs/**
+      - scripts/**
+      - template-aio.xml
+      - tests/**
+      - upstream.toml
   workflow_dispatch:
 
 permissions:
@@ -64,7 +64,7 @@ concurrency:
 
 jobs:
   aio-build:
-    uses: JSONbored/aio-fleet/.github/workflows/aio-build.yml@388300f0f98701ea81bd8185660257d06cd8f472
+    uses: JSONbored/aio-fleet/.github/workflows/aio-build.yml@4aea17371db2faf5ba759cda63b4f46aac514162
     permissions:
       contents: read
       packages: write
diff --git a/.github/workflows/check-upstream.yml b/.github/workflows/check-upstream.yml
index 7eeaa63..5fc4122 100644
--- a/.github/workflows/check-upstream.yml
+++ b/.github/workflows/check-upstream.yml
@@ -2,7 +2,7 @@ name: Check Upstream Version
 
 on:
   schedule:
-    - cron: "23 7 * * 1"
+    - cron: 23 7 * * 1
   workflow_dispatch:
 
 permissions:
@@ -14,7 +14,7 @@ concurrency:
 
 jobs:
   check-upstream:
-    uses: JSONbored/aio-fleet/.github/workflows/aio-check-upstream.yml@388300f0f98701ea81bd8185660257d06cd8f472
+    uses: JSONbored/aio-fleet/.github/workflows/aio-check-upstream.yml@4aea17371db2faf5ba759cda63b4f46aac514162
     permissions:
       contents: write
       pull-requests: write
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
index fe1c368..558dc9e 100644
--- a/.github/workflows/publish-release.yml
+++ b/.github/workflows/publish-release.yml
@@ -8,7 +8,7 @@ permissions:
 
 jobs:
   publish-release:
-    uses: JSONbored/aio-fleet/.github/workflows/aio-publish-release.yml@388300f0f98701ea81bd8185660257d06cd8f472
+    uses: JSONbored/aio-fleet/.github/workflows/aio-publish-release.yml@4aea17371db2faf5ba759cda63b4f46aac514162
     permissions:
       actions: read
       contents: write
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1e01cd0..e1bcd51 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -8,7 +8,7 @@ permissions:
 
 jobs:
   prepare-release:
-    uses: JSONbored/aio-fleet/.github/workflows/aio-prepare-release.yml@388300f0f98701ea81bd8185660257d06cd8f472
+    uses: JSONbored/aio-fleet/.github/workflows/aio-prepare-release.yml@4aea17371db2faf5ba759cda63b4f46aac514162
     permissions:
       contents: write
       pull-requests: write
diff --git a/.trunk/configs/.markdownlint.yaml b/.trunk/configs/.markdownlint.yaml
index b40ee9d..0e23341 100644
--- a/.trunk/configs/.markdownlint.yaml
+++ b/.trunk/configs/.markdownlint.yaml
@@ -1,2 +1,4 @@
 # Prettier friendly markdownlint config (all formatting rules disabled)
 extends: markdownlint/style/prettier
+MD024:
+  siblings_only: true
diff --git a/.trunk/configs/.shellcheckrc b/.trunk/configs/.shellcheckrc
index 8c7b1ad..8cc03cd 100644
--- a/.trunk/configs/.shellcheckrc
+++ b/.trunk/configs/.shellcheckrc
@@ -1,6 +1,5 @@
 enable=all
 source-path=SCRIPTDIR
-disable=SC2154
 
 # If you're having issues with shellcheck following source, disable the errors via:
 # disable=SC1090
diff --git a/scripts/validate-derived-repo.sh b/scripts/validate-derived-repo.sh
index d6cf5fb..fd969cd 100755
--- a/scripts/validate-derived-repo.sh
+++ b/scripts/validate-derived-repo.sh
@@ -9,7 +9,7 @@ if [[ ${strict_placeholders} == "true" ]]; then
 	args+=(--strict-placeholders)
 fi
 
-if python3 -c "import aio_fleet" >/dev/null 2>&1; then
+if python3 -c "import aio_fleet.cli" >/dev/null 2>&1; then
 	exec python3 -m aio_fleet.cli "${args[@]}"
 fi
 
@@ -27,7 +27,11 @@ candidate_roots+=(
 
 for candidate in "${candidate_roots[@]}"; do
 	if [[ -d ${candidate}/src/aio_fleet ]]; then
-		PYTHONPATH="${candidate}/src${PYTHONPATH:+:${PYTHONPATH}}" exec python3 -m aio_fleet.cli "${args[@]}"
+		python_bin="python3"
+		if [[ -x ${candidate}/.venv/bin/python ]]; then
+			python_bin="${candidate}/.venv/bin/python"
+		fi
+		PYTHONPATH="${candidate}/src${PYTHONPATH:+:${PYTHONPATH}}" exec "${python_bin}" -m aio_fleet.cli "${args[@]}"
 	fi
 done