diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml
index 4b103f8..1f56da7 100644
--- a/.github/workflows/build-and-publish.yml
+++ b/.github/workflows/build-and-publish.yml
@@ -11,41 +11,41 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout code
+      - name: Repository Checkout
         uses: actions/checkout@v2
 
-      - name: Docker meta
+      - name: Docker Image Metadata
         id: meta
         uses: docker/metadata-action@v3
         with:
           images: |
-            ngoduykhanh/powerdns-admin
+            powerdnsadmin/pda-legacy
           tags: |
             type=ref,event=tag
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}
 
-      - name: Set up Docker Buildx
+      - name: Docker Buildx Setup
         id: buildx
         uses: docker/setup-buildx-action@v1
 
-      - name: Login to DockerHub
+      - name: Docker Hub Authentication
         uses: docker/login-action@v1
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          username: ${{ secrets.DOCKERHUB_USERNAME_V2 }}
+          password: ${{ secrets.DOCKERHUB_TOKEN_V2 }}
 
-      - name: Build latest image
+      - name: Docker Image Build
         uses: docker/build-push-action@v2
         if: github.ref == 'refs/heads/master'
         with:
           context: ./
           file: ./docker/Dockerfile
           push: true
-          tags: ngoduykhanh/powerdns-admin:latest
+          tags: powerdnsadmin/pda-legacy:latest
 
-      - name: Build release image
+      - name: Docker Image Release Tagging
         uses: docker/build-push-action@v2
         if: ${{ startsWith(github.ref, 'refs/tags/v') }}
         with:
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 5296e02..f0a0731 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,5 +1,4 @@
 FROM alpine:3.13 AS builder
-LABEL maintainer="k@ndk.name"
 
 ARG BUILD_DEPENDENCIES="build-base \
     libffi-dev \