diff --git a/ops/bin/dev/run-buildkite.sh b/ops/bin/dev/run-buildkite.sh
index eb6cc122..f3c89c7b 100755
--- a/ops/bin/dev/run-buildkite.sh
+++ b/ops/bin/dev/run-buildkite.sh
@@ -15,23 +15,26 @@ export DOCKERFILE_DIR="${REPO_DIR}/resources/docker"
 rm -f buildkite.ext4
 ops/bin/buildfs.sh "$DOCKERFILE_DIR/buildkite-agent.Dockerfile" "buildkite.ext4" "$REPO_DIR/resources" 524288
 
-wget --continue --retry-connrefused --waitretry=1 --timeout=20 --tries=3 -O "./vmlinux-6.2-x86_64.bin" https://github.com/hocus-dev/linux-kernel/releases/download/0.0.5/vmlinux-6.2-x86_64.bin
+KERNEL=./vmlinux-6.2-x86_64.bin
+wget --continue --retry-connrefused --waitretry=1 --timeout=20 --tries=3 -O "$KERNEL" "https://github.com/hocus-dev/linux-kernel/releases/download/0.0.5/$KERNEL"
 
 total_cores=$(nproc)
 allocated_cores=$((total_cores / 2))
 total_memory=$(free -b | awk '/^Mem:/{print $2}')
-allocated_memory=$((total_memory * 8 / 10 / 1024))
+allocated_memory=16777216 # 16GB #$((total_memory * 9 / 10 / 1024))
+#allocated_memory=4777216 # 16GB #$((total_memory * 9 / 10 / 1024))
 qemu-system-x86_64 \
-	-m ${allocated_memory}K,slots=2,maxmem=1000G \
+	-machine q35,acpi=off \
+	-m ${allocated_memory}K \
+	-blockdev node-name=q1,driver=raw,file.driver=file,file.filename=buildkite.ext4,discard=unmap,detect-zeroes=unmap,file.aio=io_uring \
+	-device virtio-blk,drive=q1,discard=on \
+        --kernel "$KERNEL" \
+        --append "reboot=t loglevel=3 vm.compaction_proactiveness=100 vm.compact_unevictable_allowed=1 transparent_hugepage=never page_reporting.page_reporting_order=0 root=/dev/vda rw rootflags=discard ip=dhcp console=ttyS0 kernel.panic=-1 damon_reclaim.enabled=Y damon_reclaim.min_age=10000000 damon_reclaim.wmarks_low=0 damon_reclaim.wmarks_high=1000 damon_reclaim.wmarks_mid=999 damon_reclaim.quota_sz=1073741824 damon_reclaim.quota_reset_interval_ms=1000" \
         -cpu host \
 	-smp ${allocated_cores} \
         -nographic \
         -enable-kvm \
 	-no-reboot \
-        -kernel ./vmlinux-6.2-x86_64.bin \
-	-object memory-backend-file,id=mem1,share=on,mem-path=./buildkite.ext4,size=512G,align=2M \
-	-device virtio-pmem-pci,memdev=mem1,id=nv1 \
-        -append "root=/dev/pmem0 rootflags=dax console=ttyS0 ip=dhcp kernel.panic=-1" \
         -netdev user,id=n1 \
         -device virtio-net-pci,netdev=n1 \
         -device virtio-balloon,deflate-on-oom=on,free-page-reporting=on
diff --git a/resources/docker/buildkite-agent.Dockerfile b/resources/docker/buildkite-agent.Dockerfile
index 70b0418e..dc7bc7be 100644
--- a/resources/docker/buildkite-agent.Dockerfile
+++ b/resources/docker/buildkite-agent.Dockerfile
@@ -11,7 +11,10 @@ RUN apt-get update && apt-get install -y \
     util-linux \
     vim \
     jq \
-    htop
+    htop \
+    stress
+# WARNING THOSE PACKAGES ARE NEEDED ON UBUNTU TO GET A SERIAL OUTPUT
+RUN apt-get install -y util-linux p11-kit udev dbus coreutils bash e2fsprogs
 RUN systemctl enable ssh
 COPY ./docker/dnssetup /etc/init.d/dnssetup
 RUN chmod 755 /etc/init.d/dnssetup && \