diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1c6bef0518..5e36da2a59 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -192,6 +192,7 @@ jobs:
             **/go.sum
             **/Makefile
             Makefile
+            Dockerfile*
       - name: e2e tests
         if: env.GIT_DIFF
         run: |
@@ -222,6 +223,7 @@ jobs:
             **/go.sum
             **/Makefile
             Makefile
+            Dockerfile*
       - name: cometmock tests
         if: env.GIT_DIFF
         run: |
@@ -252,6 +254,7 @@ jobs:
             **/go.sum
             **/Makefile
             Makefile
+            Dockerfile*
       - name: trace-e2e tests
         if: env.GIT_DIFF
         run: |
diff --git a/Dockerfile b/Dockerfile
index 665aa3d84f..12974fa634 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -29,7 +29,7 @@ RUN go mod tidy
 RUN make install
 
 # Get Hermes build
-FROM otacrew/hermes-ics:evidence-cmd AS hermes-builder
+FROM --platform=linux/amd64 otacrew/hermes-ics:evidence-cmd AS hermes-builder
 
 # Get CometMock
 FROM ghcr.io/informalsystems/cometmock:v0.37.x as cometmock-builder
diff --git a/Dockerfile.gaia b/Dockerfile.gaia
index 40dbd98da7..4206fbf36b 100644
--- a/Dockerfile.gaia
+++ b/Dockerfile.gaia
@@ -61,7 +61,7 @@ WORKDIR /interchain-security
 RUN make install
 
 # Get Hermes build
-FROM ghcr.io/informalsystems/hermes:1.4.1 AS hermes-builder
+FROM --platform=linux/amd64 ghcr.io/informalsystems/hermes:1.4.1 AS hermes-builder
 
 FROM --platform=linux/amd64 fedora:36
 RUN dnf update -y