diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 9eb561263c..46e1665754 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -49,7 +49,7 @@ jobs:
     needs: get-version
     strategy:
       matrix:
-        component: [feature-server-python-aws, feature-server-java, feature-transformation-server]
+        component: [feature-server-python, feature-server-python-aws, feature-server-java, feature-transformation-server]
     env:
       MAVEN_CACHE: gs://feast-templocation-kf-feast/.m2.2020-08-19.tar
       REGISTRY: feastdev
diff --git a/Makefile b/Makefile
index f87f53ef5b..4bd1eaed4c 100644
--- a/Makefile
+++ b/Makefile
@@ -330,7 +330,7 @@ lint-go: compile-protos-go compile-go-lib
 
 # Docker
 
-build-docker: build-ci-docker build-feature-server-python-aws-docker build-feature-transformation-server-docker build-feature-server-java-docker
+build-docker: build-ci-docker build-feature-server-python-docker build-feature-server-python-aws-docker build-feature-transformation-server-docker build-feature-server-java-docker
 
 push-ci-docker:
 	docker push $(REGISTRY)/feast-ci:$(VERSION)
@@ -339,13 +339,21 @@ push-ci-docker:
 build-ci-docker:
 	docker buildx build -t $(REGISTRY)/feast-ci:$(VERSION) -f infra/docker/ci/Dockerfile --load .
 
+push-feature-server-python-docker:
+	docker push $(REGISTRY)/feature-server:$$VERSION
+
+build-feature-server-python-docker:
+	docker buildx build --build-arg VERSION=$$VERSION \
+		-t $(REGISTRY)/feature-server:$$VERSION \
+		-f sdk/python/feast/infra/feature_servers/multicloud/Dockerfile --load .
+
 push-feature-server-python-aws-docker:
-		docker push $(REGISTRY)/feature-server-python-aws:$$VERSION
+	docker push $(REGISTRY)/feature-server-python-aws:$$VERSION
 
 build-feature-server-python-aws-docker:
-		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 .
+	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 .
 
 push-feature-transformation-server-docker:
 	docker push $(REGISTRY)/feature-transformation-server:$(VERSION)