diff --git a/.github/workflows/image-master-arm.yaml b/.github/workflows/image-master-arm.yaml
index 7cc9bc10f..fdf42b8f8 100644
--- a/.github/workflows/image-master-arm.yaml
+++ b/.github/workflows/image-master-arm.yaml
@@ -22,6 +22,7 @@ jobs:
       registry_username: ${{ secrets.QUAY_USERNAME }}
       registry_password: ${{ secrets.QUAY_PASSWORD }}
     with:
+      auroraboot_version: "v0.16.1"
       dockerfile_path: "images/Dockerfile"
       base_image: ${{ matrix.base_image }}
       model: ${{ matrix.model }}
@@ -143,6 +144,7 @@ jobs:
       registry_username: ${{ secrets.QUAY_USERNAME }}
       registry_password: ${{ secrets.QUAY_PASSWORD }}
     with:
+      auroraboot_version: "v0.16.1"
       dockerfile_path: "images/Dockerfile"
       base_image: ${{ matrix.base_image }}
       model: ${{ matrix.model }}
diff --git a/.github/workflows/image-master.yaml b/.github/workflows/image-master.yaml
index 877088aad..f0ffb57e8 100644
--- a/.github/workflows/image-master.yaml
+++ b/.github/workflows/image-master.yaml
@@ -21,7 +21,7 @@ jobs:
       registry_username: ${{ secrets.QUAY_USERNAME }}
       registry_password: ${{ secrets.QUAY_PASSWORD }}
     with:
-      auroraboot_version: "v0.15.0"
+      auroraboot_version: "v0.16.1"
       dockerfile_path: "images/Dockerfile"
       base_image: ${{ matrix.base_image }}
       model: "generic"
@@ -47,7 +47,7 @@ jobs:
           - "alpine:3.21"
           - "opensuse/leap:15.6"
           - "debian:12"
-          - "ghcr.io/kairos-io/hadron:v0.0.1-beta1"
+          - "ghcr.io/kairos-io/hadron:v0.0.1-beta2"
   standard:
     name: ${{ matrix.base_image }}
     uses: kairos-io/kairos-factory-action/.github/workflows/reusable-factory.yaml@v0.0.12
@@ -55,7 +55,7 @@ jobs:
       registry_username: ${{ secrets.QUAY_USERNAME }}
       registry_password: ${{ secrets.QUAY_PASSWORD }}
     with:
-      auroraboot_version: "v0.15.0"
+      auroraboot_version: "v0.16.1"
       dockerfile_path: "images/Dockerfile"
       base_image: ${{ matrix.base_image }}
       model: "generic"
@@ -82,7 +82,7 @@ jobs:
           - "alpine:3.21"
           - "opensuse/leap:15.6"
           - "debian:12"
-          - "ghcr.io/kairos-io/hadron:v0.0.1-beta1"
+          - "ghcr.io/kairos-io/hadron:v0.0.1-beta2"
         include:
           - base_image: "ubuntu:24.04"
             kubernetes_distro: "k0s"
@@ -111,7 +111,6 @@ jobs:
         base_image:
           - "ubuntu:24.04"
           - "alpine:3.21"
-          - "ghcr.io/kairos-io/hadron:v0.0.1-beta1"
         test:
           - "custom-partitioning"
           - "acceptance"
@@ -145,23 +144,16 @@ jobs:
             base_image: "opensuse/leap:15.6"
           - test: "acceptance"
             base_image: "debian:12"
