diff --git a/.github/workflows/make-package.yml b/.github/workflows/make-package.yml
index 8e3fd965..a7920e36 100644
--- a/.github/workflows/make-package.yml
+++ b/.github/workflows/make-package.yml
@@ -38,8 +38,8 @@ jobs:
 
       - name: Build
         run: |
-          docker build --file Dockerfile --tag $TAG_LATEST .
-          docker build --file Dockerfile --tag $TAG_VERSION .
+          docker build --file Dockerfile --tag $(cat TAG_LATEST) .
+          docker build --file Dockerfile --tag $(cat TAG_VERSION) .
 
       - name: Logs / docker (inspect, history, version, info), uname
         run: |
@@ -51,6 +51,6 @@ jobs:
 
       - name: Publish on Docker hub
         run: |
-          echo ${{ secrets.DOCKERHUB_TOKEN }} | docker login --username $(cat DOCKERHUB_USER) --password-stdin
+          echo ${{ secrets.DOCKERHUB_TOKEN }} | docker login --username ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
           docker push $(cat TAG_LATEST)
           docker push $(cat TAG_VERSION)