diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml
index e94537f..76cfa5b 100644
--- a/.github/workflows/build-images.yml
+++ b/.github/workflows/build-images.yml
@@ -26,9 +26,13 @@ jobs:
         uses: docker/setup-qemu-action@v1
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
-      - name: Log into ghcr
+      - name: Login to GitHub Container Registry
         if: ${{ github.event_name != 'pull_request' && github.event_name != 'push' }}
-        run: echo "${{ secrets.GHCR_TOKEN }}" | docker login ghcr.io -u catthehacker --password-stdin
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GHCR_TOKEN }}
       - name: Check which version is currently `ubuntu-latest`
         id: ubuntu_latest
         if: ${{ matrix.DISTRIB_RELEASE == 'latest' }}