diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index a07e720d9..306c0ff16 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -53,7 +53,7 @@ jobs:
         context: .
         push: true
         tags: |
-          gns3/${{ github.event.repository.name }}:${{ steps.ver.outputs.tag }}
-          gns3/${{ github.event.repository.name }}:latest
+          ${{ vars.DOCKERHUB_ORG != '' && vars.DOCKERHUB_ORG || 'gns3 }}/${{ github.event.repository.name }}:${{ steps.ver.outputs.tag }}
+          ${{ vars.DOCKERHUB_ORG != '' && vars.DOCKERHUB_ORG || 'gns3 }}/${{ github.event.repository.name }}:latest
           ghcr.io/${{ github.repository_owner }}/${{ github.event.repository.name }}:${{ steps.ver.outputs.tag }}
           ghcr.io/${{ github.repository_owner }}/${{ github.event.repository.name }}:latest