diff --git a/.github/workflows/post-merge.yml b/.github/workflows/post-merge.yml
new file mode 100644
index 00000000..3b0727ab
--- /dev/null
+++ b/.github/workflows/post-merge.yml
@@ -0,0 +1,27 @@
+name: Post merge to main
+
+on:
+  push:
+    branches: [ main ]
+
+jobs:
+  first_test_job:
+    name: Find extra commits
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - id: Fetch_tags
+        run: git fetch --prune --unshallow --tags
+      - run: git describe --tags
+      - id: set_output_tags
+        run: |
+          echo ::set-output name=extra_commits::$(git describe --tags)
+      - name: Set Badge
+        uses: RubbaBoy/BYOB@v1.2.1
+        with:
+          NAME: Version
+          LABEL: 'Version'
+          STATUS: ${{ steps.set_output_tags.outputs.extra_commits }}
+          COLOR: CFC03A
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 00000000..c0b3bab2
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,32 @@
+name: Manual release creation
+
+on:
+  workflow_dispatch:
+    inputs:
+      release_name:
+        description: "Release name"
+        required: true
+
+jobs:
+  release_badge:
+    name: Create Release and Add Badge
+    runs-on: ubuntu-latest
+    steps:
+      - name: Create release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_CONTEXT: ${{ toJson(github) }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.event.inputs.release_name }}
+          release_name: ${{ github.event.inputs.release_name }}
+          body: ${{ github.event.head_commit.message }}
+      - name: Set Badge
+        uses: RubbaBoy/BYOB@v1.2.1
+        with:
+          NAME: Version
+          LABEL: 'Version'
+          STATUS: ${{ github.event.inputs.release_name }}
+          COLOR: 51B077
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
diff --git a/README.md b/README.md
index a812bd31..eb2756e6 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 <img src="site/static/images/probr_wide.png">
 
+![](https://byob.yarr.is/probr/probr-core/Version)
+
 ## Dynamic Application Security Testing (DAST) for Cloud
 
 Probr analyzes the complex behaviours and interactions in your cloud resources to enable engineers, developers and operations teams identify and fix security related flaws at different points in the lifecycle.