diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml
index f9c83a4..7fec344 100644
--- a/.github/workflows/build-images.yml
+++ b/.github/workflows/build-images.yml
@@ -29,8 +29,18 @@ jobs:
         uses: docker/setup-buildx-action@v2
         with:
           install: true
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        if: ${{ github.ref != 'refs/heads/master' }} && ${{ github.event_name != 'pull_request' }} || ${{ github.event_name == 'schedule' }}
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        if: ${{ github.ref != 'refs/heads/master' }} && ${{ github.event_name != 'pull_request' }} || ${{ github.event_name == 'schedule' }}
+        with:
+          registry: ghcr.io
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ github.token }}
       - name: Docker Build
-        env:
-          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
         run: ./buildx.sh ${{ github.event_name }} ${{ matrix.destination-image }} ${{ matrix.base-image }}