diff --git a/.github/workflows/Lineage21_pstar.yml b/.github/workflows/Lineage21_pstar.yml
index c28620bf1c..9cfa22f1b3 100644
--- a/.github/workflows/Lineage21_pstar.yml
+++ b/.github/workflows/Lineage21_pstar.yml
@@ -597,7 +597,7 @@ jobs:
            fi
        fi
        if [ ${{ env.ENABLE_KERNELSU }} = true && ${{ env.KERNELSU_LKM }} = true ]; then
-           if [ -f kernel_workspace/android-kernel/out/drivers/kernelsu/kernelsu.ko ]; then
+           if [ -f android-kernel/out/drivers/kernelsu/kernelsu.ko ]; then
                echo "CHECK_KERNELSU_LKM_IS_OK=true" >> $GITHUB_ENV
            else
                echo "KernelSU LKM is empty"
@@ -687,7 +687,7 @@ jobs:
     - name: Upload Kernel defconfig
       uses: actions/upload-artifact@main
       with:
-        name: kernel
+        name: defconfig
         path: |
           kernel_workspace/android-kernel/arch/${{ env.ARCH }}/configs/${{ env.KERNEL_CONFIG }}
 
@@ -696,13 +696,13 @@ jobs:
       uses: actions/upload-artifact@v4
       with:
         name: Drivers${{ env.LOCALVERSION }}${{ env.UPLOADNAME }}-${{ env.DEVICE }}-${{ env.BUILD_TIME }}
-        path: kernel_workspace/android-kernel/out/drivers/*
+        path: kernel_workspace/android-kernel/out/drivers/**/*.ko
 
     - name: Upload KernelSU lkm
       if: env.CHECK_KERNELSU_LKM_IS_OK == 'true'
       uses: actions/upload-artifact@main
       with:
-        name: kernel
+        name: KernelSU${{ env.LOCALVERSION }}${{ env.UPLOADNAME }}-${{ env.DEVICE }}-${{ env.BUILD_TIME }}
         path: |
           kernel_workspace/android-kernel/out/drivers/kernelsu/kernelsu.ko
 
diff --git a/.github/workflows/Lineage21_pstar_docker_lxc.yml b/.github/workflows/Lineage21_pstar_docker_lxc.yml
index 6c6960efe1..cb8446795f 100644
--- a/.github/workflows/Lineage21_pstar_docker_lxc.yml
+++ b/.github/workflows/Lineage21_pstar_docker_lxc.yml
@@ -597,7 +597,7 @@ jobs:
            fi
        fi
        if [ ${{ env.ENABLE_KERNELSU }} = true && ${{ env.KERNELSU_LKM }} = true ]; then
-           if [ -f kernel_workspace/android-kernel/out/drivers/kernelsu/kernelsu.ko ]; then
+           if [ -f android-kernel/out/drivers/kernelsu/kernelsu.ko ]; then
                echo "CHECK_KERNELSU_LKM_IS_OK=true" >> $GITHUB_ENV
            else
                echo "KernelSU LKM is empty"
@@ -687,7 +687,7 @@ jobs:
     - name: Upload Kernel defconfig
       uses: actions/upload-artifact@main
       with:
-        name: kernel
+        name: defconfig
         path: |
           kernel_workspace/android-kernel/arch/${{ env.ARCH }}/configs/${{ env.KERNEL_CONFIG }}
 
@@ -696,13 +696,13 @@ jobs:
       uses: actions/upload-artifact@v4
       with:
         name: Drivers${{ env.LOCALVERSION }}${{ env.UPLOADNAME }}-${{ env.DEVICE }}-${{ env.BUILD_TIME }}
-        path: kernel_workspace/android-kernel/out/drivers/*
+        path: kernel_workspace/android-kernel/out/drivers/**/*.ko
 
     - name: Upload KernelSU lkm
       if: env.CHECK_KERNELSU_LKM_IS_OK == 'true'
       uses: actions/upload-artifact@main
       with:
