diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index d7b3e727bd..f0dcf58b8e 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -571,7 +571,6 @@ jobs:
         nightly_version: [nightly-2024-02-10]
         mold_version: [2.4.0]
         comet_bft: [0.37.2]
-        hermes: [1.7.4-namada-beta7]
         make:
           - index: 0
           - index: 1
@@ -649,9 +648,19 @@ jobs:
           mv cometbft /usr/local/bin
       - name: Download Hermes
         run: |
-          curl -o hermes.tar.gz -LO https://github.com/heliaxdev/hermes/releases/download/v${{ matrix.hermes }}/hermes-v${{ matrix.hermes }}-x86_64-unknown-linux-gnu.tar.gz
-          tar -xvzf hermes.tar.gz
+          echo "Using hermes for branch: ${BRANCH_NAME}"
+          HERMES_VERSION=$(cat .github/workflows/scripts/hermes.json | jq .${BRANCH_ENV:-invalid} -r -e)
+          HERMES_VERSION_DEFAULT=$(cat .github/workflows/scripts/hermes.json | jq .default -r)
+          if [ -z "$HERMES_VERSION" ]
+          then
+            HERMES_VERSION=$HERMES_VERSION_DEFAULT
+          fi
+          echo "Using hermes version: ${HERMES_VERSION}"
+          curl -o hermes.zip -LO https://github.com/heliaxdev/hermes/releases/download/v${HERMES_VERSION}/hermes-v${HERMES_VERSION}-x86_64-unknown-linux-gnu.zip
+          unzip hermes.zip
           mv hermes /usr/local/bin
+        env:
+          BRANCH_NAME: ${GITHUB_REF##*/}
       - name: Change permissions
         run: |
           chmod +x target/release/namada
diff --git a/.github/workflows/scripts/hermes.json b/.github/workflows/scripts/hermes.json
new file mode 100644
index 0000000000..01b3fefaba
--- /dev/null
+++ b/.github/workflows/scripts/hermes.json
@@ -0,0 +1,3 @@
+{
+    "default": "1.7.4-namada-beta7"
+}
\ No newline at end of file