diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index 554e2f36a..6f10fe94d 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -77,6 +77,10 @@ jobs:
               return { "ref": context.ref }
             return { "ref": context.payload.pull_request.head.sha }
 
+      # Make sure directories of potentially removed submodules are cleaned correctly
+      - name: Cleanup git submodules
+        run: find . -name .git -type f -exec rm {} \;
+
       - name: Checkout source
         uses: actions/checkout@v2
         with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 110bb4db3..67d745556 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -59,6 +59,10 @@ jobs:
     runs-on: ${{ matrix.board.runner }}
 
     steps:
+      # Make sure directories of potentially removed submodules are cleaned correctly
+      - name: Cleanup git submodules
+        run: find . -name .git -type f -exec rm {} \;
+
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
         with: