diff --git a/.github/workflows/check_artifacts.yml b/.github/workflows/check_artifacts.yml
index bf7d734..e8858f4 100644
--- a/.github/workflows/check_artifacts.yml
+++ b/.github/workflows/check_artifacts.yml
@@ -22,11 +22,6 @@ jobs:
           access_token: ${{ github.token }}
 
       - uses: actions/checkout@v3
-      - uses: webfactory/ssh-agent@v0.7.0
-        with:
-          ssh-private-key: |
-            ${{ secrets.GOV_PRIVATE_KEY }}
-            ${{ secrets.CORE_PRIVATE_KEY }}
 
       - uses: actions/cache@v3
         if: always()
@@ -41,10 +36,6 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-cargo-
 
-      - run: |
-          git config url."ssh://git@github.com/astroport-fi/hidden_astroport_governance.git".insteadOf "https://github.com/astroport-fi/hidden_astroport_governance"
-          git config url."ssh://git@github.com/astroport-fi/hidden_astroport_core.git".insteadOf "https://github.com/astroport-fi/hidden_astroport_core"
-
       - name: Install stable toolchain
         uses: actions-rs/toolchain@v1
         with:
@@ -84,7 +75,7 @@ jobs:
             -v "$GITHUB_WORKSPACE":/code \
             -v ~/.cargo/registry:/usr/local/cargo/registry \
             -v ~/.cargo/git:/usr/local/cargo/git \
-            cosmwasm/workspace-optimizer:0.12.13
+            cosmwasm/workspace-optimizer:0.15.0
 
       - name: Save artifacts cache
         uses: actions/cache/save@v3
@@ -114,7 +105,7 @@ jobs:
           fail-on-cache-miss: true
       - name: Install cosmwasm-check
         # Uses --debug for compilation speed
-        run: cargo install --debug --version 1.4.0 cosmwasm-check
+        run: cargo install --debug --version 1.5.0 cosmwasm-check
       - name: Cosmwasm check
         run: |
           cosmwasm-check $GITHUB_WORKSPACE/artifacts/*.wasm --available-capabilities cosmwasm_1_1,iterator,stargate
diff --git a/.github/workflows/code_coverage.yml b/.github/workflows/code_coverage.yml
index 0967185..6a4d9cb 100644
--- a/.github/workflows/code_coverage.yml
+++ b/.github/workflows/code_coverage.yml
@@ -23,17 +23,8 @@ jobs:
         with:
           access_token: ${{ github.token }}
 
-      - uses: webfactory/ssh-agent@v0.7.0
-        with:
-          ssh-private-key: |
-            ${{ secrets.GOV_PRIVATE_KEY }}
-            ${{ secrets.CORE_PRIVATE_KEY }}
-
       - name: Checkout repository
-        uses: actions/checkout@v2
-      - run: |
-          git config url."ssh://git@github.com/astroport-fi/hidden_astroport_governance.git".insteadOf "https://github.com/astroport-fi/hidden_astroport_governance"
-          git config url."ssh://git@github.com/astroport-fi/hidden_astroport_core.git".insteadOf "https://github.com/astroport-fi/hidden_astroport_core"
+        uses: actions/checkout@v3
 
       - name: Install stable toolchain
         uses: actions-rs/toolchain@v1
diff --git a/.github/workflows/release_artifacts.yml b/.github/workflows/release_artifacts.yml
index adcc123..6983379 100644
--- a/.github/workflows/release_artifacts.yml
+++ b/.github/workflows/release_artifacts.yml
@@ -20,7 +20,6 @@ jobs:
             ~/.cargo/registry/cache
             ~/.cargo/registry/index
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-          # docker can't pull private sources, so we fail if cache is missing
           fail-on-cache-miss: true
       - name: Build Artifacts
         run: |
@@ -28,7 +27,7 @@ jobs:
             -v "$GITHUB_WORKSPACE":/code \
             -v ~/.cargo/registry:/usr/local/cargo/registry \
             -v ~/.cargo/git:/usr/local/cargo/git \
-            cosmwasm/workspace-optimizer:0.12.13
+            cosmwasm/workspace-optimizer:0.15.0
           tar -zcvf cosmwasm-artifacts.tar.gz artifacts
       - name: Create Release
         uses: softprops/action-gh-release@v1
diff --git a/.github/workflows/tests_and_checks.yml b/.github/workflows/tests_and_checks.yml
index 4f719e3..f1c71cb 100644
--- a/.github/workflows/tests_and_checks.yml
+++ b/.github/workflows/tests_and_checks.yml
@@ -21,12 +21,8 @@ jobs:
         with:
           access_token: ${{ github.token }}
 
-      - uses: actions/checkout@v3
-      - uses: webfactory/ssh-agent@v0.7.0
-        with:
-          ssh-private-key: |
-            ${{ secrets.GOV_PRIVATE_KEY }}
-            ${{ secrets.CORE_PRIVATE_KEY }}
+      - name: Checkout sources
+        uses: actions/checkout@v3
 
       - uses: actions/cache@v3
         if: always()
@@ -42,10 +38,6 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-cargo-
 
-      - run: |
-          git config url."ssh://git@github.com/astroport-fi/hidden_astroport_governance.git".insteadOf "https://github.com/astroport-fi/hidden_astroport_governance"
-          git config url."ssh://git@github.com/astroport-fi/hidden_astroport_core.git".insteadOf "https://github.com/astroport-fi/hidden_astroport_core"
-
       - name: Install stable toolchain
         uses: actions-rs/toolchain@v1
         with:
diff --git a/Cargo.lock b/Cargo.lock
index c764157..8e0142c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -160,6 +160,23 @@ dependencies = [
  "test-tube 0.4.0",
 ]
 
+[[package]]
+name = "astroport-osmo-fee-collector"
+version = "1.0.0"
+dependencies = [
+ "astroport 3.9.0",
+ "astroport-on-osmosis",
+ "cosmwasm-schema",
+ "cosmwasm-std",
+ "cw-multi-test",
+ "cw-storage-plus 0.15.1",
+ "cw-utils 1.0.3",
+ "cw2 1.1.2",
+ "itertools 0.11.0",
+ "osmosis-std",
+ "thiserror",
+]
+
 [[package]]
 name = "astroport-pcl-common"
 version = "1.1.0"