diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a194262..7ae56d2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,6 +17,8 @@ on:
 env:
   REGISTRY: ghcr.io
   NEXUS_REGISTRY: nexus.jamjon3.sytes.net:5443
+  GITHUB_DOCKER_USER: ${{ github.actor }}
+  NEXUS_DOCKER_USER: ${{ secrets.HOME_NEXUS_DOCKER_USER }}
 
 jobs:
   build-and-push:
@@ -31,11 +33,11 @@ jobs:
         registry: [ 'ghcr.io', 'nexus.jamjon3.sytes.net:5443' ]
         include:
           - registry: ghcr.io
-            user: ${{ github.actor }}
-            password: ${{ secrets.GITHUB_TOKEN }}
+            user: GITHUB_DOCKER_USER
+            password: GITHUB_TOKEN
           - registry: nexus.jamjon3.sytes.net:5443
-            user: ${{ secrets.HOME_NEXUS_DOCKER_USER }}
-            password: ${{ secrets.HOME_NEXUS_DOCKER_PASSWORD }}
+            user: NEXUS_DOCKER_USER
+            password: HOME_NEXUS_DOCKER_PASSWORD
 
     steps:
       # Downloads a copy of the code in your repository before running CI tests
@@ -48,8 +50,8 @@ jobs:
         uses: azure/docker-login@v1
         with:
           login-server: ${{ matrix.registry }}
-          username: ${{ matrix.user }}
-          password: ${{ matrix.password }}
+          username: ${{ env[matrix.user] }}
+          password: ${{ secrets[matrix.password] }}
       # - name: Docker Login
       #   uses: azure/docker-login@v1
       #   with: