diff --git a/.github/actions/run-make/action.yml b/.github/actions/run-make/action.yml
index 22ee4006617..b7e798d7dd9 100644
--- a/.github/actions/run-make/action.yml
+++ b/.github/actions/run-make/action.yml
@@ -52,6 +52,6 @@ runs:
     - name: Clean
       run: |
         make clean
-        docker system prune -f -a
-        rm -rf ~/.linuxkit
+        #docker system prune -f -a
+        #rm -rf ~/.linuxkit
       shell: bash
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f40ffd7a795..04a1349d445 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -48,8 +48,8 @@ jobs:
       - name: Clear repository
         run: |
           sudo rm -fr "$GITHUB_WORKSPACE" && mkdir "$GITHUB_WORKSPACE"
-          rm -fr ~/.linuxkit
-          docker system prune --all --force --volumes
+          # rm -fr ~/.linuxkit
+          # docker system prune --all --force --volumes
       - uses: actions/checkout@v4
         with:
           repository: ${{ github.event.pull_request.head.repo.full_name }}
@@ -221,5 +221,5 @@ jobs:
         if: ${{ always() }}
         run: |
           make clean
-          docker system prune -f -a --volumes
-          rm -rf ~/.linuxkit
+          # docker system prune -f -a --volumes
+          # rm -rf ~/.linuxkit
diff --git a/.github/workflows/buildondemand.yml b/.github/workflows/buildondemand.yml
index f657b42ade9..dc5415109a1 100644
--- a/.github/workflows/buildondemand.yml
+++ b/.github/workflows/buildondemand.yml
@@ -45,7 +45,7 @@ jobs:
         run: |
           sudo rm -fr "$GITHUB_WORKSPACE" && mkdir "$GITHUB_WORKSPACE"
           rm -fr ~/.linuxkit
-          docker system prune --all --force --volumes
+          #docker system prune --all --force --volumes
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 4956026f8d5..3953898fde9 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -16,7 +16,7 @@ on:  # yamllint disable-line rule:truthy
 
 jobs:
   packages:
-    if: github.event.repository.full_name == 'lf-edge/eve'
+    if: github.event.repository.full_name == 'rene/eve'
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -70,7 +70,7 @@ jobs:
           echo "TAG=$(echo "$REF" | sed -e 's#^.*/##' -e 's#master#snapshot#' -e 's#main#snapshot#')" >> "$GITHUB_ENV"
 
       - name: Login to Docker Hub
-        if: ${{ github.event.repository.full_name }}== 'lf-edge/eve'
+        if: ${{ github.event.repository.full_name }}== 'rene/eve'
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.RELEASE_DOCKERHUB_ACCOUNT }}
@@ -82,7 +82,7 @@ jobs:
           # sadly, our build sometimes times out on network access
           # and running out of disk space: re-trying for 3 times
           for i in 1 2 3; do
-             if make -e V=1 PLATFORM=${{ matrix.platform }} LINUXKIT_PKG_TARGET=push PRUNE=1 pkgs; then
+             if make -e V=1 REGISTRY=localhost:5001 PLATFORM=${{ matrix.platform }} LINUXKIT_PKG_TARGET=push PRUNE=1 pkgs; then
                 SUCCESS=true
                 break
              else
@@ -90,8 +90,9 @@ jobs:
                 # the docker cache produced by the build exhausting
                 # disk space. So the following can't hurt before we
                 # retry:
-                docker rmi -f `docker image ls -q` || :
-                docker system prune -f || :
+                #docker rmi -f `docker image ls -q` || :
+                #docker system prune -f || :
+                echo "NOT cleaning up"
              fi
           done
           if [ -z "$SUCCESS" ]; then echo "::error::failed to build and push packages" && exit 1; fi
@@ -106,13 +107,13 @@ jobs:
       - name: Clean
         run: |
           make clean
-          docker system prune -f -a
-          rm -rf ~/.linuxkit
+          #docker system prune -f -a
+          #rm -rf ~/.linuxkit
 
   # eve composition can run as a separate job, even on a separate runner, because the packages job
   # published everything. Which means all images are already on the OCI registry.
   eve:
-    if: github.event.repository.full_name == 'lf-edge/eve'
+    if: github.event.repository.full_name == 'rene/eve'
     needs: packages
     runs-on: ubuntu-latest
     strategy:
@@ -137,18 +138,18 @@ jobs:
           fetch-depth: 0
       - uses: ./.github/actions/run-make
         with:
-          command: "V=1 HV=${{ matrix.hv }} ZARCH=${{ matrix.arch }} PLATFORM=${{ matrix.platform }} LINUXKIT_PKG_TARGET=push eve"
+          command: "V=1 HV=${{ matrix.hv }} ZARCH=${{ matrix.arch }} REGISTRY=localhost:5001 PLATFORM=${{ matrix.platform }} LINUXKIT_PKG_TARGET=push eve"
           dockerhub-token: ${{ secrets.RELEASE_DOCKERHUB_TOKEN }}
           dockerhub-account: ${{ secrets.RELEASE_DOCKERHUB_ACCOUNT }}
       - uses: ./.github/actions/run-make
         if: matrix.arch != 'riscv64'
         with:
