diff --git a/.github/workflows/auto-release.yaml b/.github/workflows/auto-release.yaml
index 6dc43828..3bf86dd2 100644
--- a/.github/workflows/auto-release.yaml
+++ b/.github/workflows/auto-release.yaml
@@ -2,11 +2,12 @@ name: Release Version
 on:
   push:
     tags:      
-      - "v[0-9]+.[0-9]+.[0-9]+"      
+      - "v*"      
 
 jobs:
   auto-release:
     runs-on: ubuntu-18.04
+    if: startsWith(github.ref, 'refs/tags/v') && !contains(github.ref_name, '-alpha.') && !contains(github.ref_name, '-beta.')
     steps:
       - name: Checkout 
         uses: actions/checkout@v2
@@ -18,3 +19,20 @@ jobs:
           files: |
             storageos-etcd-cluster-operator.yaml     
             config/samples/storageos-etcd-cluster.yaml 
+
+
+  auto-prerelease:
+    runs-on: ubuntu-18.04
+    if: startsWith(github.ref, 'refs/tags/v') && (contains(github.ref_name, '-alpha.') || contains(github.ref_name, '-beta.'))
+    steps:
+      - name: Checkout 
+        uses: actions/checkout@v2
+      - name: Make manifest
+        run: make uber
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        with:
+          prerelease: true
+          files: |
+            storageos-etcd-cluster-operator.yaml     
+            config/samples/storageos-etcd-cluster.yaml 
\ No newline at end of file
diff --git a/.github/workflows/release-image.yaml b/.github/workflows/release-image.yaml
index 9b2ec8c3..2da80092 100644
--- a/.github/workflows/release-image.yaml
+++ b/.github/workflows/release-image.yaml
@@ -23,19 +23,16 @@ jobs:
           registry: docker.io
           username: ${{ secrets.DH_USERNAME }}
           password: ${{ secrets.DH_PASSWORD }}
-      - name: Build container image
-        run: make docker-build
-      - name: Push container image to dockerhub
-        run: make docker-push
-
       - name: Login to quay container registry
         uses: docker/login-action@v1
         with:
           registry: quay.io
           username: ${{ secrets.RED_HAT_QUAY_CLI_USERNAME }}
           password: ${{ secrets.RED_HAT_QUAY_CLI_PASSWORD }}
-      - name: Push container image to quay container registry
-        run: make docker-push-quay
+      - name: Build container image
+        run: make docker-build
+      - name: Push container image to dockerhub and quay
+        run: make docker-push
 
   publish-manifests-image:
     runs-on: ubuntu-latest
diff --git a/Makefile b/Makefile
index b3a01b0c..c8063b1a 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ GO_VERSION ?= 1.14
 GO := $(or $(shell which go${GO_VERSION}),$(shell which go))
 
 # Docker image configuration
-# Docker images are published to https://quay.io/repository/improbable-eng/etcd-cluster-operator
+# Docker images are published to https://quay.io/repository/storageos/etcd-cluster-operator
 DOCKER_TAG ?= ${VERSION}
 DOCKER_REPO ?= storageos
 DOCKER_IMAGES ?= controller proxy backup-agent restore-agent
@@ -233,25 +233,11 @@ docker-build-%: FORCE
 		--build-arg BACKUP_AGENT_IMAGE=${DOCKER_IMAGE_BACKUP_AGENT} \
 		--build-arg RESTORE_AGENT_IMAGE=${DOCKER_IMAGE_RESTORE_AGENT} \
 		--tag ${DOCKER_REPO}/${DOCKER_IMAGE_NAME_PREFIX}$*:${DOCKER_TAG} \
-		--file Dockerfile \
-		${CURDIR}
-FORCE:
-
-.PHONY: docker-build-quay
-docker-build-quay: ## Build the all the docker images
-docker-build-quay: $(addprefix docker-build-quay-,$(DOCKER_IMAGES))
-
-docker-build-quay-%: FORCE
-	docker build --target $* \
-		--build-arg GO_VERSION=${GO_VERSION} \
-		--build-arg VERSION=$(VERSION) \
-		--build-arg BACKUP_AGENT_IMAGE=${DOCKER_IMAGE_BACKUP_AGENT} \
-		--build-arg RESTORE_AGENT_IMAGE=${DOCKER_IMAGE_RESTORE_AGENT} \
 		--tag quay.io/${DOCKER_REPO}/${DOCKER_IMAGE_NAME_PREFIX}$*:${DOCKER_TAG} \
 		--file Dockerfile \
 		${CURDIR}
-FORCE:
 
+FORCE:
 
 .PHONY: docker-push
 docker-push: ## Push all the docker images
@@ -259,6 +245,7 @@ docker-push: $(addprefix docker-push-,$(DOCKER_IMAGES))
 
 docker-push-%: FORCE
 	docker push ${DOCKER_REPO}/${DOCKER_IMAGE_NAME_PREFIX}$*:${DOCKER_TAG}
+	docker push quay.io/${DOCKER_REPO}/${DOCKER_IMAGE_NAME_PREFIX}$*:${DOCKER_TAG}
 FORCE:
 
 # Run the supplied make target argument in a temporary workspace and diff the results.
@@ -266,13 +253,6 @@ verify-%: FORCE
 	./hack/verify.sh ${MAKE} -s $*
 FORCE:
 
-.PHONY: docker-push-quay
-docker-push-quay: ## Push all the docker images
-docker-push-quay: $(addprefix docker-push-quay-,$(DOCKER_IMAGES))
-
-docker-push-quay-%: FORCE
-	docker push quay.io/${DOCKER_REPO}/${DOCKER_IMAGE_NAME_PREFIX}$*:${DOCKER_TAG}
-FORCE:
 
 # Run the supplied make target argument in a temporary workspace and diff the results.
 verify-%: FORCE