diff --git a/.github/workflows/publish_images.yml b/.github/workflows/publish_images.yml
index 540ea8106ec..3f464367a34 100644
--- a/.github/workflows/publish_images.yml
+++ b/.github/workflows/publish_images.yml
@@ -29,7 +29,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        component: [ feature-server, feature-transformation-server, feast-operator ]
+        component: [ feature-server, feature-transformation-server, feast-operator, go-feature-server ]
     env:
       MAVEN_CACHE: gs://feast-templocation-kf-feast/.m2.2020-08-19.tar
       REGISTRY: quay.io/feastdev
diff --git a/Makefile b/Makefile
index d24b0f3f0d7..5c37381817e 100644
--- a/Makefile
+++ b/Makefile
@@ -639,6 +639,15 @@ build-feast-operator-docker: ## Build Feast Operator Docker image
 	VERSION=$(VERSION) \
 	$(MAKE) docker-build
 
+build-go-feature-server-docker: ## Build Go Feature Server Docker iamge
+	make compile-protos-go
+	docker buildx build --build-arg VERSION=$(VERSION) \
+		-t $(REGISTRY)/go-feature-server:$(VERSION) \
+		-f go/infra/docker/feature-server/Dockerfile --load .
+
+push-go-feature-server-docker: ## Push Go Feature Server Docker image
+	docker push $(REGISTRY)/go-feature-server:$(VERSION)
+
 ##@ Dev images
 
 build-feature-server-dev: ## Build Feature Server Dev Docker image