diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7f18da6a43915..4c63ffdb635c3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,8 +14,9 @@ jobs:
     steps:
       - name: Checkout sources
         uses: actions/checkout@v2
-        with:
-          submodules: true
+
+      - name: Fetch grammars
+        uses: ./scripts/grammars sync
 
       - name: Install stable toolchain
         uses: actions-rs/toolchain@v1
@@ -53,8 +54,9 @@ jobs:
     steps:
       - name: Checkout sources
         uses: actions/checkout@v2
-        with:
-          submodules: true
+
+      - name: Fetch grammars
+        uses: ./scripts/grammars sync
 
       - name: Install stable toolchain
         uses: actions-rs/toolchain@v1
@@ -97,8 +99,9 @@ jobs:
     steps:
       - name: Checkout sources
         uses: actions/checkout@v2
-        with:
-          submodules: true
+
+      - name: Fetch grammars
+        uses: ./scripts/grammars sync
 
       - name: Install stable toolchain
         uses: actions-rs/toolchain@v1
@@ -144,8 +147,9 @@ jobs:
     steps:
       - name: Checkout sources
         uses: actions/checkout@v2
-        with:
-          submodules: true
+
+      - name: Fetch grammars
+        uses: ./scripts/grammars sync
 
       - name: Install stable toolchain
         uses: actions-rs/toolchain@v1
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7b0b7ee244980..12818571bf029 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -53,8 +53,9 @@ jobs:
     steps:
       - name: Checkout sources
         uses: actions/checkout@v2
-        with:
-          submodules: true
+
+      - name: Fetch grammars
+        uses: ./scripts/grammars sync
 
       - name: Install ${{ matrix.rust }} toolchain
         uses: actions-rs/toolchain@v1
@@ -114,8 +115,9 @@ jobs:
     steps:
       - name: Checkout sources
         uses: actions/checkout@v2
-        with:
-          submodules: false
+
+      - name: Fetch grammars
+        uses: ./scripts/grammars sync
 
       - uses: actions/download-artifact@v2
         # with: