diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml
index b920668..f9f0078 100644
--- a/.github/workflows/build-and-release.yml
+++ b/.github/workflows/build-and-release.yml
@@ -6,6 +6,10 @@ on:
         description: 'Replace existing development assets (if any)'
         required: false
         type: boolean
+      beacon_owner:
+        description: 'Beacon Repo Owner (optional)'
+        required: false
+        type: string
   pull_request:
   push:  
     paths-ignore:
@@ -80,6 +84,11 @@ jobs:
           sudo apt update
           sudo apt install -y mkosi
 
+      - name: Set dynamic mkosi vars
+        if: github.event.inputs.beacon_owner != ''
+        run: |
+          sed -i "/^\[Build\]/a\Environment=BEACON_OWNER=${{ github.event.inputs.beacon_owner }}" modules/beacon/mkosi.conf
+
       - name: Build guest-${{ matrix.distro }}-${{ matrix.release }}
         run: |
           sudo mkosi --image-id=guest-${{ matrix.distro }}-${{ matrix.release }} -C images/guest-${{ matrix.distro }}-${{ matrix.release }}/ cat-config
diff --git a/modules/beacon/mkosi.build b/modules/beacon/mkosi.build
index 3a03aff..829d978 100755
--- a/modules/beacon/mkosi.build
+++ b/modules/beacon/mkosi.build
@@ -2,10 +2,12 @@
 set -euo pipefail
 set -x
 
+BEACON_OWNER="${BEACON_OWNER:-AMDEPYC}"
+
 # Fetch latest release tag from GitHub API using jq
-LATEST_TAG=$(curl -s https://api.github.com/repos/AMDEPYC/beacon/releases/latest \
+LATEST_TAG=$(curl -s https://api.github.com/repos/${BEACON_OWNER}/beacon/releases/latest \
   | jq -r '.tag_name')
 
 # Download and install into DESTDIR with correct permissions
-curl -fsSL "https://github.com/AMDEPYC/beacon/releases/download/${LATEST_TAG}/beacon-linux-x86_64" \
+curl -fsSL "https://github.com/${BEACON_OWNER}/beacon/releases/download/${LATEST_TAG}/beacon-linux-x86_64" \
   | install -D -m 0755 /dev/stdin "${DESTDIR}/usr/local/bin/beacon"