diff --git a/.github/workflows/deploy-docker-latest.yaml b/.github/workflows/deploy-docker-latest.yaml
new file mode 100644
index 00000000..8ff8f7a4
--- /dev/null
+++ b/.github/workflows/deploy-docker-latest.yaml
@@ -0,0 +1,30 @@
+name: cd
+
+on:
+  push:
+    branches:
+      - 'main'
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      -
+        name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v2
+        with:
+          push: true
+          tags: plumeorg/plume:latest
diff --git a/.github/workflows/deploy-docker.yaml b/.github/workflows/deploy-docker-tag.yaml
similarity index 83%
rename from .github/workflows/deploy-docker.yaml
rename to .github/workflows/deploy-docker-tag.yaml
index 39c9fb09..2be42eab 100644
--- a/.github/workflows/deploy-docker.yaml
+++ b/.github/workflows/deploy-docker-tag.yaml
@@ -2,10 +2,8 @@ name: cd
 
 on:
   push:
-    branches:
-      - 'main'
     tags:
-      - '*'
+      - *.*.*
 
 jobs:
   docker:
@@ -35,4 +33,4 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           push: true
-          tags: ${{ steps.meta.outputs.tags == 'master' && 'latest' || steps.meta.outputs.tags }}
+          tags: plumeorg/plume:v${{ steps.meta.outputs.tags }}