diff --git a/.gitignore b/.gitignore
index 0d99305f69..f64f775993 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,7 @@ npm_licenses.tar.bz2
 
 /vendor
 /.build
+/go.work.sum
 
 /**/node_modules
 
diff --git a/Makefile b/Makefile
index 834f0e3ce2..1611dacd6f 100644
--- a/Makefile
+++ b/Makefile
@@ -194,6 +194,8 @@ GO_SUBMODULE_DIRS := documentation/examples/remote_storage internal/tools web/ui
 .PHONY: update-all-go-deps
 update-all-go-deps: update-go-deps
 	$(foreach dir,$(GO_SUBMODULE_DIRS),$(MAKE) update-go-deps-in-dir DIR=$(dir);)
+	@echo ">> syncing Go workspace"
+	@$(GO) work sync
 
 .PHONY: update-go-deps-in-dir
 update-go-deps-in-dir:
diff --git a/go.work b/go.work
new file mode 100644
index 0000000000..5ec4aeab50
--- /dev/null
+++ b/go.work
@@ -0,0 +1,8 @@
+go 1.24.9
+
+use (
+	.
+	./documentation/examples/remote_storage
+	./internal/tools
+	./web/ui/mantine-ui/src/promql/tools
+)