diff --git a/.github/workflows/fns.sh b/.github/workflows/fns.sh
new file mode 100644
index 0000000..4eeffb7
--- /dev/null
+++ b/.github/workflows/fns.sh
@@ -0,0 +1,74 @@
+#!/bin/bash
+
+vercomp () {
+  if [[ $1 == $2 ]]; then
+    export vercomp_last_result=0
+    return $vercomp_last_result
+  fi
+  local IFS=.
+  local i ver1=($1) ver2=($2)
+  # fill empty fields in ver1 with zeros
+  for ((i=${#ver1[@]}; i<${#ver2[@]}; i++))
+  do
+      ver1[i]=0
+  done
+  for ((i=0; i<${#ver1[@]}; i++))
+  do
+      if [[ -z ${ver2[i]} ]]; then
+          # fill empty fields in ver2 with zeros
+          ver2[i]=0
+      fi
+      if ((10#${ver1[i]} > 10#${ver2[i]})); then
+        export vercomp_last_result=1
+        return $vercomp_last_result
+      fi
+      if ((10#${ver1[i]} < 10#${ver2[i]})); then
+        export vercomp_last_result=2
+        return $vercomp_last_result
+      fi
+  done
+    export vercomp_last_result=0
+  return $vercomp_last_result
+}
+
+install_fibjs() {
+    local version=$1
+    if [[ -z "$version" ]]; then
+        echo "[install_fibjs] version is required"
+        exit 1
+    fi
+    local os=$2
+    if [[ -z "$os" ]]; then
+        echo "[install_fibjs] os is required"
+        exit 1
+    fi
+    local arch=$3
+    if [[ -z "$arch" ]]; then
+        echo "[install_fibjs] arch is required"
+        exit 1
+    fi
+
+    local url_base="https://github.com/fibjs/fibjs/releases/download/v${version}/fibjs-v${version}-${os}-${arch}"
+
+    # in fact, there's also non-archived linux fibjs
+    if [[ "$RUNNER_OS" == "Linux" ]]; then
+        if [ "$lower_than_0_37_0" == "true" ]; then
+            local remote_url="${url_base}.xz"
+            curl -SL "$remote_url" -o ./node_modules/.bin/fibjs.xz;
+            xz -d ./node_modules/.bin/fibjs.xz;
+        else
+            local remote_url="${url_base}.tar.gz"
+            curl -SL "$remote_url" -o ./node_modules/.bin/fibjs.tar.gz;
+            tar -xzf ./node_modules/.bin/fibjs.tar.gz -C ./node_modules/.bin;
+        fi
+        chmod a+x ./node_modules/.bin/fibjs;
+    elif [[ "$RUNNER_OS" == "macOS" ]]; then
+        local remote_url="${url_base}"
+        curl -SL "$remote_url" -o ./node_modules/.bin/fibjs;
+        chmod a+x ./node_modules/.bin/fibjs;
+    else
+        local remote_url="${url_base}.exe"
+        curl -SL "$remote_url" -o ./node_modules/.bin/fibjs.exe;
+    fi
+    echo "[install_fibjs] Downloading fibjs from ${remote_url}"
+}
diff --git a/.github/workflows/run-ci.yml b/.github/workflows/run-ci.yml
index 60e9dcb..40852da 100644
--- a/.github/workflows/run-ci.yml
+++ b/.github/workflows/run-ci.yml
@@ -24,14 +24,38 @@ jobs:
     continue-on-error: true
     strategy:
       matrix:
-        os: [ubuntu-18.04, windows-2019, macos-10.15]
-        version: [0.33.0, 0.34.0]
-        arch: [amd64, i386]
-        exclude:
-          - os: windows-2019
-            arch: i386
-          - os: macos-10.15
-            arch: i386
+        include:
+        - os: windows-2019
+          arch: x64
+          fibjs: 0.36.0
+        - os: windows-2019
+          arch: x64
+          fibjs: 0.37.0
+        - os: windows-2019
+          arch: x86
+          fibjs: 0.36.0
+        - os: windows-2019
+          arch: x86
+          fibjs: 0.37.0
+        - os: ubuntu-20.04
+          arch: x64
+          fibjs: 0.36.0
+        - os: ubuntu-20.04
+          arch: x64
+          fibjs: 0.37.0
+        - os: ubuntu-20.04
+          arch: x86
+          fibjs: 0.36.0
+        - os: ubuntu-20.04
+          arch: x86
+          fibjs: 0.37.0
+        - os: macos-13
+          arch: x64
+          fibjs: 0.36.0
+        - os: macos-13
+          arch: x64
+          fibjs: 0.37.0
+        
 
     steps:
       - name: Check out Git repository
@@ -41,7 +65,7 @@ jobs:
 
       - uses: actions/setup-node@v2
         with:
-          node-version: '14'
+          node-version: '16'
 
       - name: Set Env Variables
         id: set-env-vars
@@ -51,26 +75,20 @@ jobs:
         env:
           ARCH: ${{ matrix.arch }}
           OS: ${{ matrix.os }}
+          FIBJS_VERSION: ${{ matrix.fibjs }}
 
       - name: Install FIBJS
         shell: bash
         run: |
           mkdir -p ./node_modules/.bin;
           rm -rf ./node_modules/.bin/fibjs;
-          if [[ "$RUNNER_OS" == "Linux" ]]; then
-            curl -SL "https://github.com/fibjs/fibjs/releases/download/v${FIBJS_VERSION}/fibjs-v${FIBJS_VERSION}-${FIBJS_OS}-${FIBJS_ARCH}.xz" -o ./node_modules/.bin/fibjs.xz;
-            xz -d ./node_modules/.bin/fibjs.xz;
-            chmod a+x ./node_modules/.bin/fibjs;
-          elif [[ "$RUNNER_OS" == "macOS" ]]; then
-            curl -SL "https://github.com/fibjs/fibjs/releases/download/v${FIBJS_VERSION}/fibjs-v${FIBJS_VERSION}-${FIBJS_OS}-${FIBJS_ARCH}" -o ./node_modules/.bin/fibjs;
-            chmod a+x ./node_modules/.bin/fibjs;
-          else
-            curl -SL "https://github.com/fibjs/fibjs/releases/download/v${FIBJS_VERSION}/fibjs-v${FIBJS_VERSION}-${FIBJS_OS}-${FIBJS_ARCH}.exe" -o ./node_modules/.bin/fibjs.exe;
-          fi
+          . ./.github/workflows/fns.sh --source-only
+          install_fibjs $FIBJS_VERSION $FIBJS_OS $FIBJS_ARCH;
         env:
           FIBJS_OS: ${{ steps.set-env-vars.outputs.FIBJS_OS }}
           FIBJS_ARCH: ${{ steps.set-env-vars.outputs.FIBJS_ARCH }}
-          FIBJS_VERSION: ${{ matrix.version }}
+          lower_than_0_37_0: ${{ steps.set-env-vars.outputs.lower_than_0_37_0 }}
+          FIBJS_VERSION: ${{ matrix.fibjs }}
 
       - name: Run CI
         shell: bash
diff --git a/.github/workflows/set-env-vars.sh b/.github/workflows/set-env-vars.sh
index 9798ca8..64bb0c3 100644
--- a/.github/workflows/set-env-vars.sh
+++ b/.github/workflows/set-env-vars.sh
@@ -1,3 +1,5 @@
+. ./.github/workflows/fns.sh --source-only
+
 export GIT_BRANCH=${GITHUB_REF#refs/heads/}
 echo "::set-output name=GIT_BRANCH::$GIT_BRANCH"
 export GIT_TAG=$(git tag | grep $(git describe --tags HEAD))
@@ -25,9 +27,23 @@ if [ -z "$IS_GIT_TAG_MATCH_SEMVER" ]; then
 fi
 echo "::set-output name=RELEASE_TAG::$RELEASE_TAG";
 
+vercomp "${FIBJS_VERSION}" "0.37.0"
+if [[ "$vercomp_last_result" -eq "2" ]]; then
+    export lower_than_0_37_0="true"
+else
+    export lower_than_0_37_0="false"
+fi
+
+echo "::set-output name=lower_than_0_37_0::$lower_than_0_37_0";
+
 case "${RUNNER_OS}" in
     Windows)
-        export FIBJS_OS=windows
+        # lower than 0.37.0
+        if [[ "$lower_than_0_37_0" == "true" ]]; then
+            export FIBJS_OS=windows
+        else
+            export FIBJS_OS=win32
+        fi
         ;;
     macOS)
         export FIBJS_OS=darwin
@@ -43,10 +59,14 @@ esac
 echo "::set-output name=FIBJS_OS::$FIBJS_OS";
 
 case "${ARCH}" in
-    i386)
-        export FIBJS_ARCH=x86
+    i386|ia32|x86)
+        if [[ "$lower_than_0_37_0" == "true" ]]; then
+            export FIBJS_ARCH=x86
+        else
+            export FIBJS_ARCH=ia32
+        fi
         ;;
-    amd64)
+    amd64|x64)
         export FIBJS_ARCH=x64
         ;;
     *)
diff --git a/.gitignore b/.gitignore
index 8fcab7d..6251be4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,4 +9,6 @@ cov-out
 
 lib
 
-docs/.vuepress/dist
\ No newline at end of file
+docs/.vuepress/dist
+
+package-lock.json
\ No newline at end of file
diff --git a/package.json b/package.json
index 98cc4db..d29fc01 100644
--- a/package.json
+++ b/package.json
@@ -63,6 +63,11 @@
     "version": [
       "0.36.0",
       "0.37.0"
+    ],
+    "os": [
+      "windows-2019",
+      "ubuntu-20.04",
+      "macos-13"
     ]
   }
 }