diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 77eaa30..9092cea 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -4,6 +4,8 @@ on:
   push:
     branches:
       - master
+    tags:
+      - "v*.*.*"
 jobs:
   build:
 
@@ -29,5 +31,12 @@ jobs:
         automatic_release_tag: "latest"
         prerelease: true
         title: "Development Build"
+        files: |
+          org.jboss.tools.pde.sourcelookup.site/target/flat-repository/*
+
+    - name: Release
+      uses: softprops/action-gh-release@v1
+      if: startsWith(github.ref, 'refs/tags/')
+      with:
         files: |
           org.jboss.tools.pde.sourcelookup.site/target/flat-repository/*
\ No newline at end of file
diff --git a/README.md b/README.md
index ecefa52..0eae1af 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # PDE Source Lookup
-[![Build](https://github.com/fbricon/pde.source.lookup/actions/workflows/ci.yaml/badge.svg)](https://github.com/fbricon/pde.source.lookup/actions/workflows/ci.yaml)
+[![CI Build](https://github.com/fbricon/pde.source.lookup/actions/workflows/ci.yaml/badge.svg)](https://github.com/fbricon/pde.source.lookup/actions/workflows/ci.yaml)
 
 Proof of Concept to automatically fetch missing source bundles from enabled p2 repositories, when opening a bundle jar (similar to m2e).
 It's also possible to fetch all sources from the `Plug-in Dependencies` classpath container, with a right-click and selecting `Download Bundle Sources`.