-  netboot-tests:
-    name: ${{ matrix.base_image }}
-    uses: ./.github/workflows/reusable-qemu-netboot-test.yaml
-    secrets: inherit
-    with:
-      base_image: ${{ matrix.base_image }}
-      variant: "core"
-      model: "generic"
-      arch: "amd64"
-    needs:
-      - core
-    strategy:
-      matrix:
-        base_image:
-          - "ubuntu:24.04"
-          - "alpine:3.21"
-          - "ghcr.io/kairos-io/hadron:v0.0.1-beta1"
+          - test: "install"
+            base_image: "ghcr.io/kairos-io/hadron:v0.0.1-beta2"
+          - test: "custom-partitioning"
+            base_image: "ghcr.io/kairos-io/hadron:v0.0.1-beta2"
+          - test: "acceptance"
+            base_image: "ghcr.io/kairos-io/hadron:v0.0.1-beta2"
+          - test: "install-target"
+            base_image: "ghcr.io/kairos-io/hadron:v0.0.1-beta2"
+          - test: "reset"
+            base_image: "ghcr.io/kairos-io/hadron:v0.0.1-beta2"
   encryption-tests:
     name: ${{ matrix.base_image }}
     uses: ./.github/workflows/reusable-encryption-test.yaml
@@ -179,7 +171,7 @@ jobs:
       matrix:
         base_image:
           - "ubuntu:24.04"
-          - "ghcr.io/kairos-io/hadron:v0.0.1-beta1"
+          - "ghcr.io/kairos-io/hadron:v0.0.1-beta2"
         label:
           - "encryption-local"
           - "encryption-remote-auto"
@@ -220,7 +212,6 @@ jobs:
       matrix:
         base_image:
           - "ubuntu:24.04"
-          - "ghcr.io/kairos-io/hadron:v0.0.1-beta1"
         test:
           - "provider-qrcode-install"
           - "provider-upgrade"
@@ -228,3 +219,10 @@ jobs:
           - "provider-upgrade-latest-k8s-with-kubernetes"
           - "provider-decentralized-k8s"
           - "provider-k3s-disabled"
+        include:
+          - base_image: "ghcr.io/kairos-io/hadron:v0.0.1-beta2"
+            test: "provider-qrcode-install"
+          - base_image: "ghcr.io/kairos-io/hadron:v0.0.1-beta2"
+            test: "provider-decentralized-k8s"
+          - base_image: "ghcr.io/kairos-io/hadron:v0.0.1-beta2"
+            test: "provider-k3s-disabled"
diff --git a/.github/workflows/image-pr-arm.yaml b/.github/workflows/image-pr-arm.yaml
index ae0ef2652..99bb609d7 100644
--- a/.github/workflows/image-pr-arm.yaml
+++ b/.github/workflows/image-pr-arm.yaml
@@ -19,6 +19,7 @@ jobs:
       registry_username: ${{ secrets.QUAY_USERNAME }}
       registry_password: ${{ secrets.QUAY_PASSWORD }}
     with:
+      auroraboot_version: "v0.16.2"
       dockerfile_path: "images/Dockerfile"
       base_image: ${{ matrix.base_image }}
       model: ${{ matrix.model }}
@@ -48,6 +49,7 @@ jobs:
       registry_username: ${{ secrets.QUAY_USERNAME }}
       registry_password: ${{ secrets.QUAY_PASSWORD }}
     with:
+      auroraboot_version: "v0.16.2"
       dockerfile_path: "images/Dockerfile"
       base_image: ${{ matrix.base_image }}
       model: "generic"
diff --git a/.github/workflows/image-pr.yaml b/.github/workflows/image-pr.yaml
index fcfc7a5e9..d2dccb3de 100644
--- a/.github/workflows/image-pr.yaml
+++ b/.github/workflows/image-pr.yaml
@@ -19,7 +19,7 @@ jobs:
       registry_username: ${{ secrets.QUAY_USERNAME }}
       registry_password: ${{ secrets.QUAY_PASSWORD }}
     with:
-      auroraboot_version: "v0.15.0"
+      auroraboot_version: "v0.16.2"
       dockerfile_path: "images/Dockerfile"
       base_image: ${{ matrix.base_image }}
       model: "generic"
@@ -38,7 +38,7 @@ jobs:
       fail-fast: false
       matrix:
         base_image:
-          - "ghcr.io/kairos-io/hadron:v0.0.1-beta1"
+          - "ghcr.io/kairos-io/hadron:v0.0.1-beta2"
           - "ubuntu:25.10"
           - "ubuntu:24.04"
           - "alpine:3.21"
@@ -61,7 +61,6 @@ jobs:
       matrix:
         secureboot: [false]
         base_image:
