diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 08fcbeae0..bc347e006 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -82,22 +82,22 @@ jobs:
               working-directory: ${{ env.FLUTTER_ROOT }}
               # https://github.com/flutter/flutter/issues/182281
               run: |
-                git config --global user.name "ci"
-                git config --global user.email "example@example.com"
-                git stash || true
-                git revert 362b1de29974ffc1ed6faa826e1df870d7bec75f --no-edit
-                git reset --soft HEAD~1
-                git stash pop || true
+                  git config --global user.name "ci"
+                  git config --global user.email "example@example.com"
+                  git stash || true
+                  git revert 362b1de29974ffc1ed6faa826e1df870d7bec75f --no-edit
+                  git reset --soft HEAD~1
+                  git stash pop || true
               continue-on-error: true
 
             - name: apply bottom sheet patch
               working-directory: ${{ env.FLUTTER_ROOT }}
-              run: git apply $GITHUB_WORKSPACE/lib/scripts/bottom_sheet_patch.diff
+              run: git apply $GITHUB_WORKSPACE/lib/scripts/bottom_sheet_patch.diff || true
               continue-on-error: true
 
             - name: apply modal barrier patch
               working-directory: ${{ env.FLUTTER_ROOT }}
-              run: git apply $GITHUB_WORKSPACE/lib/scripts/modal-barrier-patch.diff
+              run: git apply $GITHUB_WORKSPACE/lib/scripts/modal-barrier-patch.diff || true
               continue-on-error: true
 
             - name: Write key
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
index 915f9c5f0..75566e3f9 100644
--- a/.github/workflows/ios.yml
+++ b/.github/workflows/ios.yml
@@ -32,7 +32,7 @@ jobs:
 
       - name: apply modal barrier patch
         working-directory: ${{ env.FLUTTER_ROOT }}
-        run: git apply $GITHUB_WORKSPACE/lib/scripts/modal-barrier-patch.diff
+        run: git apply $GITHUB_WORKSPACE/lib/scripts/modal-barrier-patch.diff || true
         continue-on-error: true
 
       - name: Build iOS
diff --git a/.github/workflows/linux_x64.yml b/.github/workflows/linux_x64.yml
index 2964dfca5..bda991d19 100644
--- a/.github/workflows/linux_x64.yml
+++ b/.github/workflows/linux_x64.yml
@@ -53,7 +53,7 @@ jobs:
 
       - name: apply modal barrier patch
         working-directory: ${{ env.FLUTTER_ROOT }}
-        run: git apply $GITHUB_WORKSPACE/lib/scripts/modal-barrier-patch.diff
+        run: git apply $GITHUB_WORKSPACE/lib/scripts/modal-barrier-patch.diff || true
         continue-on-error: true
 
         #TODO: deb and rpm packages need to be build
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index 0c3a48deb..3a47ce113 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -32,7 +32,7 @@ jobs:
 
       - name: apply modal barrier patch
         working-directory: ${{ env.FLUTTER_ROOT }}
-        run: git apply $GITHUB_WORKSPACE/lib/scripts/modal-barrier-patch.diff
+        run: git apply $GITHUB_WORKSPACE/lib/scripts/modal-barrier-patch.diff || true
         continue-on-error: true
 
       - name: Build Mac
@@ -41,7 +41,7 @@ jobs:
       - name: Prepare Upload
         run: |
           npm install --global create-dmg
-          create-dmg build/macos/Build/Products/Release/PiliPlus.app
+          create-dmg build/macos/Build/Products/Release/PiliPlus.app || true
         continue-on-error: true
 
       - name: Rename DMG
diff --git a/.github/workflows/win_x64.yml b/.github/workflows/win_x64.yml
index c3cb9cd34..9aaa8979e 100644
--- a/.github/workflows/win_x64.yml
+++ b/.github/workflows/win_x64.yml
@@ -28,7 +28,7 @@ jobs:
 
       - name: apply modal barrier patch
         working-directory: ${{ env.FLUTTER_ROOT }}
-        run: git apply $env:GITHUB_WORKSPACE\lib\scripts\modal-barrier-patch.diff
+        run: git apply $env:GITHUB_WORKSPACE\lib\scripts\modal-barrier-patch.diff || true
         shell: pwsh
         continue-on-error: true