diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7aa80d0b..705db4f3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ jobs:
         uses: actions/checkout@v2
       - name: Compile and test
         id: ci
-        uses: ignition-tooling/action-ignition-ci@master
+        uses: ignition-tooling/action-ignition-ci@bionic
         with:
           codecov-token: ${{ secrets.CODECOV_TOKEN }}
   focal-ci:
diff --git a/README.md b/README.md
index 9b7bbc9f..cdc0d1fa 100644
--- a/README.md
+++ b/README.md
@@ -1,15 +1,21 @@
-# Ignition Messages
+# Ignition Messages: Protobuf messages and functions for robot applications
 
-**Protobuf messages and functions for robot applications.**
+**Maintainer:** caguero AT openrobotics DOT org
 
-Ignition Messages is a component in the ignition framework, a set
-of libraries designed to rapidly develop robot applications.
+[![GitHub open issues](https://img.shields.io/github/issues-raw/ignitionrobotics/ign-msgs.svg)](https://github.com/ignitionrobotics/ign-msgs/issues)
+[![GitHub open pull requests](https://img.shields.io/github/issues-pr-raw/ignitionrobotics/ign-msgs.svg)](https://github.com/ignitionrobotics/ign-msgs/pulls)
+[![Discourse topics](https://img.shields.io/discourse/https/community.gazebosim.org/topics.svg)](https://community.gazebosim.org)
+[![Hex.pm](https://img.shields.io/hexpm/l/plug.svg)](https://www.apache.org/licenses/LICENSE-2.0)
 
-[http://ignitionrobotics.org](http://ignitionrobotics.org)
+Build | Status
+-- | --
+Test coverage | [![codecov](https://codecov.io/gh/ignitionrobotics/ign-msgs/branch/ign-msgs6/graph/badge.svg)](https://codecov.io/gh/ignitionrobotics/ign-msgs)
+Ubuntu Bionic | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_msgs-ci-ign-msgs6-bionic-amd64)](https://build.osrfoundation.org/job/ignition_msgs-ci-ign-msgs6-bionic-amd64)
+Homebrew      | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_msgs-ci-ign-msgs6-homebrew-amd64)](https://build.osrfoundation.org/job/ignition_msgs-ci-ign-msgs6-homebrew-amd64)
+Windows       | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_msgs-ci-ign-msgs6-windows7-amd64)](https://build.osrfoundation.org/job/ignition_msgs-ci-ign-msgs6-windows7-amd64)
 
-Test coverage:
-
-[![codecov](https://codecov.io/gh/ignitionrobotics/ign-msgs/branch/master/graph/badge.svg)](https://codecov.io/gh/ignitionrobotics/ign-msgs)
+Ignition Messages is a component in the [Ignition](http://ignitionrobotics.org)
+framework, a set of libraries designed to rapidly develop robot applications.
 
 ## Installation