diff --git a/buildroot-external/rootfs-overlay/usr/sbin/hassio-cli b/buildroot-external/rootfs-overlay/usr/sbin/hassio-cli
new file mode 100644
index 000000000..94f5d4f32
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/usr/sbin/hassio-cli
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# Load configs
+CONFIG_FILE=/mnt/data/supervisor.json
+
+CLI="$(jq --raw-output '.cli' $CONFIG_FILE)"
+DOCKER_ARGS="$(jq --raw-output '.cli_args // empty' $CONFIG_FILE)"
+
+# Update CLI
+if docker --pull $CLI > /dev/null 2>&1; then
+  # FIXME: cleanup
+fi
+
+docker run --rm -ti $DOCKER_ARGS $CLI
+