-          command: "V=1 HV=${{ matrix.hv }} ZARCH=${{ matrix.arch }} LINUXKIT_PKG_TARGET=push sbom collected_sources compare_sbom_collected_sources publish_sources"
+          command: "V=1 HV=${{ matrix.hv }} ZARCH=${{ matrix.arch }} REGISTRY=localhost:5001 LINUXKIT_PKG_TARGET=push sbom collected_sources compare_sbom_collected_sources publish_sources"
           dockerhub-token: ${{ secrets.RELEASE_DOCKERHUB_TOKEN }}
           dockerhub-account: ${{ secrets.RELEASE_DOCKERHUB_ACCOUNT }}
 
   manifest:
-    if: github.event.repository.full_name == 'lf-edge/eve'
+    if: github.event.repository.full_name == 'rene/eve'
     runs-on: ubuntu-latest
     needs: packages
     steps:
@@ -157,13 +158,13 @@ jobs:
           fetch-depth: 0
       - uses: ./.github/actions/run-make
         with:
-          command: "V=1 LINUXKIT_PKG_TARGET=manifest pkgs"
+          command: "V=1 REGISTRY=localhost:5001 LINUXKIT_PKG_TARGET=manifest pkgs"
           dockerhub-token: ${{ secrets.RELEASE_DOCKERHUB_TOKEN }}
           dockerhub-account: ${{ secrets.RELEASE_DOCKERHUB_ACCOUNT }}
 
   trigger_assets:
-    if: ${{ (startsWith(github.ref, 'refs/tags/')) && (github.event.repository.full_name == 'lf-edge/eve') }}
+    if: ${{ (startsWith(github.ref, 'refs/tags/')) && (github.event.repository.full_name == 'rene/eve') }}
     needs: [manifest, eve]
-    uses: lf-edge/eve/.github/workflows/assets.yml@master
+    uses: rene/eve/.github/workflows/assets.yml@master
     with:
       tag_ref: ${{ github.ref_name }}
diff --git a/.github/workflows/yetus.yml b/.github/workflows/yetus.yml
index e6d89d65adb..a3492c9ef39 100644
--- a/.github/workflows/yetus.yml
+++ b/.github/workflows/yetus.yml
@@ -24,6 +24,11 @@ jobs:
           path: src
           fetch-depth: 0
 
+      - name: Setup dependencies
+        run: |
+          sudo apt -y update
+          sudo apt -y install libzfs4linux libzfslinux-dev
+
       - name: Yetus
         uses: apache/yetus-test-patch-action@0.15.1
         with:
diff --git a/.yetus/excludes.txt b/.yetus/excludes.txt
index 54cdd96b6bb..2f470989ad2 100644
--- a/.yetus/excludes.txt
+++ b/.yetus/excludes.txt
@@ -2,6 +2,7 @@
 ^pkg/mkimage-raw-efi/initramfs-init
 ^pkg/mkimage-raw-efi/nlplug-findfs.c
 ^pkg/pillar/rootfs/fscrypt.conf
+^pkg/pillar/vendor/github.com/andrewd-zededa/go-libzfs
 ^pkg/fw/
 ^pkg/debug/abuild/
 ^pkg/pillar/zedpac/
diff --git a/pkg/nvidia/Dockerfile b/pkg/nvidia/Dockerfile
index eb8cb6d7a02..2dfabe17b61 100644
--- a/pkg/nvidia/Dockerfile
+++ b/pkg/nvidia/Dockerfile
@@ -19,8 +19,8 @@ RUN git config --global user.email 'builder@projecteve.dev' && \
     git config --global user.name 'Project EVE'
 
 # Jetpack tarballs
-ENV JETSON_JP5=https://developer.nvidia.com/downloads/embedded/l4t/r35_release_v5.0/release/jetson_linux_r35.5.0_aarch64.tbz2
-ENV JETSON_JP6=https://developer.nvidia.com/downloads/embedded/l4t/r36_release_v3.0/release/jetson_linux_r36.3.0_aarch64.tbz2
+ENV JETSON_JP5=http://10.208.13.10/jetson_linux_r35.5.0_aarch64.tbz2
+ENV JETSON_JP6=http://10.208.13.10/jetson_linux_r36.3.0_aarch64.tbz2
 
 # Default Jetpack version
 ENV JETSON_LINUX=${JETSON_JP5}
diff --git a/pkg/pillar/netdump/netdump.go b/pkg/pillar/netdump/netdump.go
index 1a876625090..4acf222418b 100644
--- a/pkg/pillar/netdump/netdump.go
+++ b/pkg/pillar/netdump/netdump.go
@@ -1,5 +1,7 @@
 package netdump
 
+// CHANGE
+
 import (
 	"encoding/json"
 	"fmt"