diff --git a/.circleci/config.yml b/.circleci/config.yml
index b3a4625..f2f4a7f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -19,7 +19,7 @@ jobs:
       - run:
           name: Build Docker image
           command: |
-            docker build -t $IMAGE_NAME:$IMAGE_TAG $DOCKERFILE_PATH
+            docker build -t $IMAGE_NAME:$IMAGE_TAG $DOCKERFILE_PATH --label "org.opencontainers.image.version=${CIRCLE_TAG/v/''}"
       - run:
           name: Cache Docker image
           command: docker save -o $IMAGE_TAG.tar $IMAGE_NAME
diff --git a/Dockerfile b/Dockerfile
index 6aa803e..8ac900d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,13 @@
-FROM peterevans/xenial-gcloud:1.2.22
+FROM peterevans/xenial-gcloud:1.2.23
 
-MAINTAINER Peter Evans <pete.evans@gmail.com>
+LABEL \
+  maintainer="Peter Evans <mail@peterevans.dev>" \
+  org.opencontainers.image.title="osrm-backend-k8s" \
+  org.opencontainers.image.description="Open Source Routing Machine (OSRM) osrm-backend for Kubernetes on Google Container Engine (GKE)." \
+  org.opencontainers.image.authors="Peter Evans <mail@peterevans.dev>" \
+  org.opencontainers.image.url="https://github.com/peter-evans/osrm-backend-k8s" \
+  org.opencontainers.image.vendor="https://peterevans.dev" \
+  org.opencontainers.image.licenses="MIT"
 
 ENV OSRM_VERSION 5.22.0
 
diff --git a/README.md b/README.md
index 73d17e2..7faf121 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ If you are looking for a more general purpose docker image, see [osrm-backend-do
 
 ## Supported tags and respective `Dockerfile` links
 
-- [`1.21.0`, `1.21`, `latest`  (*1.21/Dockerfile*)](https://github.com/peter-evans/osrm-backend-k8s/tree/master)
+- [`1.21.1`, `1.21`, `latest`  (*1.21/Dockerfile*)](https://github.com/peter-evans/osrm-backend-k8s/tree/master)
 - [`1.20.0`, `1.20` (*1.20/Dockerfile*)](https://github.com/peter-evans/osrm-backend-k8s/tree/master/archive/1.20)
 - [`1.19.0`, `1.19` (*1.19/Dockerfile*)](https://github.com/peter-evans/osrm-backend-k8s/tree/master/archive/1.19)
 - [`1.18.0`, `1.18` (*1.18/Dockerfile*)](https://github.com/peter-evans/osrm-backend-k8s/tree/master/archive/1.18)