diff --git a/compat/.gitignore b/system-images/compat/.gitignore
similarity index 100%
rename from compat/.gitignore
rename to system-images/compat/.gitignore
diff --git a/compat/Cargo.lock b/system-images/compat/Cargo.lock
similarity index 100%
rename from compat/Cargo.lock
rename to system-images/compat/Cargo.lock
diff --git a/compat/Cargo.toml b/system-images/compat/Cargo.toml
similarity index 100%
rename from compat/Cargo.toml
rename to system-images/compat/Cargo.toml
diff --git a/compat/Dockerfile b/system-images/compat/Dockerfile
similarity index 100%
rename from compat/Dockerfile
rename to system-images/compat/Dockerfile
diff --git a/compat/Makefile b/system-images/compat/Makefile
similarity index 100%
rename from compat/Makefile
rename to system-images/compat/Makefile
diff --git a/compat/build.sh b/system-images/compat/build.sh
similarity index 100%
rename from compat/build.sh
rename to system-images/compat/build.sh
diff --git a/compat/src/backup.rs b/system-images/compat/src/backup.rs
similarity index 100%
rename from compat/src/backup.rs
rename to system-images/compat/src/backup.rs
diff --git a/compat/src/config/mod.rs b/system-images/compat/src/config/mod.rs
similarity index 100%
rename from compat/src/config/mod.rs
rename to system-images/compat/src/config/mod.rs
diff --git a/compat/src/config/rule_parser.pest b/system-images/compat/src/config/rule_parser.pest
similarity index 100%
rename from compat/src/config/rule_parser.pest
rename to system-images/compat/src/config/rule_parser.pest
diff --git a/compat/src/config/rules.rs b/system-images/compat/src/config/rules.rs
similarity index 100%
rename from compat/src/config/rules.rs
rename to system-images/compat/src/config/rules.rs
diff --git a/compat/src/main.rs b/system-images/compat/src/main.rs
similarity index 100%
rename from compat/src/main.rs
rename to system-images/compat/src/main.rs
diff --git a/system-images/utils/Dockerfile b/system-images/utils/Dockerfile
new file mode 100644
index 000000000..1166949f6
--- /dev/null
+++ b/system-images/utils/Dockerfile
@@ -0,0 +1,3 @@
+FROM alpine:latest
+
+RUN apk update && apk add yq jq
diff --git a/system-images/utils/Makefile b/system-images/utils/Makefile
new file mode 100644
index 000000000..fdae14b4d
--- /dev/null
+++ b/system-images/utils/Makefile
@@ -0,0 +1,6 @@
+.DELETE_ON_ERROR:
+
+all: utils.tar
+
+utils.tar: Dockerfile
+	DOCKER_CLI_EXPERIMENTAL=enabled docker buildx build --tag start9/x_system/utils --platform=linux/arm64 -o type=docker,dest=utils.tar .
diff --git a/system-images/utils/utils.tar b/system-images/utils/utils.tar
new file mode 100644
index 000000000..ae3a5851e
Binary files /dev/null and b/system-images/utils/utils.tar differ