diff --git a/docs/repo.md b/docs/repo.md
index a943d94..0c39220 100644
--- a/docs/repo.md
+++ b/docs/repo.md
@@ -1,38 +1,35 @@
-# Hibby's Repo
+# Hibbian Repo
 
-## Script
+## Install with Script
 
-The script requires downloaded, set to executable and run and is a little simpler than the manual setup - thanks to John M5ET for writing it!
+Download the script from: <https://guide.hibbian.org/static/files/setup.sh>
 
-I strongly recommend you read through it **before** running it - it should look similar to the manual method below.
-**General computer security advice is to not blindly run scripts you downloaded from the internet!** 
+This must be run from the command line:
 
+!!! note "Terminal Commands"
+	``` 
+	cd /tmp
+	wget https://guide.hibbian.org/static/files/setup.sh
+	chmod +x /tmp/setup.sh
+	sudo bash /tmp/setup.sh
+	```
 
-## Install Signing Key
+## Install Manually
 
-At the moment, you must understand at least some of how Debian works to sign up
-for the repo!
+This assumes you have some knowledge of Debian/Ubuntu and know how to take
+risks!
 
 ### Fetch the keyring for your distro
 
 Download and install the .deb that suits your distro:
 
-  * [Bullseye](http://repo.hibbian.org/packetrepo/pool/main/h/hibbian-archive-keyring/hibbian-archive-keyring_20240826~packetrepo11+3_all.deb)
-  * [Bookworm](http://repo.hibbian.org/packetrepo/pool/main/h/hibbian-archive-keyring/hibbian-archive-keyring_20240826~packetrepo12+1_all.deb)
-  * [Testing](http://repo.hibbian.org/packetrepo/pool/main/h/hibbian-archive-keyring/hibbian-archive-keyring_20240826~packetrepo~TRIXIE+1_all.deb)
+  * [Bullseye](http://repo.hibbian.org/packetrepo/pool/main/h/hibbian-archive-keyring/hibbian-archive-keyring_20240924~packetrepo11+1_all.deb)
+  * [Bookworm](http://repo.hibbian.org/packetrepo/pool/main/h/hibbian-archive-keyring/hibbian-archive-keyring_20240924~packetrepo12+1_all.deb)
+  * [Testing](http://repo.hibbian.org/packetrepo/pool/main/h/hibbian-archive-keyring/hibbian-archive-keyring_20240924~packetrepo~TRIXIE+1_all.deb)
+
 ## Set up Repo
 
-I've installed a package list on your machine at
-`/usr/share/hibbian-archive-keyring/sources.list.d/bookworm/packetrepo_stable.list`
-or a similar path, depending on your OS version.
-
-I suggest you link to that from `/etc/apt/sources.list.d/` - for example,
-
-```
-ln -s
-/usr/share/hibbian-archive-keyring/sources.list.d/bookworm/packetrepo_stable.list
-/etc/apt/sources.list.d/hibbian.list
-```
+`sudo apt install ./keyring.deb`
 
 ## Update
 
diff --git a/docs/static/files/setup.sh b/docs/static/files/setup.sh
index 458995f..a9a029d 100644
--- a/docs/static/files/setup.sh
+++ b/docs/static/files/setup.sh
@@ -8,72 +8,41 @@ echo "Detected operating system as:"
 echo -e "\033[32m$osstr\033[0m"
 osname=`echo "$osstr" |awk '{print $1}'`
 osver=`echo "$osstr" |sed 's/GNU\/Linux//g'`
+echo -e "$osver Detected"
+apt update && apt install curl
 case `echo $osver` in
-        "Debian 13"*)
-                echo "Installing GPG signing key, please wait..."
-                curl https://online-amateur-radio-club-m0ouk.github.io/oarc-packages/hibby.key | tee /etc/apt/trusted.gpg.d/hibby.asc
-                echo -e "\033[32mGPG signing key installed correctly.\033[0m"
-                echo "Adding Debian testing repository for OARC packages..."
-                echo "#OARC Packet Radio Packages" >> /etc/apt/sources.list
-                echo "deb https://online-amateur-radio-club-m0ouk.github.io/oarc-packages testing main" >> /etc/apt/sources.list
+        "Debian trixie/sid"*)
+                echo "Installing Repo, please wait..."
+		curl http://repo.hibbian.org/packetrepo/pool/main/h/hibbian-archive-keyring/hibbian-archive-keyring_20240924~packetrepo~TRIXIE+2_all.deb | tee /tmp/hibbian-archive-keyring.deb 
+		apt install /tmp/hibbian-archive-keyring.deb
                 echo -e "\033[32mRepository added correctly.\033[0m"
         ;;
         "Debian 12"*)
-                echo "Installing GPG signing key, please wait..."
-                curl https://online-amateur-radio-club-m0ouk.github.io/oarc-packages/hibby.key | tee /etc/apt/trusted.gpg.d/hibby.asc
-                echo -e "\033[32mGPG signing key installed correctly.\033[0m"
-                echo "Adding Debian stable repository for OARC packages..."
-                echo "#OARC Packet Radio Packages" >> /etc/apt/sources.list
-                echo "deb https://online-amateur-radio-club-m0ouk.github.io/oarc-packages bookworm main" >> /etc/apt/sources.list
-                echo -e "\033[32mRepository added correctly.\033[0m"
-        ;;
-        "Ubuntu 22.04"*)
-                echo "Installing GPG signing key, please wait..."
-                curl https://online-amateur-radio-club-m0ouk.github.io/oarc-packages/hibby.key | tee /etc/apt/trusted.gpg.d/hibby.asc
-                echo -e "\033[32mGPG signing key installed correctly.\033[0m"
-                echo "Adding Ubuntu jammy repository for OARC packages..."
-                echo "#OARC Packet Radio Packages" >> /etc/apt/sources.list
-                echo "deb https://online-amateur-radio-club-m0ouk.github.io/oarc-packages jammy main" >> /etc/apt/sources.list
-                echo -e "\033[32mRepository added correctly.\033[0m"
-        ;;
-        "Ubuntu 24.04"*)
-                echo "Installing GPG signing key, please wait..."
-                curl https://online-amateur-radio-club-m0ouk.github.io/oarc-packages/hibby.key | tee /etc/apt/trusted.gpg.d/hibby.asc
-                echo -e "\033[32mGPG signing key installed correctly.\033[0m"
-                echo "Adding Ubuntu jammy repository for OARC packages..."
-                echo "#OARC Packet Radio Packages" >> /etc/apt/sources.list
-                echo "deb https://online-amateur-radio-club-m0ouk.github.io/oarc-packages noble main" >> /etc/apt/sources.list
+                echo "Installing Repo, please wait..."
+		curl http://repo.hibbian.org/packetrepo/pool/main/h/hibbian-archive-keyring/hibbian-archive-keyring_20240924~packetrepo12+2_all.deb | tee /tmp/hibbian-archive-keyring.deb 
+		apt install /tmp/hibbian-archive-keyring.deb
                 echo -e "\033[32mRepository added correctly.\033[0m"
         ;;
         "Raspbian 12"*)