-        name: kernel
+        name: KernelSU${{ env.LOCALVERSION }}${{ env.UPLOADNAME }}-${{ env.DEVICE }}-${{ env.BUILD_TIME }}
         path: |
           kernel_workspace/android-kernel/out/drivers/kernelsu/kernelsu.ko
 
diff --git a/.github/workflows/Lineage21_pstar_docker_lxc_nethunter.yml b/.github/workflows/Lineage21_pstar_docker_lxc_nethunter.yml
index a030914d0a..ac767f2190 100644
--- a/.github/workflows/Lineage21_pstar_docker_lxc_nethunter.yml
+++ b/.github/workflows/Lineage21_pstar_docker_lxc_nethunter.yml
@@ -597,7 +597,7 @@ jobs:
            fi
        fi
        if [ ${{ env.ENABLE_KERNELSU }} = true && ${{ env.KERNELSU_LKM }} = true ]; then
-           if [ -f kernel_workspace/android-kernel/out/drivers/kernelsu/kernelsu.ko ]; then
+           if [ -f android-kernel/out/drivers/kernelsu/kernelsu.ko ]; then
                echo "CHECK_KERNELSU_LKM_IS_OK=true" >> $GITHUB_ENV
            else
                echo "KernelSU LKM is empty"
@@ -687,7 +687,7 @@ jobs:
     - name: Upload Kernel defconfig
       uses: actions/upload-artifact@main
       with:
-        name: kernel
+        name: defconfig
         path: |
           kernel_workspace/android-kernel/arch/${{ env.ARCH }}/configs/${{ env.KERNEL_CONFIG }}
 
@@ -696,13 +696,13 @@ jobs:
       uses: actions/upload-artifact@v4
       with:
         name: Drivers${{ env.LOCALVERSION }}${{ env.UPLOADNAME }}-${{ env.DEVICE }}-${{ env.BUILD_TIME }}
-        path: kernel_workspace/android-kernel/out/drivers/*
+        path: kernel_workspace/android-kernel/out/drivers/**/*.ko
 
     - name: Upload KernelSU lkm
       if: env.CHECK_KERNELSU_LKM_IS_OK == 'true'
       uses: actions/upload-artifact@main
       with:
-        name: kernel
+        name: KernelSU${{ env.LOCALVERSION }}${{ env.UPLOADNAME }}-${{ env.DEVICE }}-${{ env.BUILD_TIME }}
         path: |
           kernel_workspace/android-kernel/out/drivers/kernelsu/kernelsu.ko
 
diff --git a/.github/workflows/Lineage21_pstar_kernelsu.yml b/.github/workflows/Lineage21_pstar_kernelsu.yml
index c745dc6c47..13200e347a 100644
--- a/.github/workflows/Lineage21_pstar_kernelsu.yml
+++ b/.github/workflows/Lineage21_pstar_kernelsu.yml
@@ -597,7 +597,7 @@ jobs:
            fi
        fi
        if [ ${{ env.ENABLE_KERNELSU }} = true && ${{ env.KERNELSU_LKM }} = true ]; then
-           if [ -f kernel_workspace/android-kernel/out/drivers/kernelsu/kernelsu.ko ]; then
+           if [ -f android-kernel/out/drivers/kernelsu/kernelsu.ko ]; then
                echo "CHECK_KERNELSU_LKM_IS_OK=true" >> $GITHUB_ENV
            else
                echo "KernelSU LKM is empty"
@@ -687,7 +687,7 @@ jobs:
     - name: Upload Kernel defconfig
       uses: actions/upload-artifact@main
       with:
-        name: kernel
+        name: defconfig
         path: |
           kernel_workspace/android-kernel/arch/${{ env.ARCH }}/configs/${{ env.KERNEL_CONFIG }}
 