-          - "ghcr.io/kairos-io/hadron:v0.0.1-beta1"
           - "ubuntu:25.10"
           - "ubuntu:24.04"
           - "alpine:3.21"
@@ -90,26 +89,18 @@ jobs:
             base_image: "ubuntu:24.04"
           - test: "upgrade-latest-with-cli"
             base_image: "ubuntu:25.10"
+          - test: "install"
+            base_image: "ghcr.io/kairos-io/hadron:v0.0.1-beta2"
+          - test: "custom-partitioning"
+            base_image: "ghcr.io/kairos-io/hadron:v0.0.1-beta2"
+          - test: "acceptance"
+            base_image: "ghcr.io/kairos-io/hadron:v0.0.1-beta2"
+          - test: "install-target"
+            base_image: "ghcr.io/kairos-io/hadron:v0.0.1-beta2"
+          - test: "reset"
+            base_image: "ghcr.io/kairos-io/hadron:v0.0.1-beta2"
             # Whenever there's a new flavor e.g. ubuntu-25.10 but we haven't released a kairos version with it, you can use the release matcher to match to a previous version, e.g. ubuntu-24.04
             # release-matcher: "kairos-ubuntu-24.04-core-amd64-generic-v3.6.0.iso"
-  netboot-tests:
-    name: ${{ matrix.base_image }}
-    uses: ./.github/workflows/reusable-qemu-netboot-test.yaml
-    secrets: inherit
-    with:
-      base_image: ${{ matrix.base_image }}
-      variant: "core"
-      arch: "amd64"
-      model: "generic"
-    needs:
-      - build
-    strategy:
-      matrix:
-        base_image:
-          - "ghcr.io/kairos-io/hadron:v0.0.1-beta1"
-          - "ubuntu:25.10"
-          - "ubuntu:24.04"
-          - "alpine:3.21"
   encryption-tests:
     name: ${{ matrix.base_image }}
     secrets: inherit
@@ -123,10 +114,10 @@ jobs:
     needs:
       - build
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
         base_image:
-          - "ghcr.io/kairos-io/hadron:v0.0.1-beta1"
+          - "ghcr.io/kairos-io/hadron:v0.0.1-beta2"
           - "ubuntu:25.10"
           - "ubuntu:24.04"
           - "alpine:3.21"
diff --git a/.github/workflows/release-arm.yaml b/.github/workflows/release-arm.yaml
index 477a06260..4376baf02 100644
--- a/.github/workflows/release-arm.yaml
+++ b/.github/workflows/release-arm.yaml
@@ -30,6 +30,7 @@ jobs:
           - "debian:12"
           - "rockylinux:9"
     with:
+      auroraboot_version: "v0.16.2"
       dockerfile_path: "images/Dockerfile"
       base_image: ${{ matrix.base_image }}
       arch: "arm64"
@@ -65,6 +66,7 @@ jobs:
           - "ubuntu:22.04"
           - "alpine:3.21"
     with:
+      auroraboot_version: "v0.16.2"
       dockerfile_path: "images/Dockerfile"
       base_image: ${{ matrix.base_image }}
       arch: "arm64"
@@ -132,6 +134,7 @@ jobs:
           - "debian:12"
           - "rockylinux:9"
     with:
+      auroraboot_version: "v0.16.2"
       dockerfile_path: "images/Dockerfile"
       base_image: ${{ matrix.base_image }}
       arch: "arm64"
@@ -172,6 +175,7 @@ jobs:
           - "ubuntu:22.04"
           - "alpine:3.21"
     with:
+      auroraboot_version: "v0.16.2"
       dockerfile_path: "images/Dockerfile"
       base_image: ${{ matrix.base_image }}
       arch: "arm64"
@@ -238,6 +242,7 @@ jobs:
       actions: read
     needs: build-nvidia-base
     with:
+      auroraboot_version: "v0.16.2"
       dockerfile_path: "images/Dockerfile"
       base_image: "quay.io/kairos/cache:nvidia-base"
       arch: "arm64"
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index c73518fef..8d4909cb4 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -26,12 +26,12 @@ jobs:
           - "fedora:40"
           - "debian:12"
           - "rockylinux:9"
