diff --git a/.github/actions/setup/action.yaml b/.github/actions/setup/action.yaml
index 00828ccbe..0c17d0909 100644
--- a/.github/actions/setup/action.yaml
+++ b/.github/actions/setup/action.yaml
@@ -30,7 +30,7 @@ runs:
     - name: Install UDS CLI
       shell: bash
       # renovate: datasource=github-tags depName=defenseunicorns/uds-cli versioning=semver
-      run: brew install defenseunicorns/tap/uds@0.6.2
+      run: brew install defenseunicorns/tap/uds@0.8.1
 
     - name: Login to GHCR
       uses: docker/login-action@v3
diff --git a/.github/workflows/pull-request-conditionals.yaml b/.github/workflows/pull-request-conditionals.yaml
index d7be43024..ade17b107 100644
--- a/.github/workflows/pull-request-conditionals.yaml
+++ b/.github/workflows/pull-request-conditionals.yaml
@@ -34,7 +34,7 @@ jobs:
       - name: Install UDS CLI
         shell: bash
         # renovate: datasource=github-tags depName=defenseunicorns/uds-cli versioning=semver
-        run: brew install defenseunicorns/tap/uds@0.6.2
+        run: brew install defenseunicorns/tap/uds@0.8.1
       - name: Run Formatting Checks
         run: uds run lint-check
 
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 1544fcee3..24f5e5be9 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -9,12 +9,12 @@
   },
   "yaml.schemas": {
     // renovate: datasource=github-tags depName=defenseunicorns/uds-cli versioning=semver
-    "https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.6.2/uds.schema.json": [
+    "https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.8.1/uds.schema.json": [
       "uds-bundle.yaml"
     ],
 
     // renovate: datasource=github-tags depName=defenseunicorns/uds-cli versioning=semver
-    "https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.6.2/tasks.schema.json": [
+    "https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.8.1/tasks.schema.json": [
       "tasks.yaml",
       "tasks/**/*.yaml",
       "src/**/validate.yaml"
diff --git a/README.md b/README.md
index 62bcccf80..b818a347f 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ UDS Core establishes a secure baseline for cloud-native systems and ships with c
 
 - [K3D](https://k3d.io/) for dev & test environments or any [CNCF Certified Kubernetes Cluster](https://www.cncf.io/training/certification/software-conformance/#logos) for production environments.
 <!-- renovate: datasource=github-tags depName=defenseunicorns/uds-cli versioning=semver -->
-- [UDS CLI](https://github.com/defenseunicorns/uds-cli?tab=readme-ov-file#install) v0.6.2 or later
+- [UDS CLI](https://github.com/defenseunicorns/uds-cli?tab=readme-ov-file#install) v0.8.1 or later
 
 ---
 
@@ -50,7 +50,7 @@ UDS Core publishes bundles you can use for trying out UDS Core or for UDS Packag
 
 If you want to try out UDS Core, you can use the [k3d-core-demo bundle](./bundles/k3d-standard/README.md) to create a local k3d cluster with UDS Core installed by running the following command:
 
-<!-- x-release-please-start -->
+<!-- x-release-please-start-version -->
 
 ```bash
 uds deploy k3d-core-demo:0.10.0
@@ -62,7 +62,7 @@ uds deploy k3d-core-demo:0.10.0
 
 In addition to the demo bundle, a [k3d-core-istio-dev bundle](./bundles/k3d-istio/README.md) also exists to work with UDS Core with only Istio & Pepr installed. Run the command below to use it:
 
-<!-- x-release-please-start -->
+<!-- x-release-please-start-version -->
 
 ```bash
 uds deploy k3d-core-istio-dev:0.10.0
@@ -99,7 +99,7 @@ uds run test-uds-core
 This will create a local k3d cluster, install UDS Core, and run a series of tests against it, the same tests that are run in CI. If you want to run the tests against a specific package, you can use the `PKG` env variable. The following example runs the tests against the metrics-server package:
 
 ```bash
-PKG=metrics-server uds run test-single-package
+UDS_PKG=metrics-server uds run test-single-package
 ```
 
 Note you can specify the `--set FLAVOR=registry1` flag to test using Iron Bank images instead of the upstream images.
diff --git a/tasks/publish.yaml b/tasks/publish.yaml
index 70f402f12..aa59698c6 100644
--- a/tasks/publish.yaml
+++ b/tasks/publish.yaml
@@ -64,5 +64,4 @@ tasks:
         cmd: |
           set -e
           pkgPath="ghcr.io/defenseunicorns/packages/uds/bundles/k3d-core-demo"
-          zarf tools registry copy ${pkgPath}:${VERSION}-arm64 ${pkgPath}:arm64
-          zarf tools registry copy ${pkgPath}:${VERSION}-amd64 ${pkgPath}:amd64
+          zarf tools registry copy ${pkgPath}:${VERSION} ${pkgPath}:latest
diff --git a/tasks/test.yaml b/tasks/test.yaml
index c16a7e472..ed522b396 100644
--- a/tasks/test.yaml
+++ b/tasks/test.yaml
@@ -1,7 +1,7 @@
 includes:
-  - create: ./tasks/create.yaml
-  - setup: ./tasks/setup.yaml
-  - deploy: ./tasks/deploy.yaml
+  - create: ./create.yaml
+  - setup: ./setup.yaml
+  - deploy: ./deploy.yaml
 
 tasks:
   - name: single-package