@@ -696,13 +696,13 @@ jobs:
       uses: actions/upload-artifact@v4
       with:
         name: Drivers${{ env.LOCALVERSION }}${{ env.UPLOADNAME }}-${{ env.DEVICE }}-${{ env.BUILD_TIME }}
-        path: kernel_workspace/android-kernel/out/drivers/*
+        path: kernel_workspace/android-kernel/out/drivers/**/*.ko
 
     - name: Upload KernelSU lkm
       if: env.CHECK_KERNELSU_LKM_IS_OK == 'true'
       uses: actions/upload-artifact@main
       with:
-        name: kernel
+        name: KernelSU${{ env.LOCALVERSION }}${{ env.UPLOADNAME }}-${{ env.DEVICE }}-${{ env.BUILD_TIME }}
         path: |
           kernel_workspace/android-kernel/out/drivers/kernelsu/kernelsu.ko
 
diff --git a/.github/workflows/Lineage21_pstar_kernelsu_docker_lxc.yml b/.github/workflows/Lineage21_pstar_kernelsu_docker_lxc.yml
index f68a21e59f..cf65b95c6d 100644
--- a/.github/workflows/Lineage21_pstar_kernelsu_docker_lxc.yml
+++ b/.github/workflows/Lineage21_pstar_kernelsu_docker_lxc.yml
@@ -597,7 +597,7 @@ jobs:
            fi
        fi
        if [ ${{ env.ENABLE_KERNELSU }} = true && ${{ env.KERNELSU_LKM }} = true ]; then
-           if [ -f kernel_workspace/android-kernel/out/drivers/kernelsu/kernelsu.ko ]; then
+           if [ -f android-kernel/out/drivers/kernelsu/kernelsu.ko ]; then
                echo "CHECK_KERNELSU_LKM_IS_OK=true" >> $GITHUB_ENV
            else
                echo "KernelSU LKM is empty"
@@ -687,7 +687,7 @@ jobs:
     - name: Upload Kernel defconfig
       uses: actions/upload-artifact@main
       with:
-        name: kernel
+        name: defconfig
         path: |
           kernel_workspace/android-kernel/arch/${{ env.ARCH }}/configs/${{ env.KERNEL_CONFIG }}
 
@@ -696,13 +696,13 @@ jobs:
       uses: actions/upload-artifact@v4
       with:
         name: Drivers${{ env.LOCALVERSION }}${{ env.UPLOADNAME }}-${{ env.DEVICE }}-${{ env.BUILD_TIME }}
-        path: kernel_workspace/android-kernel/out/drivers/*
+        path: kernel_workspace/android-kernel/out/drivers/**/*.ko
 
     - name: Upload KernelSU lkm
       if: env.CHECK_KERNELSU_LKM_IS_OK == 'true'
       uses: actions/upload-artifact@main
       with:
-        name: kernel
+        name: KernelSU${{ env.LOCALVERSION }}${{ env.UPLOADNAME }}-${{ env.DEVICE }}-${{ env.BUILD_TIME }}
         path: |
           kernel_workspace/android-kernel/out/drivers/kernelsu/kernelsu.ko
 
diff --git a/.github/workflows/Lineage21_pstar_kernelsu_docker_lxc_nethunter.yml b/.github/workflows/Lineage21_pstar_kernelsu_docker_lxc_nethunter.yml
index e8aa85f96b..db39374731 100644
--- a/.github/workflows/Lineage21_pstar_kernelsu_docker_lxc_nethunter.yml
+++ b/.github/workflows/Lineage21_pstar_kernelsu_docker_lxc_nethunter.yml
@@ -597,7 +597,7 @@ jobs:
            fi
        fi
        if [ ${{ env.ENABLE_KERNELSU }} = true && ${{ env.KERNELSU_LKM }} = true ]; then
