diff --git a/README.md b/README.md
index 69de43bb..12695132 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,5 @@
-![Unit tests](https://github.com/mendix/widgets-tools/actions/workflows/UnitTests.yml/badge.svg?branch=master)
+![Unit tests](https://github.com/mendix/widgets-tools/actions/workflows/TestAndBuild.yml/badge.svg?branch=master)
 ![PWT Commands Tests](https://github.com/mendix/widgets-tools/actions/workflows/TestPWTCommands.yml/badge.svg?branch=master)
-![Publisn NPM](https://github.com/mendix/widgets-tools/actions/workflows/PublishNpm.yml/badge.svg?branch=master)
 
 # Widgets tools
 
diff --git a/packages/generator-widget/README.md b/packages/generator-widget/README.md
index 32b6ad85..bac038de 100644
--- a/packages/generator-widget/README.md
+++ b/packages/generator-widget/README.md
@@ -1,11 +1,9 @@
 # Mendix Pluggable Widgets Generator
 
 ![npm version](https://badge.fury.io/js/%40mendix%2Fgenerator-widget.svg)
-![Mendix 8](https://img.shields.io/badge/mendix-8.0.0-brightgreen.svg)
-![Build Status](https://travis-ci.org/mendix/widgets-tools.svg?branch=master)
 ![npm](https://img.shields.io/npm/dm/@mendix/generator-widget)
-![GitHub release](https://img.shields.io/github/release/mendix/widgets-tools)
-![GitHub issues](https://img.shields.io/github/issues/mendix/widgets-tools)
+![GitHub Release](https://img.shields.io/github/v/release/mendix/widgets-tools?sort=semver&filter=generator-widget-v*&link=https%3A%2F%2Fgithub.com%2Fmendix%2Fwidgets-tools%2Freleases)
+![GitHub Issues](https://img.shields.io/github/issues/mendix/widgets-tools?link=https%3A%2F%2Fgithub.com%2Fmendix%2Fwidgets-tools%2Fissues)
 
 ## About
 
diff --git a/packages/pluggable-widgets-tools/README.md b/packages/pluggable-widgets-tools/README.md
index a5fc8c54..0a9cb844 100644
--- a/packages/pluggable-widgets-tools/README.md
+++ b/packages/pluggable-widgets-tools/README.md
@@ -1,11 +1,9 @@
 # Pluggable Widgets Tools
 
 ![npm version](https://badge.fury.io/js/%40mendix%2Fpluggable-widgets-tools.svg)
-![Mendix 8](https://img.shields.io/badge/mendix-8.0.0-brightgreen.svg)
-![Build Status](https://travis-ci.org/mendix/widgets-tools.svg?branch=master)
 ![npm](https://img.shields.io/npm/dm/@mendix/pluggable-widgets-tools)
-![GitHub release](https://img.shields.io/github/release/mendix/widgets-tools)
-![GitHub issues](https://img.shields.io/github/issues/mendix/widgets-tools)
+![GitHub Release](https://img.shields.io/github/v/release/mendix/widgets-tools?filter=pluggable-widgets-tools-v*&link=https%3A%2F%2Fgithub.com%2Fmendix%2Fwidgets-tools%2Freleases)
+![GitHub Issues](https://img.shields.io/github/issues/mendix/widgets-tools?link=https%3A%2F%2Fgithub.com%2Fmendix%2Fwidgets-tools%2Fissues)
 
 ## About