diff --git a/tools/buildenv/.gitignore b/tools/buildenv/.gitignore
deleted file mode 100644
index eccc028..0000000
--- a/tools/buildenv/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-krpc.tar
diff --git a/tools/buildenv/CHANGES.txt b/tools/buildenv/CHANGES.txt
index 3f49eff..36b5b6b 100644
--- a/tools/buildenv/CHANGES.txt
+++ b/tools/buildenv/CHANGES.txt
@@ -1,3 +1,6 @@
+v3.6.0
+ * Update bazel to 9.1.1
+
 v3.5.0
  * Update base image to Ubuntu 24.04
  * Update to Python 3.12
diff --git a/tools/buildenv/Dockerfile b/tools/buildenv/Dockerfile
index 9d06da0..78fc426 100644
--- a/tools/buildenv/Dockerfile
+++ b/tools/buildenv/Dockerfile
@@ -1,8 +1,6 @@
 FROM ubuntu:24.04
 LABEL maintainer="djungelorm <djungelorm@users.noreply.github.com>"
 
-ARG bazel_version
-
 # Install essential packages
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
@@ -16,7 +14,7 @@ RUN wget https://github.com/bazelbuild/bazelisk/releases/download/v1.29.0/bazeli
 COPY bazelrc /etc/bazel.bazelrc
 RUN chmod 0644 /etc/bazel.bazelrc
 ENV BAZELISK_HOME=/usr/local/share/bazelisk
-RUN USE_BAZEL_VERSION=7.2.1 bazel version && chmod -R a+rwX /usr/local/share/bazelisk
+RUN USE_BAZEL_VERSION=9.1.1 bazel version && chmod -R a+rwX /usr/local/share/bazelisk
 
 # Install dotnet
 RUN apt-get update && \
diff --git a/tools/buildenv/Makefile b/tools/buildenv/Makefile
index 330dccd..4e63c56 100644
--- a/tools/buildenv/Makefile
+++ b/tools/buildenv/Makefile
@@ -3,9 +3,7 @@
 VERSION=`cat VERSION.txt`
 
 build:
-	docker build \
-	  --build-arg bazel_version=7.2.1 \
-	  -t ghcr.io/krpc/buildenv:$(VERSION) .
+	docker build -t ghcr.io/krpc/buildenv:$(VERSION) .
 
 test:
 	docker run -t --user 1001:121 -i ghcr.io/krpc/buildenv:$(VERSION)
diff --git a/tools/buildenv/VERSION.txt b/tools/buildenv/VERSION.txt
index 1545d96..40c341b 100644
--- a/tools/buildenv/VERSION.txt
+++ b/tools/buildenv/VERSION.txt
@@ -1 +1 @@
-3.5.0
+3.6.0