diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index ed1509c9..c384c639 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -10,7 +10,7 @@ env:
   GHCR_REGISTRY: ghcr.io
   DOCKERHUB_REGISTRY: docker.io
   IMAGE_NAME: ${{ github.repository }}
-  DOCKERHUB_IMAGE: ${{ secrets.DOCKERHUB_USERNAME }}/${{ github.event.repository.name }}
+  DOCKERHUB_IMAGE: evoapicloud/evo-ai
 
 jobs:
   build-and-push:
@@ -49,6 +49,7 @@ jobs:
             type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
             type=sha
             type=ref,event=branch
+            type=ref,event=tag
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
diff --git a/docker-compose.yml b/docker-compose.yml
index 69163607..98458093 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,6 +2,7 @@ version: "3.8"
 
 services:
   api:
+    image: evo-ai-api:latest
     build: .
     container_name: evo-ai-api
     depends_on: