diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2471da6..09dedb8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,15 +4,27 @@ jobs:
   build:
     docker:
       - image: cimg/base:2022.05
+        auth:
+          username: supanadit
+          password: $DOCKER_HUB_PASS
     steps:
       - checkout
       - setup_remote_docker
       - run:
           name: Build Docker image
           command: |
-            docker build -t supanadit/todo:latest .
+            docker build -t supanadit/todo:${CIRCLE_TAG} -t supanadit/todo:latest .
       - run:
           name: Push Docker image
           command: |
-            docker login -u supanadit -p $DOCKER_HUB_PASS
+            docker push supanadit/todo:${CIRCLE_TAG}
             docker push supanadit/todo:latest
+
+workflows:
+  version: 2
+  build-and-deploy:
+    jobs:
+      - build:
+          filters:
+            tags:
+              only: /^v\d+\.\d+(\.\d+)?(-\S*)?$/