diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9cce520d346..4bd14d762a5 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -75,7 +75,8 @@ Note that this means if you are midway through working through a PR and rebase,
 ## Feast Python SDK / CLI
 ### Environment Setup
 Setting up your development environment for Feast Python SDK / CLI:
-1. Ensure that you have Docker installed in your environment. Docker is used to provision service dependencies during testing.
+1. Ensure that you have Docker installed in your environment. Docker is used to provision service dependencies during testing, and build images for feature servers and other components.
+   1. Please note that we use [Docker with BuiltKit](https://docs.docker.com/develop/develop-images/build_enhancements/).
 2. Ensure that you have `make`, Python (3.7 and above) with `pip`, installed.
 3. _Recommended:_ Create a virtual environment to isolate development dependencies to be installed
 ```sh
diff --git a/Makefile b/Makefile
index 876eb909ecc..5dfbaba53bd 100644
--- a/Makefile
+++ b/Makefile
@@ -206,7 +206,7 @@ push-ci-docker:
 
 # TODO(adchia): consider removing. This doesn't run successfully right now
 build-ci-docker:
-	docker build -t $(REGISTRY)/feast-ci:$(VERSION) -f infra/docker/ci/Dockerfile .
+	docker buildx build -t $(REGISTRY)/feast-ci:$(VERSION) -f infra/docker/ci/Dockerfile --load .
 
 push-feature-server-python-aws-docker:
 		docker push $(REGISTRY)/feature-server-python-aws:$$VERSION
@@ -228,9 +228,9 @@ push-feature-server-java-docker:
 	docker push $(REGISTRY)/feature-server-java:$(VERSION)
 
 build-feature-server-java-docker:
-	docker build --build-arg VERSION=$(VERSION) \
+	docker buildx build --build-arg VERSION=$(VERSION) \
 		-t $(REGISTRY)/feature-server-java:$(VERSION) \
-		-f java/infra/docker/feature-server/Dockerfile .
+		-f java/infra/docker/feature-server/Dockerfile --load .
 
 # Documentation