diff --git a/.buildkite/build.pipeline.yml b/.buildkite/build.pipeline.yml
index c0c2f90..64be323 100644
--- a/.buildkite/build.pipeline.yml
+++ b/.buildkite/build.pipeline.yml
@@ -1,7 +1,6 @@
 steps:
 
-  - label: Docker image
+  - label: Build Docker image
     command:
-      - TAG=${BUILDKITE_TAG:-${BUILDKITE_COMMIT}}
-      - gcloud docker -- build --tag gcr.io/infolinks-gcr/slugger:${TAG} .
-      - gcloud docker -- push gcr.io/infolinks-gcr/slugger:${TAG}
+      - gcloud docker -- build --tag gcr.io/infolinks-gcr/slugger:${BUILDKITE_COMMIT} .
+      - gcloud docker -- push gcr.io/infolinks-gcr/slugger:${BUILDKITE_COMMIT}
diff --git a/.buildkite/release.pipeline.yml b/.buildkite/release.pipeline.yml
new file mode 100644
index 0000000..6754e65
--- /dev/null
+++ b/.buildkite/release.pipeline.yml
@@ -0,0 +1,9 @@
+steps:
+
+  - label: Build versioned Docker image
+    command:
+      - gcloud docker -- pull gcr.io/infolinks-gcr/slugger:${BUILDKITE_COMMIT}
+      - gcloud docker -- tag gcr.io/infolinks-gcr/slugger:${BUILDKITE_COMMIT} infolinks/slugger:${VERSION}
+      - gcloud docker -- push infolinks/slugger:${VERSION}
+      - gcloud docker -- tag gcr.io/infolinks-gcr/slugger:${BUILDKITE_COMMIT} infolinks/slugger:latest
+      - gcloud docker -- push infolinks/slugger:latest