diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml
index 84c8bf7d..64640af6 100644
--- a/.github/workflows/cooker-selfhosted.yml
+++ b/.github/workflows/cooker-selfhosted.yml
@@ -64,7 +64,7 @@ jobs:
       # if the branch is coming from a PR the tag should be manually built
       - name: "Generate version tag"
         run: |
-          source automation_tools/version_extractor.sh
+          /bin/bash automation_tools/version_extractor.sh
           echo "MANIFEST_VERSION=$($fetch_manifest_version)" >> $GITHUB_ENV
           if [[ "$BRANCH_NAME" == 'refs/'* ]]; then
             pr_number=$(echo ${{env.BRANCH_NAME}} | awk -F'/' '{print $3}')
@@ -163,6 +163,7 @@ jobs:
 
       - name: Rewrite Tag
         run: |
+          git submodule deinit -f --all
           git fetch --tags
           if git rev-parse --verify "${{ env.TAG }}" >/dev/null 2>&1; then # if the tag exists
               git tag -d "${{ env.TAG }}"                                  # remove it from local repo
diff --git a/.github/workflows/main-selfhosted.yml b/.github/workflows/main-selfhosted.yml
index 3626ff93..a98b3360 100644
--- a/.github/workflows/main-selfhosted.yml
+++ b/.github/workflows/main-selfhosted.yml
@@ -117,6 +117,7 @@ jobs:
 
       - name: Rewrite Tag
         run: |
+          git submodule deinit -f --all
           git fetch --tags
           if git rev-parse --verify "${{ env.REL_VER }}" >/dev/null 2>&1; then # if the tag exists
               git tag -d "${{ env.REL_VER }}"                                  # remove it from local repo