diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 000000000..f732a0b21
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,2 @@
+bin
+include
diff --git a/.gitignore b/.gitignore
index 0d0c46013..01ceb11be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,7 @@ log.html
 output.xml
 report.html
 __pycache__
+
+# Protoc files
+include/
+readme.txt
diff --git a/Dockerfile b/Dockerfile
index e12191d60..8f94195a6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,25 +19,19 @@ RUN yum install -y nodejs npm java-11
 # Copy the go source
 COPY ["Makefile", "main.go", ".openapi-generator-ignore", "openapitools.json", "./"]
 
-# Download protoc compiler v24.3
-RUN wget -q https://github.com/protocolbuffers/protobuf/releases/download/v24.3/protoc-24.3-linux-x86_64.zip -O protoc.zip && \
-    unzip -q protoc.zip && \
-    bin/protoc --version && \
-    rm protoc.zip
-
-# Download tools
-RUN make deps
-
 # Copy rest of the source
-COPY bin/ bin/
+COPY .git/ .git/
 COPY cmd/ cmd/
 COPY api/ api/
 COPY internal/ internal/
-COPY pkg/ pkg/
 COPY scripts/ scripts/
+COPY pkg/ pkg/
 COPY patches/ patches/
 COPY templates/ templates/
 
+# Download tools
+RUN make deps
+
 # Build
 USER root
 RUN CGO_ENABLED=1 GOOS=linux GOARCH=amd64 make clean model-registry
diff --git a/Makefile b/Makefile
index 24b1345d8..c0b6e6814 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,7 @@
 MKFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
 PROJECT_PATH := $(patsubst %/,%,$(dir $(MKFILE_PATH)))
 PROJECT_BIN := $(PROJECT_PATH)/bin
+GO := $(PROJECT_BIN)/go1.19
 
 # add tools bin directory
 PATH := $(PROJECT_BIN):$(PATH)
@@ -56,7 +57,7 @@ api/grpc/ml_metadata/proto/metadata_store_service.proto:
 		sed -i 's#syntax = "proto[23]";#&\noption go_package = "github.com/kubeflow/model-registry/internal/ml_metadata/proto";#' metadata_store_service.proto
 
 internal/ml_metadata/proto/%.pb.go: api/grpc/ml_metadata/proto/%.proto
-	protoc -I./api/grpc --go_out=./internal --go_opt=paths=source_relative \
+	bin/protoc -I./api/grpc --go_out=./internal --go_opt=paths=source_relative \
 		--go-grpc_out=./internal --go-grpc_opt=paths=source_relative $<
 
 .PHONY: gen/grpc
@@ -76,8 +77,8 @@ openapi/validate: bin/openapi-generator-cli
 # generate the openapi server implementation
 .PHONY: gen/openapi-server
 gen/openapi-server: bin/openapi-generator-cli openapi/validate
-	@if git diff --cached --name-only | grep -q "api/openapi/model-registry.yaml" || \
-		git diff --name-only | grep -q "api/openapi/model-registry.yaml" || \
+	@if git diff --exit-code --name-only | grep -q "api/openapi/model-registry.yaml" || \
+		git diff --exit-code --name-only | grep -q "api/openapi/model-registry.yaml" || \
 		[ -n "${FORCE_SERVER_GENERATION}" ]; then \
 		ROOT_FOLDER="." ./scripts/gen_openapi_server.sh; \
 	else \
@@ -97,7 +98,7 @@ pkg/openapi/client.go: bin/openapi-generator-cli api/openapi/model-registry.yaml
 
 .PHONY: vet
 vet:
-	go vet ./...
+	${GO} vet ./...
 
 .PHONY: clean
 clean:
@@ -107,14 +108,21 @@ clean:
 clean/odh:
 	rm -Rf ./model-registry
 
