diff --git a/.github/workflows/deploy-docker.yaml b/.github/workflows/deploy-docker.yaml
index 8ff8f7a4..39c9fb09 100644
--- a/.github/workflows/deploy-docker.yaml
+++ b/.github/workflows/deploy-docker.yaml
@@ -4,6 +4,8 @@ on:
   push:
     branches:
       - 'main'
+    tags:
+      - '*'
 
 jobs:
   docker:
@@ -15,6 +17,12 @@ jobs:
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
+      -
+        name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: plumeorg/plume
       -
         name: Login to DockerHub
         uses: docker/login-action@v1
@@ -27,4 +35,4 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           push: true
-          tags: plumeorg/plume:latest
+          tags: ${{ steps.meta.outputs.tags == 'master' && 'latest' || steps.meta.outputs.tags }}