diff --git a/.github/workflows/container-images.yml b/.github/workflows/container-images.yml
index f19b44393..e4124f935 100644
--- a/.github/workflows/container-images.yml
+++ b/.github/workflows/container-images.yml
@@ -30,11 +30,9 @@ jobs:
       with:
         chain: pocket-network
         dockerfile: cosmos
-        # platform: linux/arm64,linux/amd64
+        platform: linux/arm64,linux/amd64
         pre-build: |
-          apk add gcompat buf
-          make -d ignite_install
-          make -d proto_regen
+          make -d heighliner_pre_build
         build-target: |
           make -d install
         binaries: |
diff --git a/Makefile b/Makefile
index 9ce1a789e..139c8bad6 100644
--- a/Makefile
+++ b/Makefile
@@ -861,6 +861,10 @@ ignite_install: ## Install ignite. Used by CI and heighliner.
 	rm ignite_28.3.0_$(OS)_$(ARCH).tar.gz; \
 	ignite version
 
+.PHONY: heighliner_pre_build
+heighliner_pre_build: ignite_install proto_regen # Steps to execute during pre-build phase in heighliner. Having this step here makes it so we don't need to submit a PR on their side if we want to change something.
+	apk add gcompat
+	go install github.com/bufbuild/buf/cmd/buf@v1.31.0
 
 #####################
 ### Documentation ###