diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 05b2fb4692..40df1beee5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -38,6 +38,7 @@ env:
   LEDGER_APP_VERSION: "3.0.7"
   ROLE: arn:aws:iam::375643557360:role/github-runners-ci-shared
   SCCACHE_ERROR_LOG: /tmp/sccache_log.txt
+  DOMAIN: namada
 
 jobs:
   changelog:
@@ -58,7 +59,7 @@ jobs:
   rust-docs:
     container:
       image: ghcr.io/heliaxdev/namada-ci:namada-v2.3.0
-    runs-on: [self-hosted, 4vcpu-8ram-ubuntu22-namada-x86]
+    runs-on: [self-hosted, 4vcpu-8ram-x86-namada]
     timeout-minutes: 20
 
     steps:
@@ -69,6 +70,7 @@ jobs:
         with:
           aws-region: ${{ env.AWS_REGION }}
           role-to-assume: ${{ env.ROLE }}
+          role-duration-seconds: 7200
       - name: Cache cargo
         id: cache
         uses: runs-on/cache@v4
@@ -76,7 +78,7 @@ jobs:
           RUNS_ON_S3_BUCKET_CACHE: ${{ env.CACHE_BUCKET }}
         with:
           path: /root/.cargo
-          key: /cache/${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/Cargo.lock') }}-${{ env.NIGHTLY }}
+          key: /cache/${{ env.DOMAIN }}/${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/Cargo.lock') }}-${{ env.NIGHTLY }}
       - name: Start sccache server
         id: sccache
         run: sccache --start-server
@@ -92,7 +94,7 @@ jobs:
   lints:
     container:
       image: ghcr.io/heliaxdev/namada-ci:namada-v2.3.0
-    runs-on: [self-hosted, 8vcpu-16ram-ubuntu22-namada-x86]
+    runs-on: [self-hosted, 8vcpu-16ram-x86-namada]
     timeout-minutes: 15
 
     steps:
@@ -103,6 +105,7 @@ jobs:
         with:
           aws-region: ${{ env.AWS_REGION }}
           role-to-assume: ${{ env.ROLE }}
+          role-duration-seconds: 7200
       - name: Cache cargo
         id: cache
         uses: runs-on/cache@v4
@@ -110,7 +113,7 @@ jobs:
           RUNS_ON_S3_BUCKET_CACHE: ${{ env.CACHE_BUCKET }}
         with:
           path: /root/.cargo
-          key: /cache/${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/Cargo.lock') }}-${{ env.NIGHTLY }}
+          key: /cache/${{ env.DOMAIN }}/${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/Cargo.lock') }}-${{ env.NIGHTLY }}
       - name: Start sccache server
         id: sccache
         run: sccache --start-server
@@ -127,7 +130,7 @@ jobs:
 
   build-wasm:
     timeout-minutes: 10
-    runs-on: [self-hosted, 4vcpu-8ram-ubuntu22-namada-x86]
+    runs-on: [self-hosted, 4vcpu-8ram-x86-namada]
     container:
       image: ghcr.io/heliaxdev/namada-ci:namada-v2.3.0
     strategy:
@@ -154,6 +157,7 @@ jobs:
         with:
           aws-region: ${{ env.AWS_REGION }}
           role-to-assume: ${{ env.ROLE }}
+          role-duration-seconds: 7200
       - name: Cache cargo
         id: cache
         uses: runs-on/cache@v4
@@ -161,7 +165,7 @@ jobs:
           RUNS_ON_S3_BUCKET_CACHE: ${{ env.CACHE_BUCKET }}
         with:
           path: /root/.cargo
-          key: /cache/${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/Cargo.lock') }}-${{ env.NIGHTLY }}
+          key: /cache/${{ env.DOMAIN }}/${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/Cargo.lock') }}-${{ env.NIGHTLY }}
       - name: Build ${{ matrix.make.name }}
         run: make ${{ matrix.make.command }}
       - name: Upload ${{ matrix.make.name }} artifacts
@@ -177,7 +181,7 @@ jobs:
     timeout-minutes: 30
     container:
       image: ghcr.io/heliaxdev/namada-ci:namada-v2.3.0
-    runs-on: [self-hosted, 4vcpu-8ram-ubuntu22-namada-x86]
+    runs-on: [self-hosted, 4vcpu-8ram-x86-namada]
     needs: [build-wasm]
 
     steps:
@@ -188,6 +192,7 @@ jobs:
         with:
           aws-region: ${{ env.AWS_REGION }}
           role-to-assume: ${{ env.ROLE }}
+          role-duration-seconds: 7200
       - name: Cache cargo
         id: cache
         uses: runs-on/cache@v4
@@ -195,7 +200,7 @@ jobs:
           RUNS_ON_S3_BUCKET_CACHE: ${{ env.CACHE_BUCKET }}
         with:
           path: /root/.cargo
-          key: /cache/${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/Cargo.lock') }}-${{ env.NIGHTLY }}
+          key: /cache/${{ env.DOMAIN }}/${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/Cargo.lock') }}-${{ env.NIGHTLY }}
       - name: Download wasm artifacts
         uses: actions/download-artifact@v4
         with:
@@ -221,7 +226,7 @@ jobs:
         run: cargo cache --autoclean-expensive
 
   test-unit:
-    runs-on: [self-hosted, 8vcpu-16ram-ubuntu22-namada-x86]
+    runs-on: [self-hosted, 8vcpu-16ram-x86-namada]
     container:
       image: ghcr.io/heliaxdev/namada-ci:namada-v2.3.0
     timeout-minutes: 30
@@ -235,6 +240,7 @@ jobs:
         with:
           aws-region: ${{ env.AWS_REGION }}
           role-to-assume: ${{ env.ROLE }}
+          role-duration-seconds: 7200
       - name: Cache cargo
         id: cache
         uses: runs-on/cache@v4
@@ -242,7 +248,7 @@ jobs:
           RUNS_ON_S3_BUCKET_CACHE: ${{ env.CACHE_BUCKET }}
         with:
           path: /root/.cargo
-          key: /cache/${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/Cargo.lock') }}-${{ env.NIGHTLY }}
+          key: /cache/${{ env.DOMAIN }}/${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/Cargo.lock') }}-${{ env.NIGHTLY }}
       - name: Start sccache server
         id: sccache
         run: sccache --start-server
@@ -274,7 +280,7 @@ jobs:
         run: sccache --stop-server || true
 
   check-packages:
-    runs-on: [self-hosted, 8vcpu-16ram-ubuntu22-namada-x86]
+    runs-on: [self-hosted, 8vcpu-16ram-x86-namada]
     container:
       image: ghcr.io/heliaxdev/namada-ci:namada-v2.3.0
     timeout-minutes: 15
@@ -287,6 +293,7 @@ jobs:
         with:
           aws-region: ${{ env.AWS_REGION }}
           role-to-assume: ${{ env.ROLE }}
+          role-duration-seconds: 7200
       - name: Cache cargo
         id: cache
         uses: runs-on/cache@v4
@@ -294,7 +301,7 @@ jobs:
           RUNS_ON_S3_BUCKET_CACHE: ${{ env.CACHE_BUCKET }}
         with:
           path: /root/.cargo
-          key: /cache/${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/Cargo.lock') }}-${{ env.NIGHTLY }}
+          key: /cache/${{ env.DOMAIN }}/${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/Cargo.lock') }}-${{ env.NIGHTLY }}
       - name: Start sccache server
         id: sccache
         run: sccache --start-server
@@ -310,7 +317,7 @@ jobs:
         run: sccache --stop-server || true
 
   test-integration:
-    runs-on: [self-hosted, 16vcpu-32ram-ubuntu22-namada-x86]
+    runs-on: [self-hosted, 16vcpu-32ram-x86-namada]
     container:
       image: ghcr.io/heliaxdev/namada-ci:namada-v2.3.0
     timeout-minutes: 120
@@ -324,6 +331,7 @@ jobs:
         with:
           aws-region: ${{ env.AWS_REGION }}
           role-to-assume: ${{ env.ROLE }}
+          role-duration-seconds: 7200
       - name: Cache cargo
         id: cache
         uses: runs-on/cache@v4
@@ -331,7 +339,7 @@ jobs:
           RUNS_ON_S3_BUCKET_CACHE: ${{ env.CACHE_BUCKET }}
         with:
           path: /root/.cargo
-          key: /cache/${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/Cargo.lock') }}-${{ env.NIGHTLY }}
+          key: /cache/${{ env.DOMAIN }}/${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/Cargo.lock') }}-${{ env.NIGHTLY }}
       - name: Start sccache server
         id: sccache
         run: sccache --start-server
@@ -363,7 +371,7 @@ jobs:
         run: sccache --stop-server || true
 
   check-benchmarks:
-    runs-on: [self-hosted, 16vcpu-32ram-ubuntu22-namada-x86]
+    runs-on: [self-hosted, 16vcpu-32ram-x86-namada]
     container:
       image: ghcr.io/heliaxdev/namada-ci:namada-v2.3.0
     if: github.event.pull_request.draft == false || contains(github.head_ref, 'mergify/merge-queue') || contains(github.ref_name, 'mergify/merge-queue')
@@ -378,6 +386,7 @@ jobs:
         with:
           aws-region: ${{ env.AWS_REGION }}
           role-to-assume: ${{ env.ROLE }}
+          role-duration-seconds: 7200
       - name: Cache cargo
         id: cache
         uses: runs-on/cache@v4
@@ -385,7 +394,7 @@ jobs:
           RUNS_ON_S3_BUCKET_CACHE: ${{ env.CACHE_BUCKET }}
         with:
           path: /root/.cargo
-          key: /cache/${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/Cargo.lock') }}-${{ env.NIGHTLY }}
+          key: /cache/${{ env.DOMAIN }}/${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/Cargo.lock') }}-${{ env.NIGHTLY }}
       - name: Start sccache server
         id: sccache
         run: sccache --start-server
@@ -411,7 +420,7 @@ jobs:
         run: sccache --stop-server || true
 
   build-binaries:
-    runs-on: [self-hosted, 16vcpu-32ram-ubuntu22-namada-x86]
+    runs-on: [self-hosted, 16vcpu-32ram-x86-namada]
     container:
       image: ghcr.io/heliaxdev/namada-ci:namada-v2.3.0
     timeout-minutes: 25
@@ -424,6 +433,7 @@ jobs:
         with:
           aws-region: ${{ env.AWS_REGION }}
           role-to-assume: ${{ env.ROLE }}
+          role-duration-seconds: 7200
       - name: Cache cargo
         id: cache
         uses: runs-on/cache@v4
@@ -431,7 +441,7 @@ jobs:
           RUNS_ON_S3_BUCKET_CACHE: ${{ env.CACHE_BUCKET }}
         with:
           path: /root/.cargo
-          key: /cache/${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/Cargo.lock') }}-${{ env.NIGHTLY }}
+          key: /cache/${{ env.DOMAIN }}/${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/Cargo.lock') }}-${{ env.NIGHTLY }}
       - name: Start sccache server
         id: sccache
         run: sccache --start-server
@@ -462,7 +472,7 @@ jobs:
         run: sccache --stop-server || true
 
   test-e2e:
-    runs-on: [self-hosted, 4vcpu-8ram-ubuntu22-namada-x86]
+    runs-on: [self-hosted, 4vcpu-8ram-x86-namada]
     container:
       image: ghcr.io/heliaxdev/namada-ci:namada-v2.3.0
     if: github.event.pull_request.draft == false || contains(github.head_ref, 'mergify/merge-queue') || contains(github.ref_name, 'mergify/merge-queue')
@@ -486,6 +496,7 @@ jobs:
         with:
           aws-region: ${{ env.AWS_REGION }}
           role-to-assume: ${{ env.ROLE }}
+          role-duration-seconds: 7200
       - name: Cache cargo
         id: cache
         uses: runs-on/cache@v4
@@ -493,7 +504,7 @@ jobs:
           RUNS_ON_S3_BUCKET_CACHE: ${{ env.CACHE_BUCKET }}
         with:
           path: /root/.cargo
-          key: /cache/${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/Cargo.lock') }}-${{ env.NIGHTLY }}
+          key: /cache/${{ env.DOMAIN }}/${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/Cargo.lock') }}-${{ env.NIGHTLY }}
       - name: Start sccache server
         id: sccache
         run: sccache --start-server
@@ -633,7 +644,7 @@ jobs:
           make cpp_test
 
   test-e2e-with-device-automation:
-    runs-on: [self-hosted, 4vcpu-8ram-ubuntu22-namada-x86]
+    runs-on: [self-hosted, 4vcpu-8ram-x86-namada]
     container:
       image: ghcr.io/heliaxdev/namada-ci:namada-v2.3.0
     if: github.event.pull_request.draft == false || contains(github.head_ref, 'mergify/merge-queue') || contains(github.ref_name, 'mergify/merge-queue')
@@ -648,6 +659,7 @@ jobs:
         with:
           aws-region: ${{ env.AWS_REGION }}
           role-to-assume: ${{ env.ROLE }}
+          role-duration-seconds: 7200
       - name: Cache cargo
         id: cache
         uses: runs-on/cache@v4
@@ -655,7 +667,7 @@ jobs:
           RUNS_ON_S3_BUCKET_CACHE: ${{ env.CACHE_BUCKET }}
         with:
           path: /root/.cargo
-          key: /cache/${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/Cargo.lock') }}-${{ env.NIGHTLY }}
+          key: /cache/${{ env.DOMAIN }}/${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/Cargo.lock') }}-${{ env.NIGHTLY }}
       - name: Start sccache server
         id: sccache
         run: sccache --start-server
@@ -727,7 +739,7 @@ jobs:
         run: sccache --stop-server || true
 
   check-sdk-licenses:
-    runs-on: [self-hosted, 4vcpu-8ram-ubuntu22-namada-x86]
+    runs-on: [self-hosted, 4vcpu-8ram-x86-namada]
     container:
       image: ghcr.io/heliaxdev/namada-ci:namada-v2.3.0
     timeout-minutes: 5
@@ -740,6 +752,7 @@ jobs:
         with:
           aws-region: ${{ env.AWS_REGION }}
           role-to-assume: ${{ env.ROLE }}
+          role-duration-seconds: 7200
       - uses: taiki-e/install-action@v2
         with:
           tool: cargo-binstall