diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 0000000000..8a14a9c193
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,37 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    name: Release OnDemand
+    steps:
+      - name: Set version
+        id: version
+        run: echo ::set-output name=version::${GITHUB_REF#refs/*/v}
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Setup Ruby using Bundler
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "2.7.1"
+          bundler: "2.1.4"
+          bundler-cache: true
+      - name: Generate tar.gz
+        run: bundle exec rake package:tar
+        env:
+          VERSION: ${{ steps.version.outputs.version }}
+      - name: Upload to Zenodo
+        uses: rseng/zenodo-release@0.0.17
+        with:
+          token: ${{ secrets.OSC_ROBOT_ZENODO_TOKEN }}
+          version: ${{ steps.version.outputs.version }}
+          zenodo_json: .zenodo.json
+          archive: packaging/v${{ steps.version.outputs.version }}.tar.gz
+          doi: '10.5281/zenodo.6323791'
diff --git a/.zenodo.json b/.zenodo.json
new file mode 100644
index 0000000000..8bff5a9809
--- /dev/null
+++ b/.zenodo.json
@@ -0,0 +1,29 @@
+{
+  "upload_type": "software", 
+  "description": "This is the source code for Open OnDemand. You can find all releases on github at https://github.com/OSC/ondemand/releases.",
+  "title": "Open OnDemand Source Code",
+  "creators": [
+    {
+      "affiliation": "Ohio SuperComputer Center",
+      "name": "Jeff Ohrstrom"
+    },
+    {
+      "affiliation": "Ohio SuperComputer Center",
+      "name": "Travis Ravert"
+    },
+    {
+      "affiliation": "Ohio SuperComputer Center",
+      "name": "Gerald Byrket"
+    },
+    {
+      "affiliation": "Ohio SuperComputer Center",
+      "name": "Trey Dockendorf"
+    },
+    {
+      "affiliation": "Ohio SuperComputer Center",
+      "name": "Alan Chalker"
+    }
+  ],
+  "keywords": ["gateway", "hpc", "ruby", "rails"],
+  "license": "MIT"
+}