diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 79535c9344..6ab2490ce6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,7 +21,12 @@ jobs:
       - name: 'Decontaminate previous build leftovers'
         run: |
           if [ -d .git ]; then
-            git submodule status || git checkout "$(git rev-list --max-parents=0 HEAD | tail -n 1)"
+            git submodule status || (
+              git ls-files --stage | egrep '^160000' | awk '{print $4}' | while read submodule
+              do
+                git rm -rf --cached "$submodule"
+              done
+            )
           fi
 
       - name: 'Checkout code'
diff --git a/.github/workflows/lint_and_submodule_check.yml b/.github/workflows/lint_and_submodule_check.yml
index ede3579326..46cca5c0dc 100644
--- a/.github/workflows/lint_and_submodule_check.yml
+++ b/.github/workflows/lint_and_submodule_check.yml
@@ -21,7 +21,12 @@ jobs:
       - name: 'Decontaminate previous build leftovers'
         run: |
           if [ -d .git ]; then
-            git submodule status || git checkout "$(git rev-list --max-parents=0 HEAD | tail -n 1)"
+            git submodule status || (
+              git ls-files --stage | egrep '^160000' | awk '{print $4}' | while read submodule
+              do
+                git rm -rf --cached "$submodule"
+              done
+            )
           fi
 
       - name: 'Checkout code'
diff --git a/.github/workflows/merge_report.yml b/.github/workflows/merge_report.yml
index 3b7cd23499..e88346edf5 100644
--- a/.github/workflows/merge_report.yml
+++ b/.github/workflows/merge_report.yml
@@ -15,7 +15,12 @@ jobs:
       - name: 'Decontaminate previous build leftovers'
         run: |
           if [ -d .git ]; then
-            git submodule status || git checkout "$(git rev-list --max-parents=0 HEAD | tail -n 1)"
+            git submodule status || (
+              git ls-files --stage | egrep '^160000' | awk '{print $4}' | while read submodule
+              do
+                git rm -rf --cached "$submodule"
+              done
+            )
           fi
 
       - name: 'Checkout code'
diff --git a/.github/workflows/pvs_studio.yml b/.github/workflows/pvs_studio.yml
index 9105a0fd63..65ffd19546 100644
--- a/.github/workflows/pvs_studio.yml
+++ b/.github/workflows/pvs_studio.yml
@@ -22,7 +22,12 @@ jobs:
       - name: 'Decontaminate previous build leftovers'
         run: |
           if [ -d .git ]; then
-            git submodule status || git checkout "$(git rev-list --max-parents=0 HEAD | tail -n 1)"
+            git submodule status || (
+              git ls-files --stage | egrep '^160000' | awk '{print $4}' | while read submodule
+              do
+                git rm -rf --cached "$submodule"
+              done
+            )
           fi
 
       - name: 'Checkout code'
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
index bed5a470d5..6f044ebcae 100644
--- a/.github/workflows/unit_tests.yml
+++ b/.github/workflows/unit_tests.yml
@@ -15,7 +15,12 @@ jobs:
       - name: 'Decontaminate previous build leftovers'
         run: |
           if [ -d .git ]; then
-            git submodule status || git checkout "$(git rev-list --max-parents=0 HEAD | tail -n 1)"
+            git submodule status || (
+              git ls-files --stage | egrep '^160000' | awk '{print $4}' | while read submodule
+              do
+                git rm -rf --cached "$submodule"
+              done
+            )
           fi
 
       - name: Checkout code
@@ -32,7 +37,7 @@ jobs:
       - name: 'Flash unit tests firmware'
         id: flashing
         if: success()
-        run: |                               
+        run: |
           ./fbt flash OPENOCD_ADAPTER_SERIAL=2A0906016415303030303032 FIRMWARE_APP_SET=unit_tests FORCE=1
 
       - name: 'Wait for flipper and format ext'
diff --git a/.github/workflows/updater_test.yml b/.github/workflows/updater_test.yml
index eba34e988b..c04d526fc7 100644
--- a/.github/workflows/updater_test.yml
+++ b/.github/workflows/updater_test.yml
@@ -15,7 +15,12 @@ jobs:
       - name: 'Decontaminate previous build leftovers'
         run: |
           if [ -d .git ]; then
-            git submodule status || git checkout "$(git rev-list --max-parents=0 HEAD | tail -n 1)"
+            git submodule status || (
+              git ls-files --stage | egrep '^160000' | awk '{print $4}' | while read submodule
+              do
+                git rm -rf --cached "$submodule"
+              done
+            )
           fi
 
       - name: Checkout code