-                echo "Installing GPG signing key, please wait..."
-                curl https://online-amateur-radio-club-m0ouk.github.io/oarc-packages/hibby.key | tee /etc/apt/trusted.gpg.d/hibby.asc
-                echo -e "\033[32mGPG signing key installed correctly.\033[0m"
-                echo "Adding Raspberry Pi OS stable repository for OARC packages..."
-                echo "#OARC Packet Radio Packages" >> /etc/apt/sources.list
-                echo "deb https://online-amateur-radio-club-m0ouk.github.io/oarc-packages bookworm main" >> /etc/apt/sources.list
+                echo "Installing Repo, please wait..."
+		curl http://repo.hibbian.org/packetrepo/pool/main/h/hibbian-archive-keyring/hibbian-archive-keyring_20240924~packetrepo12+2_all.deb | tee /tmp/hibbian-archive-keyring.deb 
+		apt install /tmp/hibbian-archive-keyring.deb
                 echo -e "\033[32mRepository added correctly.\033[0m"
         ;;
         "Raspbian 11"*)
-                echo "Installing GPG signing key, please wait..."
-                curl https://online-amateur-radio-club-m0ouk.github.io/oarc-packages/hibby.key | tee /etc/apt/trusted.gpg.d/hibby.asc
-                echo -e "\033[32mGPG signing key installed correctly.\033[0m"
-                echo "Adding Raspberry Pi OS oldstable repository for OARC packages..."
-                echo "#OARC Packet Radio Packages" >> /etc/apt/sources.list
-                echo "deb https://online-amateur-radio-club-m0ouk.github.io/oarc-packages bullseye main" >> /etc/apt/sources.list
+                echo "Installing Repo, please wait..."
+		curl http://repo.hibbian.org/packetrepo/pool/main/h/hibbian-archive-keyring/hibbian-archive-keyring_20240924~packetrepo11+2_all.deb | tee /tmp/hibbian-archive-keyring.deb 
+		apt install /tmp/hibbian-archive-keyring.deb
                 echo -e "\033[32mRepository added correctly.\033[0m"
         ;;
         "Debian 11"*)
-                echo "Installing GPG signing key, please wait..."
-                curl https://online-amateur-radio-club-m0ouk.github.io/oarc-packages/hibby.key | tee /etc/apt/trusted.gpg.d/hibby.asc
-                echo -e "\033[32mGPG signing key installed correctly.\033[0m"
-                echo "Adding Raspberry Pi OS oldstable repository for OARC packages..."
-                echo "#OARC Packet Radio Packages" >> /etc/apt/sources.list
-                echo "deb https://online-amateur-radio-club-m0ouk.github.io/oarc-packages bullseye main" >> /etc/apt/sources.list
+                echo "Installing Repo, please wait..."
+		curl http://repo.hibbian.org/packetrepo/pool/main/h/hibbian-archive-keyring/hibbian-archive-keyring_20240924~packetrepo11+2_all.deb | tee /tmp/hibbian-archive-keyring.deb 
+		apt install /tmp/hibbian-archive-keyring.deb
                 echo -e "\033[32mRepository added correctly.\033[0m"
         ;;
         *)
-                echo "No repository to add - check you are running a compatible operating system. Please see https://online-amateur-radio-club-m0ouk.github.io/oarc-packages/ for more information" && exit
+                echo "No repository to add - check you are running a compatible operating system. Please see https://www.hibbian.org for more information" && exit
         ;;
 esac
 echo "Updating your package lists..."