diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 2064429..ad4bf1c 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -14,9 +14,19 @@ jobs:
     - uses: actions/checkout@v3
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v1
+    - name: Get branch name
+      shell: bash
+      run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
+      id: extract_branch
+    - name: Get branch tag
+      shell: bash
+      run: |
+        BRANCH_NAME="$( echo "${{ steps.extract_branch.outputs.branch }}" | sed "s/[^[:alnum:].-]/-/g" )"
+        echo "tag=$BRANCH_NAME" >> $GITHUB_OUTPUT
+      id: sanitize_branch
     - name: Build container
       run: |
-        docker build -f Dockerfile -t taleweaveai .
+        docker build -f Dockerfile -t taleweave-ai .
     - name: Login to Docker Hub
       uses: docker/login-action@v2
       with:
@@ -24,5 +34,5 @@ jobs:
         password: ${{ secrets.DOCKER_PASSWORD }}
     - name: Push container
       run: |
-        docker tag taleweaveai ${{ secrets.DOCKER_USERNAME }}/taleweaveai
-        docker push ${{ secrets.DOCKER_USERNAME }}/taleweaveai
\ No newline at end of file
+        docker tag taleweave-ai apextoaster/taleweave-ai:${{ steps.sanitize_branch.outputs.tag }}
+        docker push apextoaster/taleweave-ai:${{ steps.sanitize_branch.outputs.tag }}
\ No newline at end of file