diff --git a/.github/workflows/cosmoshub.yml b/.github/workflows/cosmoshub.yml
index f07beac5..1f0a96ae 100644
--- a/.github/workflows/cosmoshub.yml
+++ b/.github/workflows/cosmoshub.yml
@@ -45,18 +45,11 @@ jobs:
       - name: Manually pull the base Docker image
         run: |
           echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u ${{ github.actor }} --password-stdin
-          docker pull ghcr.io/p2p-org/cosmos-heighliner:cosmoshub-v18.1.0
-
-      - name: Pull gaiad binary
-        run: |
-          cd temp/
-          wget https://github.com/cosmos/gaia/releases/download/v19.1.0/gaiad-v19.1.0-linux-amd64
+          docker pull ghcr.io/p2p-org/cosmos-heighliner:infra-toolkit-${{ env.INFRA_TOOLKIT }}
 
       - name: Build and push cosmoshub Docker image
         run: |
-          echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u ${{ github.actor }} --password-stdin
-          cd temp/
-          docker build -t gaia:${{ env.VERSION }} .
+          ./heighliner build -c gaia --git-ref ${{ env.VERSION }}
 
       - name: Tag and push Docker image
         run: |
diff --git a/dockerfile/cosmos/native.Dockerfile b/dockerfile/cosmos/native.Dockerfile
index 21756f46..8f883537 100644
--- a/dockerfile/cosmos/native.Dockerfile
+++ b/dockerfile/cosmos/native.Dockerfile
@@ -42,6 +42,8 @@ RUN set -eux;\
       WASMVM_REPO=$(echo $WASMVM_VERSION | awk '{print $1}');\
       WASMVM_VERS=$(echo $WASMVM_VERSION | awk '{print $2}');\
       wget -O /lib/libwasmvm_muslc.a https://${WASMVM_REPO}/releases/download/${WASMVM_VERS}/libwasmvm_muslc.$(uname -m).a;\
+      cp /lib/libwasmvm_muslc.a /lib/libwasmvm_muslc.$(uname -m).a;\
+      cp /lib/libwasmvm_muslc.a /lib/libwasmvm.$(uname -m).a;\
     fi;\
     export CGO_ENABLED=1 LDFLAGS='-linkmode external -extldflags "-static"';\
     if [ ! -z "$PRE_BUILD" ]; then sh -c "${PRE_BUILD}"; fi;\
diff --git a/temp/Dockerfile b/temp/Dockerfile
deleted file mode 100644
index 3527fcb9..00000000
--- a/temp/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM ghcr.io/p2p-org/cosmos-heighliner:cosmoshub-v18.1.0
-
-# Copy the new gaiad binary into the container
-COPY ./gaiad-v19.1.0-linux-amd64 /bin/gaiad
-
-# Ensure the binary is executable
-RUN chmod +x /bin/gaiad