diff --git a/.github/workflows/images.yml b/.github/workflows/images.yml
index 87fae3bc2e0e..0fa54df768e7 100644
--- a/.github/workflows/images.yml
+++ b/.github/workflows/images.yml
@@ -21,6 +21,9 @@ on:
 
 jobs:
   build:
+    env:
+      HAS_DOCKER_CREDENTIALS: ${{ secrets.DOCKER_PASSWORD != '' }}
+    if: ${{ env.HAS_DOCKER_CREDENTIALS }}
     name: ${{ matrix.cfg.name }}
     runs-on: ubuntu-latest
     strategy:
@@ -53,4 +56,4 @@ jobs:
       # Publish
       - name: Push the ${{ matrix.cfg.id }} image
         if:   github.event_name == 'push' || github.event_name == 'schedule'
-        run:  docker push mesonbuild/${{ matrix.cfg.id }}
+        run:  docker push ${{ github.repository_owner }}/{{ matrix.cfg.id }}