-          - "ghcr.io/kairos-io/hadron:v0.0.1-beta1"
+          - "ghcr.io/kairos-io/hadron:v0.0.1-beta2"
     secrets:
       registry_username: ${{ secrets.QUAY_USERNAME }}
       registry_password: ${{ secrets.QUAY_PASSWORD }}
     with:
-      auroraboot_version: "v0.15.0"
+      auroraboot_version: "v0.16.2"
       dockerfile_path: "images/Dockerfile"
       base_image: ${{ matrix.base_image }}
       arch: "amd64"
@@ -60,7 +60,7 @@ jobs:
         base_image:
           - "ubuntu:24.04"
           - "fedora:40"
-          - "ghcr.io/kairos-io/hadron:v0.0.1-beta1"
+          - "ghcr.io/kairos-io/hadron:v0.0.1-beta2"
         include:
           - base_image: "ubuntu:24.04"
             variant: "standard"  # let it use the latest k3s version released for now
@@ -70,7 +70,7 @@ jobs:
       registry_username: ${{ secrets.QUAY_USERNAME }}
       registry_password: ${{ secrets.QUAY_PASSWORD }}
     with:
-      auroraboot_version: "v0.15.0"
+      auroraboot_version: "v0.16.2"
       dockerfile_path: "images/Dockerfile"
       base_image: ${{ matrix.base_image }}
       arch: "amd64"
@@ -164,12 +164,12 @@ jobs:
           - "fedora:40"
           - "debian:12"
           - "rockylinux:9"
-          - "ghcr.io/kairos-io/hadron:v0.0.1-beta1"
+          - "ghcr.io/kairos-io/hadron:v0.0.1-beta2"
     secrets:
       registry_username: ${{ secrets.QUAY_USERNAME }}
       registry_password: ${{ secrets.QUAY_PASSWORD }}
     with:
-      auroraboot_version: "v0.15.0"
+      auroraboot_version: "v0.16.2"
       dockerfile_path: "images/Dockerfile"
       base_image: ${{ matrix.base_image }}
       arch: "amd64"
@@ -206,12 +206,12 @@ jobs:
           - "ubuntu:24.04"
           - "ubuntu:25.10"
           - "rockylinux:9"
-          - "ghcr.io/kairos-io/hadron:v0.0.1-beta1"
+          - "ghcr.io/kairos-io/hadron:v0.0.1-beta2"
     secrets:
       registry_username: ${{ secrets.QUAY_USERNAME }}
       registry_password: ${{ secrets.QUAY_PASSWORD }}
     with:
-      auroraboot_version: "v0.15.0"
+      auroraboot_version: "v0.16.2"
       dockerfile_path: "images/Dockerfile"
       base_image: ${{ matrix.base_image }}
       arch: "amd64"
