diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index bc3efcc..335115f 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -1,7 +1,7 @@
 # This workflow will build a Java project with Maven
 # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
 
-name: Build with Maven
+name: Java CI with Maven
 
 on:
   push:
@@ -11,19 +11,20 @@ on:
 
 jobs:
   build:
+    name: Build/Test
 
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        java: [ 8, 11, 17 ]
+        java: [ 8, 11, 17, 21 ]
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v2
+    - uses: actions/checkout@v4
+    - name: Set up JDK ${{ matrix.java }}
+      uses: actions/setup-java@v4
       with:
         distribution: 'adopt'
         java-version: ${{ matrix.java }}
     - name: Build with Maven
-      run: mvn -B verify
+      run: mvn -B clean verify
diff --git a/README.md b/README.md
index 0b5dc88..bd05ef4 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,9 @@
 # futuristic-feline
 
+![Build status](https://github.com/spotify/futuristic-feline/actions/workflows/maven.yml/badge.svg)
+[![license](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](https://github.com/spotify/futuristic-feline/blob/main/LICENSE)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.spotify/futuristic-feline/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.spotify/futuristic-feline)
+
 ![](images/future-is-ours.jpg)
 
 futuristic-feline is a library for detecting blocking Java futures at runtime. It is inspired by the excellent [BlockHound](https://github.com/reactor/BlockHound).
@@ -32,14 +36,6 @@ To get started, add a dependency on:
     </dependency>
 ```
 
-## Build status
-
-![Build status](https://github.com/spotify/futuristic-feline/actions/workflows/maven.yml/badge.svg)
-
-## Maven central
-
-[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.spotify/futuristic-feline/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.spotify/futuristic-feline)
-
 ## Metrics integration
 
 It is often useful to create a metric for the rate of blocking calls. At Spotify we have built this into our service framework using [semantic-metrics](https://github.com/spotify/semantic-metrics).