diff --git a/Makefile b/Makefile
index 166b7ff7be..876eb909ec 100644
--- a/Makefile
+++ b/Makefile
@@ -212,7 +212,7 @@ push-feature-server-python-aws-docker:
 		docker push $(REGISTRY)/feature-server-python-aws:$$VERSION
 
 build-feature-server-python-aws-docker:
-		docker build --build-arg VERSION=$$VERSION \
+		docker buildx build --build-arg VERSION=$$VERSION \
 			-t $(REGISTRY)/feature-server-python-aws:$$VERSION \
 			-f sdk/python/feast/infra/feature_servers/aws_lambda/Dockerfile --load .
 
@@ -220,7 +220,7 @@ push-feature-transformation-server-docker:
 	docker push $(REGISTRY)/feature-transformation-server:$(VERSION)
 
 build-feature-transformation-server-docker:
-	docker build --build-arg VERSION=$(VERSION) \
+	docker buildx build --build-arg VERSION=$(VERSION) \
 		-t $(REGISTRY)/feature-transformation-server:$(VERSION) \
 		-f sdk/python/feast/infra/transformation_servers/Dockerfile --load .