diff --git a/build/tasks/blissify.mk b/build/tasks/blissify.mk
index f4053b6..311b51e 100644
--- a/build/tasks/blissify.mk
+++ b/build/tasks/blissify.mk
@@ -15,7 +15,7 @@
 # Bliss Target Zip
 BLISS_TARGET_PACKAGE := $(PRODUCT_OUT)/$(BLISS_BUILD_ZIP).zip
 
-SHA256 := prebuilts/build-tools/path/$(HOST_OS)-x86/sha256sum
+SHA256 := prebuilts/build-tools/path/$(HOST_PREBUILT_TAG)/sha256sum
 
 .PHONY: blissify
 blissify: $(INTERNAL_OTA_PACKAGE_TARGET)
diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk
index 35a6976..29e0a41 100644
--- a/build/tasks/kernel.mk
+++ b/build/tasks/kernel.mk
@@ -237,7 +237,7 @@
         # Use the default version of clang if TARGET_KERNEL_CLANG_VERSION hasn't been set by the device config
         KERNEL_CLANG_VERSION := $(LLVM_PREBUILTS_VERSION)
     endif
-    TARGET_KERNEL_CLANG_PATH ?= $(BUILD_TOP)/prebuilts/clang/host/$(HOST_OS)-x86/$(KERNEL_CLANG_VERSION)
+    TARGET_KERNEL_CLANG_PATH ?= $(BUILD_TOP)/prebuilts/clang/host/$(HOST_PREBUILT_TAG)/$(KERNEL_CLANG_VERSION)
     ifeq ($(KERNEL_ARCH),arm64)
         KERNEL_CLANG_TRIPLE ?= CLANG_TRIPLE=aarch64-linux-gnu-
     else ifeq ($(KERNEL_ARCH),arm)