diff --git a/.github/workflows/reusable-qemu-netboot-test.yaml b/.github/workflows/reusable-qemu-netboot-test.yaml
deleted file mode 100644
index 6a19546bb..000000000
--- a/.github/workflows/reusable-qemu-netboot-test.yaml
+++ /dev/null
@@ -1,121 +0,0 @@
-name: Reusable workflow - qemu netboot test
-
-on:
-  workflow_call:
-    inputs:
-      base_image:
-        required: true
-        type: string
-      variant:
-        required: true
-        type: string
-      arch:
-        required: true
-        type: string
-      model:
-        required: true
-        type: string
-
-jobs:
-  netboot:
-    runs-on: kvm
-    steps:
-      - name: Split base image
-        id: split
-        run: |
-          # Split base image for tag generation
-          BASE_IMAGE=$(echo "${{ inputs.base_image }}" | cut -d ':' -f 1)
-          BASE_TAG=$(echo "${{ inputs.base_image }}" | cut -d ':' -f 2 || echo 'latest')
-          # Handle special cases for base images with slashes
-          # Handle base images with slashes (registry paths)
-          # Examples:
-          # - ubuntu:24.04 -> FLAVOR=ubuntu, FLAVOR_RELEASE=24.04
-          # - opensuse/leap:15.6 -> FLAVOR=opensuse, FLAVOR_RELEASE=leap-15.6
-          # - ghcr.io/kairos-io/hadron:main -> FLAVOR=hadron, FLAVOR_RELEASE=main
-          if [[ "$BASE_IMAGE" == *"/"* ]]; then
-            DISTRO=$(echo "$BASE_IMAGE" | cut -d '/' -f 1)
-            SUB_DISTRO=$(echo "$BASE_IMAGE" | cut -d '/' -f 2)
-            FLAVOR="$DISTRO"
-            FLAVOR_RELEASE="$SUB_DISTRO-$BASE_TAG"
-            # Count number of slashes to determine if it's a registry path
-            SLASH_COUNT=$(echo "$BASE_IMAGE" | tr -cd '/' | wc -c)
-            if [[ $SLASH_COUNT -eq 1 ]]; then
-              # Simple case: distro/subdistro (preserve existing behavior)
-              DISTRO=$(echo "$BASE_IMAGE" | cut -d '/' -f 1)
-              SUB_DISTRO=$(echo "$BASE_IMAGE" | cut -d '/' -f 2)
-              FLAVOR="$DISTRO"
-              FLAVOR_RELEASE="$SUB_DISTRO-$BASE_TAG"
-            else
-              # Registry path with multiple slashes: extract last component as FLAVOR
-              # e.g., ghcr.io/kairos-io/hadron -> FLAVOR=hadron
-              FLAVOR=$(echo "$BASE_IMAGE" | awk -F'/' '{print $NF}')
-              FLAVOR_RELEASE="$BASE_TAG"
-            fi
-          else
-            # No slashes: simple image name
-            FLAVOR="$BASE_IMAGE"
-            FLAVOR_RELEASE="$BASE_TAG"
-          fi
-
-          echo "Base Image: $BASE_IMAGE"
-          echo "Determined Flavor: $FLAVOR"
-          echo "Determined Flavor Release: $FLAVOR_RELEASE"
-
-          echo "flavor=$FLAVOR" >> $GITHUB_OUTPUT
-          echo "flavor_release=$FLAVOR_RELEASE" >> $GITHUB_OUTPUT
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
-      - name: Block all traffic to metadata ip  # For cloud runners, the metadata ip can interact with our test machines
-        if: runner.environment == 'self-hosted'
-        run: |
-          sudo iptables -I INPUT -s 169.254.169.254 -j DROP
-          sudo iptables -I OUTPUT -d 169.254.169.254 -j DROP
-      - name: Install Go
-        uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6
-        timeout-minutes: 5
-        with:
-          go-version-file: tests/go.mod
-          cache-dependency-path: tests/go.sum
-          cache: ${{ runner.environment == 'self-hosted' && 'false' || 'true' }}
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
-        with:
-          repository: "ipxe/ipxe"
-          path: "ipxe"
-          fetch-depth: '0'
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@master
-        with:
-          platforms: all
-      - name: Install deps
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y mtools syslinux isolinux git make gcc liblzma-dev mkisofs xorriso build-essential qemu-utils qemu-system-x86 swtpm
-      - name: Build iPXE iso with our script on it
-        run: |
-          cp tests/assets/kairos.ipxe ipxe/src/kairos.ipxe
-          pushd ipxe/src && make bin/ipxe.iso EMBED=kairos.ipxe && popd
-          cp ipxe/src/bin/ipxe.iso ipxe.iso
-      - name: Download ISO
-        id: iso
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
-        with:
-          name: kairos-${{ steps.split.outputs.flavor }}-${{ steps.split.outputs.flavor_release }}-${{ inputs.variant }}-${{ inputs.arch }}-${{ inputs.model }}.iso.zip
-      - name: Extract ipxe artifacts for the ipxe server
-        run: |
-          mkdir -p build
-          export ISO=$(ls $PWD/*.iso| head -1)
-          isoinfo -x /rootfs.squashfs -R -i ${ISO} > build/kairos-squashfs
-          isoinfo -x /boot/kernel -R -i ${ISO} > build/kairos-kernel
-          isoinfo -x /boot/initrd -R -i ${ISO} > build/kairos-initrd
-      - name: Run tests
-        env:
-          USE_QEMU: true
-          KVM: true
-          MEMORY: 4000
-          CPUS: 2
-        run: |
-          # Run the http server in the background
-          docker run -d -v $PWD/build/:/build --workdir=/build --net=host python:3.11.0-alpine python3 -m http.server 80
-          export ISO=$PWD/ipxe.iso
-          cp tests/go.* .
-          go mod download
-          go run github.com/onsi/ginkgo/v2/ginkgo -v --label-filter "netboot-test" --fail-fast -r ./tests/
diff --git a/.github/workflows/uki.yaml b/.github/workflows/uki.yaml
index 1e3722d45..4b00bed69 100644
--- a/.github/workflows/uki.yaml
+++ b/.github/workflows/uki.yaml
@@ -20,7 +20,7 @@ jobs:
       registry_username: ${{ secrets.QUAY_USERNAME }}
       registry_password: ${{ secrets.QUAY_PASSWORD }}
     with:
-      auroraboot_version: "v0.15.0"
+      auroraboot_version: "v0.16.2"
       dockerfile_path: "images/Dockerfile"
       base_image: ${{ matrix.base_image }}
       kubernetes_distro: ${{ matrix.kubernetes_distro }}
@@ -42,14 +42,15 @@ jobs:
       summary_artifacts: true
     strategy:
       matrix:
-        base_image: ["ghcr.io/kairos-io/hadron-trusted:v0.0.1-beta1", "ubuntu:25.10", "ubuntu:24.04", "fedora:40"]
+        base_image: ["ghcr.io/kairos-io/hadron-trusted:v0.0.1-beta2", "ubuntu:25.10", "ubuntu:24.04", "fedora:40"]
         kubernetes_distro: ["", "k3s"]
   test_generic:
     needs: factory
     runs-on: kvm
     strategy:
+      fail-fast: false
       matrix:
-        base_image: ["ghcr.io/kairos-io/hadron-trusted:v0.0.1-beta1", "ubuntu:25.10", "ubuntu:24.04", "fedora:40"]
+        base_image: ["ghcr.io/kairos-io/hadron-trusted:v0.0.1-beta2", "ubuntu:25.10", "ubuntu:24.04", "fedora:40"]
         arch: ["amd64"]
         model: ["generic"]
         variant: ["core", "standard"]
@@ -146,7 +147,7 @@ jobs:
           docker run --rm -v /var/run/docker.sock:/var/run/docker.sock \
             -v $PWD/build:/result \
             -v $PWD/tests/assets/keys:/keys \
-            quay.io/kairos/auroraboot:v0.15.0 --debug build-uki \
+            quay.io/kairos/auroraboot:v0.16.2 --debug build-uki \
             --output-dir /result --output-type container \
             --public-keys /keys \
             --tpm-pcr-private-key /keys/tpm2-pcr-private.pem \
@@ -189,8 +190,9 @@ jobs:
     needs: factory
     runs-on: kvm
     strategy:
+      fail-fast: false
       matrix:
-        base_image: ["ghcr.io/kairos-io/hadron-trusted:v0.0.1-beta1", "ubuntu:24.04"]
+        base_image: ["ghcr.io/kairos-io/hadron-trusted:v0.0.1-beta2", "ubuntu:24.04"]
         arch: ["amd64"]
         model: ["generic"]
         variant: ["core"]
diff --git a/images/Dockerfile b/images/Dockerfile
index 598e65d12..02598a10c 100644
--- a/images/Dockerfile
+++ b/images/Dockerfile
@@ -1,5 +1,5 @@
 ARG BASE_IMAGE=ubuntu:20.04
-ARG KAIROS_INIT=v0.6.4
+ARG KAIROS_INIT=v0.6.8
 
 FROM quay.io/kairos/kairos-init:${KAIROS_INIT} AS kairos-init
 
diff --git a/tests/assets/efivars.empty.fd b/tests/assets/efivars.empty.fd
index d7276c5bf..d3b18a4f9 100644
Binary files a/tests/assets/efivars.empty.fd and b/tests/assets/efivars.empty.fd differ
diff --git a/tests/assets/kairos.ipxe b/tests/assets/kairos.ipxe
deleted file mode 100644
index 3828833c8..000000000
--- a/tests/assets/kairos.ipxe
+++ /dev/null
@@ -1,6 +0,0 @@
-#!ipxe
-set dns 8.8.8.8
-ifconf
-initrd http://10.0.2.2/kairos-initrd
-kernel http://10.0.2.2/kairos-kernel root=live:http://10.0.2.2/kairos-squashfs initrd=kairos-initrd rd.neednet=1 ip=dhcp rd.cos.disable netboot install-mode config_url=${config} console=tty1 console=ttyS0 rd.live.overlay.overlayfs
-boot
\ No newline at end of file
diff --git a/tests/netboot_test.go b/tests/netboot_test.go
deleted file mode 100644
index e7aed9cb5..000000000
--- a/tests/netboot_test.go
+++ /dev/null
@@ -1,34 +0,0 @@
-package mos_test
-
-import (
-	"fmt"
-	. "github.com/spectrocloud/peg/matcher"
-	"os"
-	"path/filepath"
-
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
-)
-
-var _ = Describe("kairos netboot test", Label("netboot-test"), func() {
-	var vm VM
-	BeforeEach(func() {
-		_, vm = startVM()
-	})
-
-	AfterEach(func() {
-		if CurrentSpecReport().Failed() {
-			gatherLogs(vm)
-			serial, _ := os.ReadFile(filepath.Join(vm.StateDir, "serial.log"))
-			_ = os.MkdirAll("logs", os.ModePerm|os.ModeDir)
-			_ = os.WriteFile(filepath.Join("logs", "serial.log"), serial, os.ModePerm)
-			fmt.Println(string(serial))
-		}
-		Expect(vm.Destroy(nil)).ToNot(HaveOccurred())
-	})
-
-	It("eventually boots", func() {
-		vm.EventuallyConnects(1200)
-		stateAssertVM(vm, "boot", "livecd_boot")
-	})
-})
diff --git a/tests/provider_decentralized_test.go b/tests/provider_decentralized_test.go
index 79acb4aef..2dd324fe5 100644
--- a/tests/provider_decentralized_test.go
+++ b/tests/provider_decentralized_test.go
@@ -191,7 +191,7 @@ var _ = Describe("kairos decentralized k8s test", Label("provider", "provider-de
 					out, err = vm.Sudo(`curl -X POST http://localhost:8080/api/dns --header "Content-Type: application/json" -d '{ "Regex": "foo.bar", "Records": { "A": "2.2.2.2" } }'`)
 					Expect(err).ToNot(HaveOccurred(), out)
 
-					out, _ = vm.Sudo("ping -c 1 foo.bar")
+					out, _ = vm.Sudo("curl -s -o /dev/null -w '%{remote_ip}' http://foo.bar")
 					return strings.TrimSpace(out)
 				}, 240*time.Second, 10*time.Second).Should(MatchRegexp("2\\.2\\.2\\.2"), func() string {
 					fmt.Printf("DNS is not working: %s", out)
diff --git a/tests/tests_suite_test.go b/tests/tests_suite_test.go
index d23d6e35d..0799dbac0 100644
--- a/tests/tests_suite_test.go
+++ b/tests/tests_suite_test.go
@@ -188,7 +188,7 @@ func expectDefaultService(vm VM) {
 func expectStartedInstallation(vm VM) {
 	By("checking that installation has started", func() {
 		Eventually(func() string {
-			out, _ := vm.Sudo("ps aux|ps")
+			out, _ := vm.Sudo("ps aux || ps")
 			return out
 		}, 30*time.Minute, 1*time.Second).Should(ContainSubstring("/usr/bin/kairos-agent install"))
 	})