-           if [ -f kernel_workspace/android-kernel/out/drivers/kernelsu/kernelsu.ko ]; then
+           if [ -f android-kernel/out/drivers/kernelsu/kernelsu.ko ]; then
                echo "CHECK_KERNELSU_LKM_IS_OK=true" >> $GITHUB_ENV
            else
                echo "KernelSU LKM is empty"
@@ -687,7 +687,7 @@ jobs:
     - name: Upload Kernel defconfig
       uses: actions/upload-artifact@main
       with:
-        name: kernel
+        name: defconfig
         path: |
           kernel_workspace/android-kernel/arch/${{ env.ARCH }}/configs/${{ env.KERNEL_CONFIG }}
 
@@ -696,13 +696,13 @@ jobs:
       uses: actions/upload-artifact@v4
       with:
         name: Drivers${{ env.LOCALVERSION }}${{ env.UPLOADNAME }}-${{ env.DEVICE }}-${{ env.BUILD_TIME }}
-        path: kernel_workspace/android-kernel/out/drivers/*
+        path: kernel_workspace/android-kernel/out/drivers/**/*.ko
 
     - name: Upload KernelSU lkm
       if: env.CHECK_KERNELSU_LKM_IS_OK == 'true'
       uses: actions/upload-artifact@main
       with:
-        name: kernel
+        name: KernelSU${{ env.LOCALVERSION }}${{ env.UPLOADNAME }}-${{ env.DEVICE }}-${{ env.BUILD_TIME }}
         path: |
           kernel_workspace/android-kernel/out/drivers/kernelsu/kernelsu.ko
 
diff --git a/.github/workflows/Lineage21_pstar_kernelsu_nethunter.yml b/.github/workflows/Lineage21_pstar_kernelsu_nethunter.yml
index 149949f040..9a4bd5be7a 100644
--- a/.github/workflows/Lineage21_pstar_kernelsu_nethunter.yml
+++ b/.github/workflows/Lineage21_pstar_kernelsu_nethunter.yml
@@ -597,7 +597,7 @@ jobs:
            fi
        fi
        if [ ${{ env.ENABLE_KERNELSU }} = true && ${{ env.KERNELSU_LKM }} = true ]; then
-           if [ -f kernel_workspace/android-kernel/out/drivers/kernelsu/kernelsu.ko ]; then
+           if [ -f android-kernel/out/drivers/kernelsu/kernelsu.ko ]; then
                echo "CHECK_KERNELSU_LKM_IS_OK=true" >> $GITHUB_ENV
            else
                echo "KernelSU LKM is empty"
@@ -687,7 +687,7 @@ jobs:
     - name: Upload Kernel defconfig
       uses: actions/upload-artifact@main
       with:
-        name: kernel
+        name: defconfig
         path: |
           kernel_workspace/android-kernel/arch/${{ env.ARCH }}/configs/${{ env.KERNEL_CONFIG }}
 
@@ -696,13 +696,13 @@ jobs:
       uses: actions/upload-artifact@v4
       with:
         name: Drivers${{ env.LOCALVERSION }}${{ env.UPLOADNAME }}-${{ env.DEVICE }}-${{ env.BUILD_TIME }}
-        path: kernel_workspace/android-kernel/out/drivers/*
+        path: kernel_workspace/android-kernel/out/drivers/**/*.ko
 
     - name: Upload KernelSU lkm
       if: env.CHECK_KERNELSU_LKM_IS_OK == 'true'
       uses: actions/upload-artifact@main
       with:
-        name: kernel
+        name: KernelSU${{ env.LOCALVERSION }}${{ env.UPLOADNAME }}-${{ env.DEVICE }}-${{ env.BUILD_TIME }}
         path: |
           kernel_workspace/android-kernel/out/drivers/kernelsu/kernelsu.ko
 
diff --git a/.github/workflows/Lineage21_pstar_nethunter.yml b/.github/workflows/Lineage21_pstar_nethunter.yml
index 84a158bbe4..0789232bce 100644
--- a/.github/workflows/Lineage21_pstar_nethunter.yml
+++ b/.github/workflows/Lineage21_pstar_nethunter.yml
@@ -597,7 +597,7 @@ jobs:
            fi
        fi
        if [ ${{ env.ENABLE_KERNELSU }} = true && ${{ env.KERNELSU_LKM }} = true ]; then
