diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index ff1ecb64..05bf8215 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -78,14 +78,35 @@ jobs:
           - cc
           - un
           - iec
-          - iho
-          # - m3aawg
-          # - jcgm
           - csa
           - bipm
-          # - itu
           - ietf
           - ogc
+        include:
+          - os: ubuntu-18.04
+            test-flavor: m3aawg
+            ignore-errors: true
+          - os: ubuntu-18.04
+            test-flavor: jcgm
+            ignore-errors: true
+          - os: ubuntu-18.04
+            test-flavor: itu
+            ignore-errors: true
+          - os: ubuntu-18.04
+            test-flavor: iho
+            ignore-errors: true
+          - os: ubuntu-20.04
+            test-flavor: m3aawg
+            ignore-errors: true
+          - os: ubuntu-20.04
+            test-flavor: jcgm
+            ignore-errors: true
+          - os: ubuntu-20.04
+            test-flavor: itu
+            ignore-errors: true
+          - os: ubuntu-20.04
+            test-flavor: iho
+            ignore-errors: true
     steps:
       - uses: actions/checkout@v2
 
@@ -94,6 +115,12 @@ jobs:
           name: metanorma-linux
           path: build
 
+      - uses: actions/cache@v2
+        with:
+          path: ~/.relaton
+          key: relaton-linux-${{ matrix.test-flavor }}
+          restore-keys: relaton-linux-${{ matrix.test-flavor }}
+
       - run: chmod +x build/metanorma
 
       - name: Test processing for ${{ matrix.test-flavor }}
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 5f33c081..6641cfff 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -68,13 +68,20 @@ jobs:
           - un
           - iec
           - iho
-          # - m3aawg
-          # - jcgm
           - csa
           - bipm
-          # - itu
           - ietf
           - ogc
+        include:
+          - os: macos-11.0
+            test-flavor: m3aawg
+            ignore-errors: true
+          - os: macos-11.0
+            test-flavor: jcgm
+            ignore-errors: true
+          - os: macos-11.0
+            test-flavor: itu
+            ignore-errors: true
     steps:
       - uses: actions/checkout@v2
 
@@ -83,6 +90,12 @@ jobs:
           name: metanorma-macos
           path: build
 
+      - uses: actions/cache@v2
+        with:
+          path: ~/.relaton
+          key: relaton-macos-${{ matrix.test-flavor }}
+          restore-keys: relaton-macos-${{ matrix.test-flavor }}
+
       - run: chmod a+x build/metanorma
 
       - name: Test processing for ${{ matrix.test-flavor }}
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 9dea24ed..57a9fb09 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -65,20 +65,26 @@ jobs:
           - un
           - iec
           - iho
-          # - m3aawg
-          # - jcgm
           - csa
           - bipm
-          # - itu
           - ietf
           - ogc
-        # include:
-        #   # timeout www.iso.com happens
-        #   - test-flavor: itu
-        #     ignore-errors: true
+        include:
+          - test-flavor: m3aawg
+            ignore-errors: true
+          - test-flavor: jcgm
+            ignore-errors: true
+          - test-flavor: itu
+            ignore-errors: true
     steps:
       - uses: actions/checkout@v2
 
+      - uses: actions/cache@v2
+        with:
+          path: ~/.relaton
+          key: relaton-windows-${{ matrix.test-flavor }}
+          restore-keys: relaton-windows-${{ matrix.test-flavor }}
+
       - uses: actions/download-artifact@v2
         with:
           name: metanorma-windows
@@ -100,6 +106,9 @@ jobs:
           GITHUB_CREDENTIALS: "metanorma-ci:${{ secrets.METANORMA_CI_PAT_TOKEN }}"
           TEST_FLAVOR: ${{ matrix.test-flavor }}
 
+      - run: |
+          Get-ChildItem -Path ".\site" -Recurse -Force | Where-Object { $_.PSIsContainer -eq $false -and $_.Length -eq 0 }  | Remove-Item
+
       - uses: actions/upload-artifact@v2
         with:
           name: site