diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 774a255c..8021a174 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -4,7 +4,7 @@ WORKDIR /app
 
 COPY go.mod go.sum package.json package-lock.json ./
 RUN apt-get update \
-  && apt-get -y install zstd brotli redis \
+  && apt-get -y install zstd brotli redis uuid-runtime \
   && mkdir -p /home/vscode/.local/share/fish \
   && chown -R vscode:vscode /home/vscode/.local/share/fish \
   && chown -R vscode:vscode /go
diff --git a/test/go.mod b/test/go.mod
index 752b3280..433e1e77 100644
--- a/test/go.mod
+++ b/test/go.mod
@@ -76,6 +76,7 @@ require (
 	github.com/sebest/xff v0.0.0-20210106013422-671bd2870b3a // indirect
 	github.com/shirou/gopsutil/v4 v4.25.6 // indirect
 	github.com/stoewer/go-strcase v1.3.1 // indirect
+	github.com/tetratelabs/wazero v1.9.0 // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
 	go.etcd.io/bbolt v1.4.2 // indirect
 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
diff --git a/test/go.sum b/test/go.sum
index 2a197d9b..89d155c6 100644
--- a/test/go.sum
+++ b/test/go.sum
@@ -211,6 +211,8 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/testcontainers/testcontainers-go v0.38.0 h1:d7uEapLcv2P8AvH8ahLqDMMxda2W9gQN1nRbHS28HBw=
 github.com/testcontainers/testcontainers-go v0.38.0/go.mod h1:C52c9MoHpWO+C4aqmgSU+hxlR5jlEayWtgYrb8Pzz1w=
+github.com/tetratelabs/wazero v1.9.0 h1:IcZ56OuxrtaEz8UYNRHBrUa9bYeX9oVY93KspZZBf/I=
+github.com/tetratelabs/wazero v1.9.0/go.mod h1:TSbcXCfFP0L2FGkRPxHphadXPjo1T6W+CseNNY7EkjM=
 github.com/tklauser/go-sysconf v0.3.15 h1:VE89k0criAymJ/Os65CSn1IXaol+1wrsFHEB8Ol49K4=
 github.com/tklauser/go-sysconf v0.3.15/go.mod h1:Dmjwr6tYFIseJw7a3dRLJfsHAMXZ3nEnL/aZY+0IuI4=
 github.com/tklauser/numcpus v0.10.0 h1:18njr6LDBk1zuna922MgdjQuJFjrdppsZG60sHGfjso=
diff --git a/test/ssh-ci/Dockerfile b/test/ssh-ci/Dockerfile
deleted file mode 100644
index 652749d6..00000000
--- a/test/ssh-ci/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-ARG ALPINE_VERSION=3.22
-
-FROM alpine:${ALPINE_VERSION}
-RUN apk add -U go nodejs git build-base git npm bash zstd brotli gzip
-LABEL org.opencontainers.image.source="https://github.com/TecharoHQ/anubis"
\ No newline at end of file
diff --git a/test/ssh-ci/docker-bake.hcl b/test/ssh-ci/docker-bake.hcl
deleted file mode 100644
index eb72fac3..00000000
--- a/test/ssh-ci/docker-bake.hcl
+++ /dev/null
@@ -1,26 +0,0 @@
-variable "ALPINE_VERSION" { default = "3.22" }
-
-group "default" {
-  targets = [
-    "ci-runner",
-  ]
-}
-
-target "ci-runner" {
-  args = {
-    ALPINE_VERSION = "3.22"
-  }
-  context = "."
-  dockerfile = "./Dockerfile"
-  platforms = [
-    "linux/amd64",
-    "linux/arm64",
-    "linux/arm/v7",
-    "linux/ppc64le",
-    "linux/riscv64",
-  ]
-  pull = true
-  tags = [
-    "ghcr.io/techarohq/anubis/ci-runner:latest"
-  ]
-}
\ No newline at end of file
diff --git a/test/ssh-ci/in-container.sh b/test/ssh-ci/in-container.sh
index db93cf25..778518c6 100644
--- a/test/ssh-ci/in-container.sh
+++ b/test/ssh-ci/in-container.sh
@@ -5,4 +5,4 @@ set -x
 
 npm ci
 npm run build
-SKIP_INTEGRATION=1 go test ./...
\ No newline at end of file
+SKIP_INTEGRATION=1 go test -v ./...
\ No newline at end of file
diff --git a/test/ssh-ci/rigging.sh b/test/ssh-ci/rigging.sh
index 2e35af7e..23fea4b9 100644
--- a/test/ssh-ci/rigging.sh
+++ b/test/ssh-ci/rigging.sh
@@ -14,7 +14,7 @@ Hosts["ppc64le"]="ci@ppc64le.techaro.lol"     # GOARCH=ppc64le GOOS=linux
 Hosts["aarch64-4k"]="rocky@192.168.2.52"      # GOARCH=arm64 GOOS=linux 4k page size
 Hosts["aarch64-16k"]="ci@192.168.2.28"        # GOARCH=arm64 GOOS=linux 16k page size
 
-CIRunnerImage="ghcr.io/techarohq/anubis/ci-runner:latest"
+CIRunnerImage="ghcr.io/techarohq/ci-images/ssh-ci:latest"
 RunID=${GITHUB_RUN_ID:-$(uuidgen)}
 RunFolder="anubis/runs/${RunID}"
 Target="${Hosts["$1"]}"