diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 4815b88..1576f62 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -6,6 +6,8 @@ name: Build docker image
 on:
   push:
     branches: [ "main" ]
+    tags:
+      - v*
   pull_request:
     branches: [ "main" ]
 
@@ -44,12 +46,19 @@ jobs:
     - name: Test API's
       run: pytest
     
-    # docker related ops
+    # docker related ops, only run on tags
     - name: Commit the docker container
-      run: docker commit fin kskarthik/indian-fincodes-api:latest
+      if: ${{github.ref_type == 'tag'}}
+      run: |
+        docker commit fin kskarthik/indian-fincodes-api:latest
+        docker tag kskarthik/indian-fincodes-api:latest kskarthik/indian-fincodes-api:${{github.ref_name}}
 
     - name: Authenticate to Docker Hub
+      if: ${{github.ref_type == 'tag'}}
       run: docker login -u kskarthik -p ${{ secrets.DOCKER_HUB_PWD }}
 
     - name: Push Docker Image to Hub
-      run: docker push kskarthik/indian-fincodes-api:latest
+      if: ${{github.ref_type == 'tag'}}
+      run: |
+        docker push kskarthik/indian-fincodes-api:latest
+        docker push kskarthik/indian-fincodes-api:${{ github.ref_name }}
diff --git a/main.py b/main.py
index 52784aa..a45255f 100755
--- a/main.py
+++ b/main.py
@@ -22,7 +22,6 @@
 import requests as r
 import requests
 import threading
-import time
 
 client = meilisearch.Client("http://127.0.0.1:7700", "masterKey")