diff --git a/.drone.yml b/.drone.yml
index e3f421e..b2e0d1d 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -27,19 +27,35 @@ steps:
   - npm install --prefix assets
   - mix test
 
-- name: build and publish
+- name: build and publish stable
   image: plugins/docker
   settings:
     repo: shibaobun/cannery
-    tags: latest
     username:
       from_secret: docker_username
     password:
       from_secret: docker_password
+    tags:
+      - latest
+      - ${DRONE_TAG}
   when:
     branch:
     - stable
 
+- name: build and publish tagged version
+  image: plugins/docker
+  settings:
+    repo: shibaobun/cannery
+    username:
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
+    tags:
+      - ${DRONE_TAG}
+  when:
+    event:
+    - tag
+
 - name: rebuild-cache
   image: drillster/drone-volume-cache
   volumes:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d64f770..b87cc72 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,8 @@
-# 0.2.1
+# v0.2.1
 - Fix checkbox spacing for mobile view
 - Fix spacing with form elements in mobile view
 
-# 0.2.0
+# v0.2.0
 - Add or remove tags from containers list and details page
 - Show tags on containers
 - Add "Cannery" to page titles
@@ -12,5 +12,5 @@
 - Show shot history for an ammo group
 - Show ammo round totals and total shot for ammo types
 
-# 0.1.0
+# v0.1.0
 - Initial release!