diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 0ac5b1268..3e84ca4d3 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -13,9 +13,10 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build:
-    name: Build
+  circuits-test:
+    name: Circuits Test
     runs-on: ubuntu-22.04
+    timeout-minutes: 30
     steps:
       - name: Check out repository code
         uses: actions/checkout@v3  
@@ -37,100 +38,97 @@ jobs:
         run: yarn
       - name: Build
         run: yarn build
-      - uses: actions/upload-artifact@v3
-        with:
-          name: unirep-social
-          path: ./
-    
-  circuits-test:
-    name: Circuits Test
-    runs-on: ubuntu-22.04
-    needs: build
-    steps:
-      # - name: Check out repository code
-      #   uses: actions/checkout@v3  
-      # - name: Install node.js
-      #   uses: actions/setup-node@v3
-      #   with:
-      #     node-version: '16'
-      # - name: Install circom
-      #   run: |
-      #     curl --proto '=https' --tlsv1.2 https://sh.rustup.rs -sSf | sh -s -- -y
-      #     source "$HOME/.cargo/env"
-      #     ls -R
-      #     cd /tmp
-      #     git clone https://github.com/iden3/circom.git
-      #     cd circom
-      #     cargo build --release
-      #     cargo install --path circom
-      # - name: Install packages
-      #   run: yarn
-      - uses: actions/download-artifact@v3
-        with:
-          name: unirep-social
       - name: Test
         run: yarn circuits test
     
   contracts-test:
     name: Contracts Test
     runs-on: ubuntu-22.04
-    needs: build
+    timeout-minutes: 30
     steps:
-      # - name: Check out repository code
-      #   uses: actions/checkout@v3  
-      # - name: Install node.js
-      #   uses: actions/setup-node@v3
-      #   with:
-      #     node-version: '16'
-      # - name: Install packages
-      #   run: yarn
-      - uses: actions/download-artifact@v3
+      - name: Check out repository code
+        uses: actions/checkout@v3  
+      - name: Install node.js
+        uses: actions/setup-node@v3
         with:
-          name: unirep-social
+          node-version: '16'
+      - name: Install circom
+        run: |
+          curl --proto '=https' --tlsv1.2 https://sh.rustup.rs -sSf | sh -s -- -y
+          source "$HOME/.cargo/env"
+          ls -R
+          cd /tmp
+          git clone https://github.com/iden3/circom.git
+          cd circom
+          cargo build --release
+          cargo install --path circom
+      - name: Install packages
+        run: yarn
+      - name: Build
+        run: yarn build
       - name: Test
         run: yarn contracts test
   
   relay-test:
     name: Relay Test
     runs-on: ubuntu-22.04
-    needs: build
+    timeout-minutes: 30
     steps:
-      # - name: Check out repository code
-      #   uses: actions/checkout@v3  
-      # - name: Install node.js
-      #   uses: actions/setup-node@v3
-      #   with:
-      #     node-version: '16'
-      # - name: Install packages
-      #   run: yarn
-      - uses: actions/download-artifact@v3
+      - name: Check out repository code
+        uses: actions/checkout@v3  
+      - name: Install node.js
+        uses: actions/setup-node@v3
         with:
-          name: unirep-social
+          node-version: '16'
+      - name: Install circom
+        run: |
+          curl --proto '=https' --tlsv1.2 https://sh.rustup.rs -sSf | sh -s -- -y
+          source "$HOME/.cargo/env"
+          ls -R
+          cd /tmp
+          git clone https://github.com/iden3/circom.git
+          cd circom
+          cargo build --release
+          cargo install --path circom
+      - name: Install packages
+        run: yarn
+      - name: Build
+        run: yarn build
       - name: Test
         run: yarn relay test
     
   frontend-test:
     name: Frontend Test
     runs-on: ubuntu-22.04
-    needs: build
+    timeout-minutes: 30
     steps:
-      # - name: Check out repository code
-      #   uses: actions/checkout@v3  
-      # - name: Install node.js
-      #   uses: actions/setup-node@v3
-      #   with:
-      #     node-version: '16'
-      # - name: Install packages
-      #   run: yarn
-      - uses: actions/download-artifact@v3
+      - name: Check out repository code
+        uses: actions/checkout@v3  
+      - name: Install node.js
+        uses: actions/setup-node@v3
         with:
-          name: unirep-social
+          node-version: '16'
+      - name: Install circom
+        run: |
+          curl --proto '=https' --tlsv1.2 https://sh.rustup.rs -sSf | sh -s -- -y
+          source "$HOME/.cargo/env"
+          ls -R
+          cd /tmp
+          git clone https://github.com/iden3/circom.git
+          cd circom
+          cargo build --release
+          cargo install --path circom
+      - name: Install packages
+        run: yarn
+      - name: Build
+        run: yarn build
       - name: Test
         run: yarn frontend test
     
   lint:
     name: Lint
     runs-on: ubuntu-22.04
+    timeout-minutes: 10
     steps:
       - name: Check out repository code
         uses: actions/checkout@v3