diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index fd8eb9643c8d..17b47e856255 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -3,6 +3,8 @@ name: Build & Push
 # and pushes the image to https://hub.docker.com/r/interchainio/simapp/tags
 on:
   pull_request:
+    paths:
+      - "Dockerfile"
   push:
     branches:
       - main
diff --git a/Makefile b/Makefile
index 75810961a48c..6f0a3c81290f 100644
--- a/Makefile
+++ b/Makefile
@@ -126,8 +126,12 @@ include contrib/devtools/Makefile
 BUILD_TARGETS := build install
 
 build: BUILD_ARGS=-o $(BUILDDIR)/
-build-linux:
-	GOOS=linux GOARCH=$(if $(findstring aarch64,$(shell uname -m)) || $(findstring arm64,$(shell uname -m)),arm64,amd64) LEDGER_ENABLED=false $(MAKE) build
+
+build-linux-amd64:
+	GOOS=linux GOARCH=amd64 LEDGER_ENABLED=false $(MAKE) build
+	
+build-linux-arm64:
+	GOOS=linux GOARCH=arm64 LEDGER_ENABLED=false $(MAKE) build
 
 $(BUILD_TARGETS): go.sum $(BUILDDIR)/
 	cd ${CURRENT_DIR}/simapp && go $@ -mod=readonly $(BUILD_FLAGS) $(BUILD_ARGS) ./...
@@ -138,7 +142,7 @@ $(BUILDDIR)/:
 cosmovisor:
 	$(MAKE) -C cosmovisor cosmovisor
 
-.PHONY: build build-linux cosmovisor
+.PHONY: build build-linux-amd64 build-linux-arm64 cosmovisor
 
 
 mocks: $(MOCKS_DIR)