-           if [ -f kernel_workspace/android-kernel/out/drivers/kernelsu/kernelsu.ko ]; then
+           if [ -f android-kernel/out/drivers/kernelsu/kernelsu.ko ]; then
                echo "CHECK_KERNELSU_LKM_IS_OK=true" >> $GITHUB_ENV
            else
                echo "KernelSU LKM is empty"
@@ -687,7 +687,7 @@ jobs:
     - name: Upload Kernel defconfig
       uses: actions/upload-artifact@main
       with:
-        name: kernel
+        name: defconfig
         path: |
           kernel_workspace/android-kernel/arch/${{ env.ARCH }}/configs/${{ env.KERNEL_CONFIG }}
 
@@ -696,13 +696,13 @@ jobs:
       uses: actions/upload-artifact@v4
       with:
         name: Drivers${{ env.LOCALVERSION }}${{ env.UPLOADNAME }}-${{ env.DEVICE }}-${{ env.BUILD_TIME }}
-        path: kernel_workspace/android-kernel/out/drivers/*
+        path: kernel_workspace/android-kernel/out/drivers/**/*.ko
 
     - name: Upload KernelSU lkm
       if: env.CHECK_KERNELSU_LKM_IS_OK == 'true'
       uses: actions/upload-artifact@main
       with:
-        name: kernel
+        name: KernelSU${{ env.LOCALVERSION }}${{ env.UPLOADNAME }}-${{ env.DEVICE }}-${{ env.BUILD_TIME }}
         path: |
           kernel_workspace/android-kernel/out/drivers/kernelsu/kernelsu.ko
 
diff --git a/.github/workflows/build-kernel.yml b/.github/workflows/build-kernel.yml
index f9806af035..de76868164 100644
--- a/.github/workflows/build-kernel.yml
+++ b/.github/workflows/build-kernel.yml
@@ -597,7 +597,7 @@ jobs:
            fi
        fi
        if [ ${{ env.ENABLE_KERNELSU }} = true && ${{ env.KERNELSU_LKM }} = true ]; then
-           if [ -f kernel_workspace/android-kernel/out/drivers/kernelsu/kernelsu.ko ]; then
+           if [ -f android-kernel/out/drivers/kernelsu/kernelsu.ko ]; then
                echo "CHECK_KERNELSU_LKM_IS_OK=true" >> $GITHUB_ENV
            else
                echo "KernelSU LKM is empty"
@@ -687,7 +687,7 @@ jobs:
     - name: Upload Kernel defconfig
       uses: actions/upload-artifact@main
       with:
-        name: kernel
+        name: defconfig
         path: |
           kernel_workspace/android-kernel/arch/${{ env.ARCH }}/configs/${{ env.KERNEL_CONFIG }}
 
@@ -696,13 +696,13 @@ jobs:
       uses: actions/upload-artifact@v4
       with:
         name: Drivers${{ env.LOCALVERSION }}${{ env.UPLOADNAME }}-${{ env.DEVICE }}-${{ env.BUILD_TIME }}
-        path: kernel_workspace/android-kernel/out/drivers/*
+        path: kernel_workspace/android-kernel/out/drivers/**/*.ko
 
     - name: Upload KernelSU lkm
       if: env.CHECK_KERNELSU_LKM_IS_OK == 'true'
       uses: actions/upload-artifact@main
       with:
-        name: kernel
+        name: KernelSU${{ env.LOCALVERSION }}${{ env.UPLOADNAME }}-${{ env.DEVICE }}-${{ env.BUILD_TIME }}
         path: |
           kernel_workspace/android-kernel/out/drivers/kernelsu/kernelsu.ko