diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 00000000000..4cfa958cccc
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,28 @@
+name: "Build and push artifacts"
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  build:
+    name: Release artifacts
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set version
+        run: |
+          tag_name="${GITHUB_REF##*/}"
+          tag_name=$(grep -o '[0-9].*' <<< $tag_name)
+          tag_value="${tag_name}-ice36"
+          echo "omero.version=$tag_value" >> etc/local.properties
+      - name: Build and package
+        run: ./build.py build-dev release-all release-src
+      - name: Create a release and upload Release Assets
+        run: |
+          cd target
+          tag_name="${GITHUB_REF##*/}"
+          sha256sum ./*.zip >> SHASUMS
+          gh release create "$tag_name" ./*.zip SHASUMS
+        env: 
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/build.xml b/build.xml
index d5f3c9503b3..1c85d14eb90 100644
--- a/build.xml
+++ b/build.xml
@@ -259,7 +259,7 @@ To get started using Eclipse, execute "ant build-dev" and import the top-level
             <arg value="${omero.home}/components/antlib/scripts/source-archive.py"/>
             <arg value="openmicroscopy"/>
             <arg value="${omero.shortversion}"/>
-            <arg value="${omero.plainversion}"/>
+            <arg value="${omero.version}"/>
             <arg value="${omero.vcs.shortrevision}"/>
             <arg value="${omero.vcs.revision}"/>
             <arg value="${omero.vcs.date}"/>
@@ -269,7 +269,7 @@ To get started using Eclipse, execute "ant build-dev" and import the top-level
 
     </target>
 
-    <target name="release-src" description="Package the git source tree into openmicroscopy-${omero.plainversion}.zip"
+    <target name="release-src" description="Package the git source tree into openmicroscopy-${omero.version}.zip"
             depends="release-src-embed,release-src-git"/>
 
     <target name="release-clients" description="Zip the Java zip">