diff --git a/.github/workflows/loongarch64-edk2.yml b/.github/workflows/loongarch64-edk2.yml
index be812aa..070780e 100644
--- a/.github/workflows/loongarch64-edk2.yml
+++ b/.github/workflows/loongarch64-edk2.yml
@@ -76,7 +76,8 @@ jobs:
                ARCH="$ARCH" \
                EDK2_TARGET="$EDK2_TARGET" \
                EDK2_TOOLCHAIN="$EDK2_TOOLCHAIN" \
-               all_edk2
+               prefix="loongarch64-unknown-linux-gnu-" \
+               edk2 fs_edk2
 
       - name: Package LoongArch64 zip (official layout style)
         run: |
diff --git a/Make.common b/Make.common
index 89a4141..c3cfba2 100644
--- a/Make.common
+++ b/Make.common
@@ -60,14 +60,6 @@ ifeq ($(ARCH),aarch64)
   AR            = $(prefix)aarch64-linux-gnu-ar
   RANLIB        = $(prefix)aarch64-linux-gnu-ranlib
   OBJCOPY       = $(prefix)aarch64-linux-gnu-objcopy
-else ifeq ($(ARCH),loongarch64)
-  LOONGARCH64_CROSS_PREFIX ?= loongarch64-unknown-linux-gnu-
-  CC            = $(LOONGARCH64_CROSS_PREFIX)gcc
-  AS            = $(LOONGARCH64_CROSS_PREFIX)as
-  LD            = $(LOONGARCH64_CROSS_PREFIX)ld
-  AR            = $(LOONGARCH64_CROSS_PREFIX)ar
-  RANLIB        = $(LOONGARCH64_CROSS_PREFIX)ranlib
-  OBJCOPY       = $(LOONGARCH64_CROSS_PREFIX)objcopy
 else
   CC            = $(prefix)gcc
   AS            = $(prefix)as