diff --git a/Makefile b/Makefile
index 2cedf12..f81d84c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 REGISTRY ?= ghcr.io
-USERNAME ?= talos-systems
+USERNAME ?= siderolabs
 SHA ?= $(shell git describe --match=none --always --abbrev=8 --dirty)
 TAG ?= $(shell git describe --tag --always --dirty)
 BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD)
@@ -8,7 +8,7 @@ SOURCE_DATE_EPOCH ?= $(shell git log -1 --pretty=%ct)
 
 # Sync bldr image with Pkgfile
 BLDR ?= docker run --rm --volume $(PWD):/toolchain --entrypoint=/bldr \
-	ghcr.io/talos-systems/bldr:v0.2.0-alpha.5-frontend graph --root=/toolchain
+	ghcr.io/siderolabs/bldr:v0.2.0-alpha.7-1-g9d49478-frontend graph --root=/toolchain
 
 BUILD := docker buildx build
 PLATFORM ?= linux/amd64,linux/arm64
diff --git a/Pkgfile b/Pkgfile
index f816f8c..6d72098 100644
--- a/Pkgfile
+++ b/Pkgfile
@@ -1,4 +1,4 @@
-# syntax = ghcr.io/talos-systems/bldr:v0.2.0-alpha.7-frontend
+# syntax = ghcr.io/siderolabs/bldr:v0.2.0-alpha.7-1-g9d49478-frontend
 
 format: v1alpha2
 
@@ -35,4 +35,4 @@ vars:
   musl_sha512: 5344b581bd6463d71af8c13e91792fa51f25a96a1ecbea81e42664b63d90b325aeb421dfbc8c22e187397ca08e84d9296a0c0c299ba04fa2b751d6864914bd82
 
 labels:
-  org.opencontainers.image.source: https://github.com/talos-systems/toolchain
+  org.opencontainers.image.source: https://github.com/siderolabs/toolchain
diff --git a/README.md b/README.md
index 36ae42e..ebd6ca1 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ At that point you can set you $PATH to `/toolchain/bin` and build source code in
 
 ## Development
 
-The development of this toolchain depends on Docker 19.03.0 or greater and [`bldr`](https://github.com/talos-systems/bldr).
+The development of this toolchain depends on Docker 19.03.0 or greater and [`bldr`](https://github.com/siderolabs/bldr).
 The toolchain can be built for different architectures (e.g. `x86_64`, `aarch64`, etc.).
 To do this you will need to setup the proper `docker context` for the architecture you intend on building for.
 For example, to setup the build for `aarch64` (`arm64`):