diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 8ee26d5..7a1af58 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -48,14 +48,14 @@ jobs:
     - name: Determine Image Tag
       id: tag
       run: |
-        if [[ "${{ github.event_name }}" == "pull_request" ]]; then
-          echo "IMAGE_TAG=-main" >> $GITHUB_ENV
-        elif [[ "${{ github.ref }}" == "refs/heads/main" ]]; then
+        if [[ "${{ github.ref }}" == "refs/heads/main" ]]; then
           echo "IMAGE_TAG=-main" >> $GITHUB_ENV
         else
-          echo "IMAGE_TAG=-${{ github.ref_name }}" >> $GITHUB_ENV
+          pr_num="${{ github.ref_name }}"
+          pr_num=${pr_num%/*}
+          echo "IMAGE_TAG=-pr-$pr_num" >> $GITHUB_ENV
         fi
     - name: Run build
       run: earthly +${{ matrix.command.recipe }} --tag=${{ matrix.command.tag_suffix }}${{ env.IMAGE_TAG }}
       env:
-        EARTHLY_PUSH: ${{ github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/') }}
\ No newline at end of file
+        EARTHLY_PUSH: ${{ github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/') || (github.event.pull_request.head.repo.full_name == github.repository) }}
diff --git a/Earthfile b/Earthfile
index adf215d..b03c436 100644
--- a/Earthfile
+++ b/Earthfile
@@ -11,13 +11,13 @@ namada:
 
   WORKDIR /__w/namada/namada
 
-  ARG toolchain=1.85.1
-  ARG nightly_toolchain=nightly-2025-03-27
+  ARG toolchain=1.91.1
+  ARG nightly_toolchain=nightly-2025-11-17
   ARG rocksdb_version=8.10.0
   ARG gaia_version=19.1.0
   ARG cw721_version=0.18.0
   ARG ics721_version=0.1.13
-  ARG cometbft_version=0.37.11
+  ARG cometbft_version=0.37.15
   ARG wasm_opt_version=124
   ARG mold_version=2.40.4
   ARG tag=namada-main
@@ -79,9 +79,9 @@ namada:
   ENV RUSTUP_HOME="/root/.rustup"
   ENV CARGO_HOME="/root/.cargo"
     
-  RUN rustup toolchain install $toolchain-x86_64-unknown-linux-gnu --no-self-update --component clippy,rls,rustfmt,rust-analysis,rust-docs,rust-src,llvm-tools-preview
+  RUN rustup toolchain install --profile minimal --no-self-update --component cargo,rust-std,rustc,clippy,rust-src $toolchain-x86_64-unknown-linux-gnu
   RUN rustup target add --toolchain $toolchain-x86_64-unknown-linux-gnu wasm32-unknown-unknown
-  RUN rustup toolchain install $nightly_toolchain-x86_64-unknown-linux-gnu --no-self-update --component clippy,rustfmt,rust-analysis,rust-docs,rust-src,llvm-tools-preview,rustc-codegen-cranelift-preview
+  RUN rustup toolchain install --profile minimal --no-self-update --component rust-std,rustc,rustfmt,clippy $nightly_toolchain-x86_64-unknown-linux-gnu
   RUN rustup target add --toolchain $nightly_toolchain-x86_64-unknown-linux-gnu wasm32-unknown-unknown
   RUN rustup default $toolchain-x86_64-unknown-linux-gnu
 
@@ -180,7 +180,7 @@ wasm:
   ENV RUSTUP_HOME="/root/.rustup"
   ENV CARGO_HOME="/root/.cargo"
 
-  RUN rustup toolchain install $toolchain --no-self-update --component cargo,rust-std,rustc,rls,rust-analysis,rust-docs
+  RUN rustup toolchain install $toolchain --profile minimal --no-self-update --component cargo,rust-std,rustc
   RUN rustup target add --toolchain $toolchain-x86_64-unknown-linux-gnu wasm32-unknown-unknown
   RUN rustup default $toolchain-x86_64-unknown-linux-gnu