diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index df24a811..d30d79d4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -31,6 +31,10 @@ jobs:
         run: |
           apk add --no-cache tar git
 
+      - name: Potential broken submodules fix
+        run: |
+          git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :
+
       - uses: actions/checkout@v2
         name: Checkout Repository
 
diff --git a/.github/workflows/slow-tests.yml b/.github/workflows/slow-tests.yml
index 2aa19c0d..91e7c441 100644
--- a/.github/workflows/slow-tests.yml
+++ b/.github/workflows/slow-tests.yml
@@ -31,6 +31,10 @@ jobs:
         run: |
           apk add --no-cache tar git
 
+      - name: Potential broken submodules fix
+        run: |
+          git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :
+
       - uses: actions/checkout@v2
         name: Checkout Repository