diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml
index 43210022..a167684f 100644
--- a/.github/workflows/image.yml
+++ b/.github/workflows/image.yml
@@ -21,9 +21,9 @@ jobs:
             create() {
               uboot=u-boot-$1-nor.bin
               firmware=openipc.$2-nor-$3.tgz
-              release=image/openipc-$1-nor-$3.bin
+              release=target/openipc-$1-nor-$3.bin
 
-              mkdir -p image output
+              mkdir -p output target
               if ! wget -nv $link/$uboot -O output/$1.bin; then
                 echo -e "Download failed: $link/$uboot\n"
                 return 0
@@ -59,4 +59,4 @@ jobs:
         with:
           tag_name: ${{env.TAG_NAME}}
           make_latest: false
-          files: image/*.bin
+          files: target/*.bin
diff --git a/Makefile b/Makefile
index f6919b95..7ac5943c 100644
--- a/Makefile
+++ b/Makefile
@@ -54,7 +54,7 @@ package:
 	@find $(PWD)/general/package/* -maxdepth 0 -type d -printf "br-%f\n" | grep -v patch
 
 toolname:
-	@echo br-sdk-$(BR2_OPENIPC_SOC_VENDOR)-$(BR2_OPENIPC_SOC_FAMILY)
+	@echo toolchain.$(BR2_OPENIPC_SOC_VENDOR)-$(BR2_OPENIPC_SOC_FAMILY)
 
 clean:
 	@rm -rf $(TARGET)/build $(TARGET)/images $(TARGET)/per-package $(TARGET)/target
diff --git a/general/external.mk b/general/external.mk
index 0168c560..6f3f6539 100644
--- a/general/external.mk
+++ b/general/external.mk
@@ -8,6 +8,6 @@ export WGET := wget --show-progress --passive-ftp -nd -t5 -T10
 
 EXTERNAL_VENDOR := $(BR2_EXTERNAL)/../br-ext-chip-$(OPENIPC_SOC_VENDOR)
 OPENIPC_KERNEL := $(OPENIPC_SOC_VENDOR)-$(OPENIPC_SOC_FAMILY)
-OPENIPC_TOOLCHAIN := toolchain/br-sdk-$(OPENIPC_KERNEL)
+OPENIPC_TOOLCHAIN := toolchain/toolchain.$(OPENIPC_KERNEL)
 
 include $(sort $(wildcard $(BR2_EXTERNAL)/package/*/*.mk))