diff --git a/.github/workflows/build-jobs.yml b/.github/workflows/nightly-build-publish.yml
similarity index 96%
rename from .github/workflows/build-jobs.yml
rename to .github/workflows/nightly-build-publish.yml
index e4b459081..800c9bbff 100644
--- a/.github/workflows/build-jobs.yml
+++ b/.github/workflows/nightly-build-publish.yml
@@ -7,7 +7,7 @@
 # SPDX-License-Identifier: EPL-2.0
 #
 
-name: Build/Push
+name: Build/Publish
 
 on:
   push:
@@ -15,7 +15,7 @@ on:
       - master
 
 jobs:
-  nightly-build-push:
+  nightly-build-publish:
     runs-on: ubuntu-latest
     steps:
       - name: Clone source code
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 000000000..8a1519e05
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,58 @@
+#
+# Copyright (c) 2020 Red Hat, Inc.
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+
+name: Release Che Devfile Registry
+
+on:
+  push:
+    branches: 
+      - release
+    paths:
+      - VERSION
+
+jobs:
+  release-build-publish:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Clone source code
+        uses: actions/checkout@v1
+        with:
+          fetch-depth: 1
+          ref: release
+
+      - name: Login to Quay.io
+        uses: azure/docker-login@v1
+        with:
+          login-server: quay.io
+          username: ${{ secrets.QUAY_USERNAME }}
+          password: ${{ secrets.QUAY_PASSWORD }}
+
+      - name: Login to Docker Hub
+        uses: azure/docker-login@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      - name: Build and push patched base images and happy path image
+        run: |
+          export TAG=$(head -n 1 VERSION)
+          /bin/bash arbitrary-users-patch/happy-path/build_happy_path_image.sh --push
+          /bin/bash arbitrary-users-patch/build_images.sh --push
+
+      - name: Build and push images
+        run: |
+          SHORT_SHA1=$(git rev-parse --short HEAD)
+          VERSION=$(head -n 1 VERSION)
+          IMAGE=che-devfile-registry
+          DOCKERFILE_PATH=./build/dockerfiles/Dockerfile
+          docker build -t ${IMAGE} -f ${DOCKERFILE_PATH} --build-arg PATCHED_IMAGES_TAG=${VERSION} --target registry .
+          docker tag ${IMAGE} quay.io/eclipse/${IMAGE}:${SHORT_SHA1}
+          docker push quay.io/eclipse/${IMAGE}:${SHORT_SHA1}
+          docker tag ${IMAGE} quay.io/eclipse/${IMAGE}:${VERSION}
+          docker push quay.io/eclipse/${IMAGE}:${VERSION}