diff --git a/.github/workflows/build-push-backend.yml b/.github/workflows/build-push-backend.yml
index 262fb28..61a8749 100644
--- a/.github/workflows/build-push-backend.yml
+++ b/.github/workflows/build-push-backend.yml
@@ -75,7 +75,7 @@ jobs:
       contents: read
       packages:  write
     env:
-      QUAY_ORG: ${{ secrets.QUAY_ORG }}
+      QUAY_ORG: ${{ secrets.QUAY_ORG || github.repository_owner }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
diff --git a/.github/workflows/build-push-metadata_relay.yml b/.github/workflows/build-push-metadata_relay.yml
index 9f17d2a..74debe4 100644
--- a/.github/workflows/build-push-metadata_relay.yml
+++ b/.github/workflows/build-push-metadata_relay.yml
@@ -40,7 +40,7 @@ jobs:
       contents: read
       packages:  write
     env:
-      QUAY_ORG: ${{ secrets.QUAY_ORG }}
+      QUAY_ORG: ${{ secrets.QUAY_ORG || github.repository_owner }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -125,7 +125,7 @@ jobs:
       contents: read
       packages: write
     env:
-      QUAY_ORG: ${{ secrets.QUAY_ORG }}
+      QUAY_ORG: ${{ secrets.QUAY_ORG || github.repository_owner }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4