diff --git a/.github/workflows/java_master_only.yml b/.github/workflows/java_master_only.yml
index 16fabbbdee..d38d0d5b5b 100644
--- a/.github/workflows/java_master_only.yml
+++ b/.github/workflows/java_master_only.yml
@@ -40,6 +40,12 @@ jobs:
         run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
       - name: Build image
         run: make build-${{ matrix.component }}-docker REGISTRY=${REGISTRY} VERSION=${GITHUB_SHA}
+      - name: Login to Quay.io
+        uses: docker/login-action@v1
+        with:
+          registry: quay.io
+          username: ${{ secrets.QUAYIO_CI_USERNAME }}
+          password: ${{ secrets.QUAYIO_CI_TOKEN }}
       - name: Push image
         run: make push-${{ matrix.component }}-docker REGISTRY=${REGISTRY} VERSION=${GITHUB_SHA}
       - name: Push development Docker image
diff --git a/.github/workflows/master_only.yml b/.github/workflows/master_only.yml
index 5524623285..9d7f66005b 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, feature-server-java, feature-transformation-server, feast-operator ]
+        component: [ feature-server-dev, feature-transformation-server, feast-operator ]
     env:
       MAVEN_CACHE: gs://feast-templocation-kf-feast/.m2.2020-08-19.tar
       REGISTRY: quay.io/feastdev-ci
diff --git a/Makefile b/Makefile
index 8442b55874..c199eb3a5e 100644
--- a/Makefile
+++ b/Makefile
@@ -477,11 +477,11 @@ push-ci-docker:
 	docker push $(REGISTRY)/feast-ci:$(VERSION)
 
 push-feature-server-docker:
-	docker push $(REGISTRY)/feature-server:$$VERSION
+	docker push $(REGISTRY)/feature-server:$(VERSION)
 
 build-feature-server-docker:
-	docker buildx build --build-arg VERSION=$$VERSION \
-		-t $(REGISTRY)/feature-server:$$VERSION \
+	docker buildx build --build-arg VERSION=$(VERSION) \
+		-t $(REGISTRY)/feature-server:$(VERSION) \
 		-f sdk/python/feast/infra/feature_servers/multicloud/Dockerfile --load .
 
 push-feature-transformation-server-docker:
@@ -531,6 +531,14 @@ build-feature-server-dev:
 		-t feastdev/feature-server:dev \
 		-f sdk/python/feast/infra/feature_servers/multicloud/Dockerfile.dev --load .
 
+build-feature-server-dev-docker:
+	docker buildx build \
+		-t $(REGISTRY)/feature-server:$(VERSION) \
+		-f sdk/python/feast/infra/feature_servers/multicloud/Dockerfile.dev --load .
+
+push-feature-server-dev-docker:
+	docker push $(REGISTRY)/feature-server:$(VERSION)
+
 build-java-docker-dev:
 	make build-java-no-tests REVISION=dev
 	docker buildx build --build-arg VERSION=dev \