diff --git a/run-bakery b/run-bakery
index 0a84143..759d857 100755
--- a/run-bakery
+++ b/run-bakery
@@ -2,10 +2,23 @@
 
 set -euo pipefail
 
-DOCKER=${DOCKER:-docker}
+DOCKER=${DOCKER:-"docker"}
+DOCKER_FLAGS=${DOCKER_FLAGS:-""}
 
-$DOCKER run --rm --privileged \
+RUGPI_DEV=${RUGPI_DEV:-"false"}
+
+if [ "${RUGPI_DEV}" = "false" ]; then
+    DOCKER_FLAGS="${DOCKER_FLAGS} --pull always"
+    RUGPI_VERSION=${RUGPI_VERSION:-"v0"}
+else
+    RUGPI_VERSION=${RUGPI_VERSION:-"dev"}
+fi
+
+RUGPI_BAKERY_IMAGE=${RUGPI_BAKERY_IMAGE:-"ghcr.io/silitics/rugpi-bakery:${RUGPI_VERSION}"}
+
+exec $DOCKER run --rm --privileged \
+    $DOCKER_FLAGS \
     -v "$(pwd)":/project \
     -v /dev:/dev \
-    ghcr.io/silitics/rugpi-bakery:latest \
+    "${RUGPI_BAKERY_IMAGE}" \
     "$@"
diff --git a/run-bakery.bat b/run-bakery.bat
deleted file mode 100644
index 848d867..0000000
--- a/run-bakery.bat
+++ /dev/null
@@ -1,7 +0,0 @@
-docker run --rm --privileged ^
-    -v .:/project ^
-    -v /dev:/dev ^
-    ghcr.io/silitics/rugpi-bakery:latest ^
-    %*
-
-if %errorlevel% neq 0 exit /b %errorlevel%