diff --git a/plugin/tailscale-preview.plg b/plugin/tailscale-preview.plg
index 56d46aa..2ea838b 100644
--- a/plugin/tailscale-preview.plg
+++ b/plugin/tailscale-preview.plg
@@ -5,7 +5,7 @@
   name="tailscale"
   author="Derek Kaser"
   version="2025.05.08"
-  pluginURL="https://raw.githubusercontent.com/unraid/unraid-tailscale/preview/plugin/tailscale-preview.plg"
+  pluginURL="https://raw.githubusercontent.com/dkaser/unraid-tailscale/preview/plugin/tailscale-preview.plg"
   launch="Settings/Tailscale"
   support="https://forums.unraid.net/topic/136889-plugin-tailscale/"
   min="7.0.0"
@@ -31,7 +31,7 @@
 
 - Update Tailscale to 1.82.0
 
-For older releases, see https://github.com/unraid/unraid-tailscale/releases
+For older releases, see https://github.com/dkaser/unraid-tailscale/releases
 
 ]]>
 </CHANGES>
@@ -42,8 +42,8 @@ For older releases, see https://github.com/unraid/unraid-tailscale/releases
 </FILE>
 
 <FILE Name="/boot/config/plugins/tailscale/unraid-tailscale-utils-4.0.2-noarch-1.txz">
-<URL>https://github.com/unraid/unraid-tailscale-utils/releases/download/4.0.2/unraid-tailscale-utils-4.0.2-noarch-1.txz</URL>
-<SHA256>05520284610ee99c0b11e60674ef7d71ad33f6ca99711f251c0e5473a73b9a38</SHA256>
+<URL>https://github.com/dkaser/unraid-tailscale-utils/releases/download/4.0.2/unraid-tailscale-utils-4.0.2-noarch-1.txz</URL>
+<SHA256>714aa295ab9d1bf0287a0a60b0fa9727dff7a7ebce559f6e4b57fa430a07c8ad</SHA256>
 </FILE>
 
 <!--
diff --git a/plugin/tailscale-trunk.plg b/plugin/tailscale-trunk.plg
index 8c35895..47ba95b 100644
--- a/plugin/tailscale-trunk.plg
+++ b/plugin/tailscale-trunk.plg
@@ -5,7 +5,7 @@
   name="tailscale"
   author="Derek Kaser"
   version="2025.05.08"
-  pluginURL="https://raw.githubusercontent.com/unraid/unraid-tailscale/trunk/plugin/tailscale-trunk.plg"
+  pluginURL="https://raw.githubusercontent.com/dkaser/unraid-tailscale/trunk/plugin/tailscale-trunk.plg"
   launch="Settings/Tailscale"
   support="https://forums.unraid.net/topic/136889-plugin-tailscale/"
   min="7.0.0"
@@ -31,7 +31,7 @@
 
 - Update Tailscale to 1.82.0
 
-For older releases, see https://github.com/unraid/unraid-tailscale/releases
+For older releases, see https://github.com/dkaser/unraid-tailscale/releases
 
 ]]>
 </CHANGES>
@@ -42,8 +42,8 @@ For older releases, see https://github.com/unraid/unraid-tailscale/releases
 </FILE>
 
 <FILE Name="/boot/config/plugins/tailscale/unraid-tailscale-utils-4.0.2-noarch-1.txz">
-<URL>https://github.com/unraid/unraid-tailscale-utils/releases/download/4.0.2/unraid-tailscale-utils-4.0.2-noarch-1.txz</URL>
-<SHA256>05520284610ee99c0b11e60674ef7d71ad33f6ca99711f251c0e5473a73b9a38</SHA256>
+<URL>https://github.com/dkaser/unraid-tailscale-utils/releases/download/4.0.2/unraid-tailscale-utils-4.0.2-noarch-1.txz</URL>
+<SHA256>714aa295ab9d1bf0287a0a60b0fa9727dff7a7ebce559f6e4b57fa430a07c8ad</SHA256>
 </FILE>
 
 <!--
diff --git a/plugin/tailscale.plg b/plugin/tailscale.plg
index 2658167..af4941b 100644
--- a/plugin/tailscale.plg
+++ b/plugin/tailscale.plg
@@ -5,7 +5,7 @@
   name="tailscale"
   author="Derek Kaser"
   version="2025.05.08"
-  pluginURL="https://raw.githubusercontent.com/unraid/unraid-tailscale/main/plugin/tailscale.plg"
+  pluginURL="https://raw.githubusercontent.com/dkaser/unraid-tailscale/main/plugin/tailscale.plg"
   launch="Settings/Tailscale"
   support="https://forums.unraid.net/topic/136889-plugin-tailscale/"
   min="7.0.0"
@@ -31,7 +31,7 @@
 
 - Update Tailscale to 1.82.0
 
-For older releases, see https://github.com/unraid/unraid-tailscale/releases
+For older releases, see https://github.com/dkaser/unraid-tailscale/releases
 
 ]]>
 </CHANGES>
