diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 1cbe220c..ef8008c1 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -10,12 +10,16 @@ jobs:
   unit-test:
     strategy:
       fail-fast: true
-
+    
     name: unit-test
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 
+      - uses: actions/setup-go@v4
+        with:
+          go-version: '1.21'
+
       - name: Cache dependencies
         uses: actions/cache@v3
         with:
@@ -39,14 +43,36 @@ jobs:
       - name: Run tests
         run: cargo test --workspace --exclude hpl-tests
 
+  artifact:
+    permissions:
+      contents: write
+      pull-requests: write
+
+    name: artifact
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      
+      - name: Install Dependencies
+        run: |
+          rustup update 1.72
+          sudo apt-get install -y rename
+          make install
+
+      - name: Setup Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
       - name: Build wasm
         run: make ci-build
 
-      - name: Upload wasm archive
-        uses: actions/upload-artifact@v2
+      - name: Pull request artifacts
+        uses: gavv/pull-request-artifacts@v2
         with:
-          name: wasm_codes
-          path: wasm_codes.zip
+          commit: ${{ github.event.pull_request.head.sha }}
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          artifacts-branch: artifacts
+          artifacts: |
+            wasm_codes.zip
 
   coverage:
     runs-on: ubuntu-latest
@@ -54,12 +80,15 @@ jobs:
       CARGO_TERM_COLOR: always
     steps:
       - uses: actions/checkout@v4
-
+      
+      - uses: actions/setup-go@v4
+        with:
+          go-version: '1.21'
+      
       - name: Install Rust
-        run: rustup update nightly
-
-      - name: Install target
-        run: rustup target add wasm32-unknown-unknown
+        run: |
+          rustup update nightly
+          rustup target add wasm32-unknown-unknown
 
       - name: Install cargo-llvm-cov
         uses: taiki-e/install-action@cargo-llvm-cov
diff --git a/Cargo.toml b/Cargo.toml
index 9ef3ffa3..7fa7f06c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -82,8 +82,8 @@ digest = { version = "0.10.7" }
 # testing
 cw-multi-test = "0.20.0"
 rstest = "0.18.2"
-test-tube = { version = "0.3.0" }
-osmosis-test-tube = { version = "21.0.0" }
+test-tube = { version = "0.5.0" }
+osmosis-test-tube = { version = "22.1.0" }
 ibcx-test-utils = { version = "0.1.2" }
 
 tokio = { version = "1", features = ["full"] }
diff --git a/Makefile b/Makefile
index a7b1cf3e..31bcc6cf 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,12 @@
+PWD:=$(shell pwd)
+BASE:=$(shell basename "$(PWD)")
+
 clean:
 	@cargo clean
 	@rm -rf ./artifacts
 
 install:
-	cargo install --force cw-optimizoor cosmwasm-check beaker
+	cargo install --force cosmwasm-check
 	rustup target add wasm32-unknown-unknown
 
 schema:
@@ -12,7 +15,10 @@ schema:
 build:
 	cargo build
 	cargo wasm
-	cargo cw-optimizoor
+	docker run --rm -v "$(PWD)":/code \
+		--mount type=volume,source="$(BASE)_cache",target=/code/target \
+		--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
+		cosmwasm/optimizer:0.15.0
 	rename --force 's/(.*)-(.*)\.wasm/$$1\.wasm/d' artifacts/*
 
 check: build