diff --git a/Makefile b/Makefile
index 448a8a0..ca736d6 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):/tools --entrypoint=/bldr \
-	ghcr.io/talos-systems/bldr:v0.2.0-alpha.4-frontend graph --root=/tools
+	ghcr.io/siderolabs/bldr:v0.2.0-alpha.7-1-g9d49478-frontend graph --root=/tools
 
 BUILD := docker buildx build
 PLATFORM ?= linux/amd64,linux/arm64
diff --git a/Pkgfile b/Pkgfile
index fdb686d..3290d9c 100644
--- a/Pkgfile
+++ b/Pkgfile
@@ -1,11 +1,11 @@
-# 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
 
 # Sync bldr image with Makefile
 
 format: v1alpha2
 
 vars:
-  TOOLCHAIN_IMAGE: ghcr.io/talos-systems/toolchain:v0.5.0
+  TOOLCHAIN_IMAGE: ghcr.io/siderolabs/toolchain:v0.5.0-1-g5831f78
 
 labels:
-  org.opencontainers.image.source: https://github.com/talos-systems/tools
+  org.opencontainers.image.source: https://github.com/siderolabs/tools