@@ -42,8 +42,8 @@ For older releases, see https://github.com/unraid/unraid-tailscale/releases
 </FILE>
 
 <FILE Name="/boot/config/plugins/tailscale/unraid-tailscale-utils-4.0.2-noarch-1.txz">
-<URL>https://github.com/unraid/unraid-tailscale-utils/releases/download/4.0.2/unraid-tailscale-utils-4.0.2-noarch-1.txz</URL>
-<SHA256>05520284610ee99c0b11e60674ef7d71ad33f6ca99711f251c0e5473a73b9a38</SHA256>
+<URL>https://github.com/dkaser/unraid-tailscale-utils/releases/download/4.0.2/unraid-tailscale-utils-4.0.2-noarch-1.txz</URL>
+<SHA256>714aa295ab9d1bf0287a0a60b0fa9727dff7a7ebce559f6e4b57fa430a07c8ad</SHA256>
 </FILE>
 
 <!--
diff --git a/tools/build-plugin.sh b/tools/build-plugin.sh
index d37e214..0a52903 100755
--- a/tools/build-plugin.sh
+++ b/tools/build-plugin.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-FILENAME=tailscale; jinja -d plugin/tailscale.json -D filename $FILENAME -D branch main plugin/tailscale.j2 > ../plugin/$FILENAME.plg
-FILENAME=tailscale-preview; jinja -d plugin/tailscale.json -D filename $FILENAME -D branch preview plugin/tailscale.j2 > ../plugin/$FILENAME.plg
-FILENAME=tailscale-trunk; jinja -d plugin/tailscale.json -D filename $FILENAME -D branch trunk plugin/tailscale.j2 > ../plugin/$FILENAME.plg
\ No newline at end of file
+FILENAME=tailscale; jinja -d plugin/tailscale.json -D filename $FILENAME -D branch main -D githubRepository "$GITHUB_REPOSITORY" plugin/tailscale.j2 > ../plugin/$FILENAME.plg
+FILENAME=tailscale-preview; jinja -d plugin/tailscale.json -D filename $FILENAME -D branch preview -D githubRepository "$GITHUB_REPOSITORY" plugin/tailscale.j2 > ../plugin/$FILENAME.plg
+FILENAME=tailscale-trunk; jinja -d plugin/tailscale.json -D filename $FILENAME -D branch trunk -D githubRepository "$GITHUB_REPOSITORY" plugin/tailscale.j2 > ../plugin/$FILENAME.plg
\ No newline at end of file
diff --git a/tools/plugin/files/CHANGELOG.md b/tools/plugin/files/CHANGELOG.md
index a7408af..bc6eebc 100644
--- a/tools/plugin/files/CHANGELOG.md
+++ b/tools/plugin/files/CHANGELOG.md
@@ -16,4 +16,4 @@
 
 - Update Tailscale to 1.82.0
 
-For older releases, see https://github.com/unraid/unraid-tailscale/releases
+For older releases, see https://github.com/{{ githubRepository }}/releases
diff --git a/tools/plugin/tailscale.j2 b/tools/plugin/tailscale.j2
index b8a4390..70e4064 100644
--- a/tools/plugin/tailscale.j2
+++ b/tools/plugin/tailscale.j2
@@ -23,7 +23,7 @@
 </FILE>
 
 <FILE Name="{{ configDirectory }}/unraid-tailscale-utils-{{ packageVersion }}-noarch-1.txz">
-<URL>https://github.com/unraid/unraid-tailscale-utils/releases/download/{{ packageVersion }}/unraid-tailscale-utils-{{ packageVersion }}-noarch-1.txz</URL>
+<URL>https://github.com/{{ githubRepository }}-utils/releases/download/{{ packageVersion }}/unraid-tailscale-utils-{{ packageVersion }}-noarch-1.txz</URL>
 <SHA256>{{ packageSHA256 }}</SHA256>
 </FILE>
 
diff --git a/tools/plugin/tailscale.json b/tools/plugin/tailscale.json
index d80e7fb..f6ec8e3 100644
--- a/tools/plugin/tailscale.json
+++ b/tools/plugin/tailscale.json
@@ -1,12 +1,11 @@
 {
     "name": "tailscale",
     "author": "Derek Kaser",
-    "githubRepository": "unraid/unraid-tailscale",
     "version": "2025.05.08",
     "tailscaleVersion": "tailscale_1.82.5_amd64",
     "tailscaleSHA256": "41a8931fa52055bd7ea4b51df9acff2ba2d4e9000c2380b667539b5b99991464",
     "packageVersion": "4.0.2",
-    "packageSHA256": "05520284610ee99c0b11e60674ef7d71ad33f6ca99711f251c0e5473a73b9a38",
+    "packageSHA256": "714aa295ab9d1bf0287a0a60b0fa9727dff7a7ebce559f6e4b57fa430a07c8ad",
     "pluginDirectory": "/usr/local/emhttp/plugins/tailscale",
     "configDirectory": "/boot/config/plugins/tailscale",
     "minver": "7.0.0"