diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 61924ced..a8a96b3f 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -4,8 +4,6 @@ on:
   push:
     branches:
       - master
-    tags:
-      - v*
   repository_dispatch:
     types: [run_build]
 
@@ -17,16 +15,6 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-    - name: Extract DOCKER_TAG using tag name
-      if: startsWith(github.ref, 'refs/tags/')
-      run: |
-        echo "DOCKER_TAG=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
-    
-    - name: Use default DOCKER_TAG
-      if: startsWith(github.ref, 'refs/tags/') != true
-      run: |
-        echo "DOCKER_TAG=latest" >> $GITHUB_ENV
-
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v3
       
@@ -43,9 +31,9 @@ jobs:
     - uses: docker/build-push-action@v5
       with:
         push: true
-        tags: ghcr.io/${{ github.repository }}:${{ env.DOCKER_TAG }}
+        tags: ghcr.io/${{ github.repository }}:latest
         build-args: |
-          BASE_DOCKER_IMAGE=ghcr.io/${{ github.repository_owner }}/psptoolchain:${{ env.DOCKER_TAG }}
+          BASE_DOCKER_IMAGE=ghcr.io/${{ github.repository_owner }}/psptoolchain:latest
     
     - name: Send Compile action
       run: |
@@ -58,7 +46,7 @@ jobs:
         repository: ${{ github.repository_owner }}/psp-packages
         token: ${{ secrets.DISPATCH_TOKEN }}
         event-type: ${{ env.NEW_DISPATCH_ACTION }}
-        client-payload: '{"ref": "${{ github.ref }}"}'
+        client-payload: '{"ref": "refs/heads/master"}'
     
     - name: Repository Dispatch to psplinkusb
       uses: peter-evans/repository-dispatch@v2
@@ -66,4 +54,4 @@ jobs:
         repository: ${{ github.repository_owner }}/psplinkusb
         token: ${{ secrets.DISPATCH_TOKEN }}
         event-type: ${{ env.NEW_DISPATCH_ACTION }}
-        client-payload: '{"ref": "${{ github.ref }}"}'
+        client-payload: '{"ref": "refs/heads/master"}'