+bin/go:
+	GOBIN=$(PROJECT_BIN) go install golang.org/dl/go1.19@latest
+	$(PROJECT_BIN)/go1.19 download
+
+bin/protoc:
+	./scripts/install_protoc.sh
+
 bin/go-enum:
-	GOBIN=$(PROJECT_BIN) go install github.com/searKing/golang/tools/go-enum@v1.2.97
+	GOBIN=$(PROJECT_BIN) ${GO} install github.com/searKing/golang/tools/go-enum@v1.2.97
 
 bin/protoc-gen-go:
-	GOBIN=$(PROJECT_BIN) go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.31.0
+	GOBIN=$(PROJECT_BIN) ${GO} install google.golang.org/protobuf/cmd/protoc-gen-go@v1.31.0
 
 bin/protoc-gen-go-grpc:
-	GOBIN=$(PROJECT_BIN) go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0
+	GOBIN=$(PROJECT_BIN) ${GO} install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0
 
 GOLANGCI_LINT ?= ${PROJECT_BIN}/golangci-lint
 bin/golangci-lint:
@@ -122,7 +130,7 @@ bin/golangci-lint:
 
 GOVERTER ?= ${PROJECT_BIN}/goverter
 bin/goverter:
-	GOBIN=$(PROJECT_PATH)/bin go install github.com/jmattheis/goverter/cmd/goverter@v1.1.1
+	GOBIN=$(PROJECT_PATH)/bin ${GO} install github.com/jmattheis/goverter/cmd/goverter@v1.1.1
 
 OPENAPI_GENERATOR ?= ${PROJECT_BIN}/openapi-generator-cli
 NPM ?= "$(shell which npm)"
