diff --git a/Makefile b/Makefile
index 5566a331d..972072b7b 100644
--- a/Makefile
+++ b/Makefile
@@ -203,8 +203,8 @@ gen: deps gen/grpc gen/openapi gen/openapi-server gen/converter
 
 .PHONY: lint
 lint:
-	${GOLANGCI_LINT} run main.go
-	${GOLANGCI_LINT} run cmd/... internal/... ./pkg/...
+	${GOLANGCI_LINT} run main.go  --timeout 3m
+	${GOLANGCI_LINT} run cmd/... internal/... ./pkg/...  --timeout 3m
 
 .PHONY: test
 test: gen bin/envtest
@@ -256,12 +256,12 @@ ifeq ($(DOCKER),docker)
 	# docker uses builder containers
 	- $(DOCKER) buildx rm model-registry-builder
 	$(DOCKER) buildx create --use --name model-registry-builder --platform=$(PLATFORMS)
-	$(DOCKER) buildx build --push --platform=$(PLATFORMS) --tag ${IMG} -f ${DOCKERFILE} .
+	$(DOCKER) buildx build --push --platform=$(PLATFORMS) --tag ${IMG}:$(IMG_VERSION) -f ${DOCKERFILE} .
 	$(DOCKER) buildx rm model-registry-builder
 else ifeq ($(DOCKER),podman)
 	# podman uses image manifests
 	$(DOCKER) manifest create -a ${IMG}
-	$(DOCKER) buildx build --platform=$(PLATFORMS) --manifest ${IMG} -f ${DOCKERFILE} .
+	$(DOCKER) buildx build --platform=$(PLATFORMS) --manifest ${IMG}:$(IMG_VERSION) -f ${DOCKERFILE} .
 	$(DOCKER) manifest push ${IMG}
 	$(DOCKER) manifest rm ${IMG}
 else
diff --git a/scripts/install_protoc.sh b/scripts/install_protoc.sh
index 6f8fc3b50..fd66de66e 100755
--- a/scripts/install_protoc.sh
+++ b/scripts/install_protoc.sh
@@ -7,9 +7,13 @@ if [[ ${OSTYPE,,} =~ darwin ]]; then
     OS="osx"
 fi
 
-ARCH="x86_64"
-if [[ $(uname -m) =~ arm ]]; then
-    ARCH="aarch_64"
+ARCH=$(uname -m)
+if [[ "$ARCH" == "arm"* ]]; then
+  ARCH="aarch_64"
+elif [[ "$ARCH" == "s390x" ]]; then
+  ARCH="s390_64"
+elif [[ "$ARCH" == "ppc64le" ]] ; then
+  ARCH="ppcle_64"
 fi
 
 PROJECT_ROOT=$(realpath "$(dirname "$0")"/..)