diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 306c0ff16..bf668503c 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -10,6 +10,8 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    env:
+      DOCKERHUB_ORG: ${{ vars.DOCKERHUB_ORG || 'gns3' }}
 
     steps:
     - name: Checkout code
@@ -53,7 +55,7 @@ jobs:
         context: .
         push: true
         tags: |
-          ${{ 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
+          ${{ env.DOCKERHUB_ORG }}/${{ github.event.repository.name }}:${{ steps.ver.outputs.tag }}
+          ${{ env.DOCKERHUB_ORG }}/${{ 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