diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 3d265f4..64d4a04 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -11,10 +11,9 @@ on:
 
 env:
   IMAGE_NAME: idaas-book
+  HUGO_BASE_URL: https://www.nxest.com/idaas-book/
 
 jobs:
-  # Push image to GitHub Packages.
-  # See also https://docs.docker.com/docker-hub/builds/
   push:
     runs-on: ubuntu-latest
     if: github.event_name == 'push'
@@ -31,7 +30,7 @@ jobs:
           hugo-version: '0.80.0'
 
       - name: Build
-        run: hugo --minify --baseURL /idaas-book
+        run: hugo --minify --baseURL $HUGO_BASE_URL
 
       - name: Login to dockerhub
         uses: docker/login-action@v1
@@ -62,8 +61,8 @@ jobs:
           [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
 
           docker buildx build \
-            --tag nxest/idaas-book:$VERSION \
-            --tag nxest/idaas-book:lastest \
+            --tag nxest/$IMAGE_NAME:$VERSION \
+            --tag nxest/$IMAGE_NAME:lastest \
             --platform linux/amd64,linux/arm64 \
             -f Dockerfile ./ \
             --push