diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml
index 56119ec9c..7ef5cc1df 100644
--- a/.github/workflows/debian.yml
+++ b/.github/workflows/debian.yml
@@ -43,16 +43,22 @@ jobs:
 
         cd linux
 
-        # apply surface build patches
+        # apply surface build/packaging patches
         for PATCH in ../*.patch; do
-          git am ${PATCH}
+          patch -p1 < ${PATCH}
         done
 
+        git add .
+        git commit --allow-empty -m "Apply linux-surface packaging patches"
+
         # apply surface patches
         for PATCH in ../../../../patches/${KERNEL_VERSION%.*}/*.patch; do
-          git am ${PATCH}
+          patch -p1 < ${PATCH}
         done
 
+        git add .
+        git commit --allow-empty -m "Apply linux-surface patches"
+
     - name: Configure
       run: |
         cd pkg/debian/kernel/linux
diff --git a/.github/workflows/debian_lts.yml b/.github/workflows/debian_lts.yml
index 7de5c53bf..516a604d2 100644
--- a/.github/workflows/debian_lts.yml
+++ b/.github/workflows/debian_lts.yml
@@ -43,16 +43,22 @@ jobs:
 
         cd linux
 
-        # apply surface build patches
+        # apply surface build/packaging patches
         for PATCH in ../*.patch; do
-          git am ${PATCH}
+          patch -p1 < ${PATCH}
         done
 
+        git add .
+        git commit --allow-empty -m "Apply linux-surface packaging patches"
+
         # apply surface patches
         for PATCH in ../../../../patches/${KERNEL_VERSION%.*}/*.patch; do
-          git am ${PATCH}
+          patch -p1 < ${PATCH}
         done
 
+        git add .
+        git commit --allow-empty -m "Apply linux-surface patches"
+
     - name: Configure
       run: |
         cd pkg/debian/kernel-lts/linux