diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 50add974f..fec449ba2 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -1,10 +1,11 @@
 name: Build and Push Docker Image
 
 on:
+  workflow_dispatch:
   push:
-    branches: [ main, master, enhancement/**, dev ]
-  pull_request:
-    branches: [ main, master, enhancement/**, dev ]
+    tags:
+      - v2.*
+      - v3.*
 
 jobs:
   build:
@@ -18,8 +19,8 @@ jobs:
       uses: docker/login-action@v3
       with:
         registry: ghcr.io
-        username: ${{ github.actor }}
-        password: ${{ secrets.GH_TOKEN }}
+        username: ${{ github.repository_owner }}
+        password: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Login to Docker Hub
       uses: docker/login-action@v3
@@ -35,5 +36,5 @@ jobs:
 
     - name: Build and push to Docker Hub
       run: |
-        docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/${{ github.event.repository.name }}:latest .
-        docker push ${{ secrets.DOCKERHUB_USERNAME }}/${{ github.event.repository.name }}:latest
+        docker build -t gns3/${{ github.event.repository.name }}:latest .
+        docker push gns3/${{ github.event.repository.name }}:latest