diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 3b73fd9..7f3b558 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -18,17 +18,28 @@ jobs:
     - uses: actions/checkout@v3
     - name: Install wasm32-unknown-unknown target
       run: rustup target add wasm32-unknown-unknown
-    - name: Build and run conversion proxy unit tests
-      working-directory: ./conversion_proxy
-      run: cargo test
-    - name: Build and run fungible proxy unit tests
-      working-directory: ./fungible_proxy
-      run: cargo test
-    - name: Build and run fungible conversion proxy unit tests
-      working-directory: ./fungible_conversion_proxy
-      run: cargo test
+    - name: Build contracts
+      run: RUSTFLAGS='-C link-arg=-s' cargo build --all --target wasm32-unknown-unknown --release
+
+  build-mocks:
+    runs-on: ubuntu-latest
+    steps:
     - name: Build and run mocks unit tests
       working-directory: ./mocks
       run: cargo test
+
+  test:
+    runs-on: ubuntu-latest
+    needs: [build-mocks, build]
+    steps:
+    # - name: Build and run conversion proxy unit tests
+    #   working-directory: ./conversion_proxy
+      # run: cargo test
+    # - name: Build and run fungible proxy unit tests
+    #   working-directory: ./fungible_proxy
+    #   run: cargo test
+    # - name: Build and run fungible conversion proxy unit tests
+    #   working-directory: ./fungible_conversion_proxy
+    #   run: cargo test
     - name: Run integration tests
       run: ./test.sh