diff --git a/.github/workflows/master_only.yml b/.github/workflows/master_only.yml
index 2042987617..4b23635a18 100644
--- a/.github/workflows/master_only.yml
+++ b/.github/workflows/master_only.yml
@@ -13,7 +13,9 @@ jobs:
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
+        with:
+          install: true
       - name: Set up AWS SDK
         uses: aws-actions/configure-aws-credentials@v1
         with:
@@ -50,6 +52,7 @@ jobs:
           docker build \
             --file sdk/python/feast/infra/feature_servers/aws_lambda/Dockerfile \
             --tag $ECR_REGISTRY/$ECR_REPOSITORY:${{ steps.image-tag.outputs.DOCKER_IMAGE_TAG }} \
+            --load \
             .
           docker push $ECR_REGISTRY/$ECR_REPOSITORY:${{ steps.image-tag.outputs.DOCKER_IMAGE_TAG }}
     outputs:
@@ -177,7 +180,9 @@ jobs:
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
+        with:
+          install: true
       - name: Login to DockerHub
         uses: docker/login-action@v1
         with:
diff --git a/.github/workflows/pr_integration_tests.yml b/.github/workflows/pr_integration_tests.yml
index c441705613..a720865ed4 100644
--- a/.github/workflows/pr_integration_tests.yml
+++ b/.github/workflows/pr_integration_tests.yml
@@ -69,6 +69,7 @@ jobs:
           docker build \
             --file sdk/python/feast/infra/feature_servers/aws_lambda/Dockerfile \
             --tag $ECR_REGISTRY/$ECR_REPOSITORY:${{ steps.image-tag.outputs.DOCKER_IMAGE_TAG }} \
+            --load \
             .
           docker push $ECR_REGISTRY/$ECR_REPOSITORY:${{ steps.image-tag.outputs.DOCKER_IMAGE_TAG }}
     outputs:
diff --git a/Makefile b/Makefile
index 96558f97de..876eb909ec 100644
--- a/Makefile
+++ b/Makefile
@@ -212,17 +212,17 @@ push-feature-server-python-aws-docker:
 		docker push $(REGISTRY)/feature-server-python-aws:$$VERSION
 
 build-feature-server-python-aws-docker:
-		docker buildx --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 .
+			-f sdk/python/feast/infra/feature_servers/aws_lambda/Dockerfile --load .
 
 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 .
+		-f sdk/python/feast/infra/transformation_servers/Dockerfile --load .
 
 push-feature-server-java-docker:
 	docker push $(REGISTRY)/feature-server-java:$(VERSION)