diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
index f04015a989..809255496d 100644
--- a/.github/workflows/build_wheels.yml
+++ b/.github/workflows/build_wheels.yml
@@ -116,7 +116,7 @@ jobs:
     needs: get-version
     strategy:
       matrix:
-        component: [feature-server, feature-server-java, feature-transformation-server]
+        component: [ feature-server, feature-server-python-aws, feature-server-java, feature-transformation-server, feast-operator ]
     env:
       REGISTRY: feastdev
     steps:
diff --git a/.github/workflows/master_only.yml b/.github/workflows/master_only.yml
index 7166246da5..1b83c56372 100644
--- a/.github/workflows/master_only.yml
+++ b/.github/workflows/master_only.yml
@@ -94,7 +94,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        component: [ feature-server-java, feature-transformation-server ]
+        component: [ feature-server, feature-server-java, feature-transformation-server, feast-operator ]
     env:
       MAVEN_CACHE: gs://feast-templocation-kf-feast/.m2.2020-08-19.tar
       REGISTRY: gcr.io/kf-feast
diff --git a/Makefile b/Makefile
index 2ad693c7a1..39df6681a6 100644
--- a/Makefile
+++ b/Makefile
@@ -384,7 +384,7 @@ install-protoc-dependencies:
 
 # Docker
 
-build-docker: build-feature-server-python-aws-docker build-feature-transformation-server-docker build-feature-server-java-docker
+build-docker: build-feature-server-docker build-feature-server-python-aws-docker build-feature-transformation-server-docker build-feature-server-java-docker build-feast-operator-docker
 
 push-ci-docker:
 	docker push $(REGISTRY)/feast-ci:$(VERSION)