@@ -147,23 +155,23 @@ clean/deps:
 	rm -Rf bin/*
 
 .PHONY: deps
-deps: bin/go-enum bin/protoc-gen-go bin/protoc-gen-go-grpc bin/golangci-lint bin/goverter bin/openapi-generator-cli
+deps: bin/go bin/protoc bin/go-enum bin/protoc-gen-go bin/protoc-gen-go-grpc bin/golangci-lint bin/goverter bin/openapi-generator-cli
 
 .PHONY: vendor
 vendor:
-	go mod vendor
+	${GO} mod vendor
 
 .PHONY: build
 build: gen vet lint
-	go build
+	${GO} build -buildvcs=false
 
 .PHONY: build/odh
 build/odh: vet
-	go build
+	${GO} build -buildvcs=false
 
 .PHONY: gen
 gen: deps gen/grpc gen/openapi gen/openapi-server gen/converter
-	go generate ./...
+	${GO} generate ./...
 
 .PHONY: lint
 lint:
@@ -172,20 +180,20 @@ lint:
 
 .PHONY: test
 test: gen
-	go test ./internal/... ./pkg/...
+	${GO} test ./internal/... ./pkg/...
 
 .PHONY: test-nocache
 test-nocache: gen
-	go test ./internal/... ./pkg/... -count=1
+	${GO} test ./internal/... ./pkg/... -count=1
 
 .PHONY: test-cover
 test-cover: gen
-	go test ./internal/... ./pkg/... -coverprofile=coverage.txt
-	go tool cover -html=coverage.txt -o coverage.html
+	${GO} test ./internal/... ./pkg/... -coverprofile=coverage.txt
+	${GO} tool cover -html=coverage.txt -o coverage.html
 
 .PHONY: run/proxy
 run/proxy: gen
-	go run main.go proxy --logtostderr=true
+	${GO} run main.go proxy --logtostderr=true
 
 .PHONY: proxy
 proxy: build
diff --git a/clients/python/poetry.lock b/clients/python/poetry.lock
index e09d83386..b5197b003 100644
--- a/clients/python/poetry.lock
+++ b/clients/python/poetry.lock
@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand.
+# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand.
 
 [[package]]
 name = "absl-py"
@@ -487,13 +487,13 @@ typing = ["types-PyYAML", "types-requests", "types-simplejson", "types-toml", "t
 
 [[package]]
 name = "idna"
-version = "3.6"
+version = "3.7"
 description = "Internationalized Domain Names in Applications (IDNA)"
 optional = false
 python-versions = ">=3.5"
 files = [
-    {file = "idna-3.6-py3-none-any.whl", hash = "sha256:c05567e9c24a6b9faaa835c4821bad0590fbb9d5779e7caa6e1cc4978e7eb24f"},
-    {file = "idna-3.6.tar.gz", hash = "sha256:9ecdbbd083b06798ae1e86adcbfe8ab1479cf864e4ee30fe4e46a003d12491ca"},
+    {file = "idna-3.7-py3-none-any.whl", hash = "sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0"},
+    {file = "idna-3.7.tar.gz", hash = "sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc"},
 ]
 
 [[package]]
@@ -982,6 +982,7 @@ files = [
     {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"},
     {file = "PyYAML-6.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28"},
     {file = "PyYAML-6.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9"},
+    {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a08c6f0fe150303c1c6b71ebcd7213c2858041a7e01975da3a99aed1e7a378ef"},
     {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0"},
     {file = "PyYAML-6.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4"},
     {file = "PyYAML-6.0.1-cp312-cp312-win32.whl", hash = "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54"},
diff --git a/docker-compose-local.yaml b/docker-compose-local.yaml
index 52b7601ff..eeeac8a56 100644
--- a/docker-compose-local.yaml
+++ b/docker-compose-local.yaml
@@ -1,4 +1,4 @@
-version: '3'
+version: '3.4'
 services:
   mlmd-server:
     image: gcr.io/tfx-oss-public/ml_metadata_store_server:1.14.0
@@ -13,8 +13,9 @@ services:
     build:
       context: .
       dockerfile: Dockerfile
-    command: ["proxy", "--mlmd-hostname", "localhost", "--mlmd-port", "9090"]
+    command: ["proxy", "--hostname", "0.0.0.0", "--mlmd-hostname", "mlmd-server", "--mlmd-port", "8080"]
     container_name: model-registry
-    network_mode: host
+    ports:
+      - "8080:8080"
     depends_on:
       - mlmd-server
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 4f8e2d985..34d8f624e 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -11,8 +11,9 @@ services:
       - ./test/config/ml-metadata:/tmp/shared
   model-registry:
     image: quay.io/opendatahub/model-registry:latest
-    command: ["proxy", "--mlmd-hostname", "localhost", "--mlmd-port", "9090"]
+    command: ["proxy", "--hostname", "0.0.0.0", "--mlmd-hostname", "mlmd-server", "--mlmd-port", "8080"]
     container_name: model-registry
-    network_mode: host
+    ports:
+      - "8080:8080"
     depends_on:
       - mlmd-server
diff --git a/scripts/install_protoc.sh b/scripts/install_protoc.sh
new file mode 100755
index 000000000..b7b165e5f
--- /dev/null
+++ b/scripts/install_protoc.sh
@@ -0,0 +1,22 @@
+#! /bin/bash
+set -euxo pipefail
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
+VERSION="24.3"
+OS="linux"
+if [[ "$OSTYPE" == "darwin"* ]]; then
+  # Mac OSX
+  OS="osx"
+fi
+ARCH="x86_64"
+if [[ "$(uname -m)" == "arm"* ]]; then
+  ARCH="aarch_64"
+fi
+
+mkdir -p ${SCRIPT_DIR}/../bin
+
+wget -q https://github.com/protocolbuffers/protobuf/releases/download/v${VERSION}/protoc-${VERSION}-${OS}-${ARCH}.zip -O ${SCRIPT_DIR}/../protoc.zip && \
+  unzip -qo ${SCRIPT_DIR}/../protoc.zip -d ${SCRIPT_DIR}/.. && \
+  bin/protoc --version && \
+  rm ${SCRIPT_DIR}/../protoc.zip