diff --git a/client/setup.sh b/client/setup.sh
index cb1247f..ddaf039 100644
--- a/client/setup.sh
+++ b/client/setup.sh
@@ -78,7 +78,7 @@ apt upgrade -y
 
 # Install the necessary packages
 echo "Installing dependencies..."
-apt install -y nodejs portaudio19-dev libportaudio2 libpulse-dev pulseaudio apulse git ffmpeg git python3
+apt install -y nodejs portaudio19-dev libportaudio2 libpulse-dev pulseaudio apulse git ffmpeg git python3 python3-pip
 
 echo "Setting up Pulse Audio"
 
@@ -112,10 +112,13 @@ systemctl stop PulseAudio.service
 echo "Installing npm dependencies..."
 npm install
 
+# Get rid of PEP 668
+rm -rf /usr/lib/python3.11/EMTERNALL-MANAGED
+
 # Getting the Python DAB
 echo "Installing PDAB and Dependencies"
 git clone -b DRBv3 https://git.vpn.cusano.net/logan/Python-Discord-Audio-Bot.git ./discordAudioBot/pdab
-pip3 install -r ./discordAudioBot/pdab/requirements.txt
+pip3 install --system -r ./discordAudioBot/pdab/requirements.txt
 
 # Generate .env file
 echo "Creating the config .env file..."
@@ -201,7 +204,7 @@ echo "\n\n\t\tDiscord Client Node install completed!\n\n"
 ####------------------- OP25 Installation
 # Clone OP25 from the git repository
 echo "Cloning OP25 from the git repository..."
-git clone https://github.com/boatbod/op25.git
+git clone -b gr310 https://github.com/boatbod/op25.git
 
 # Navigate to the OP25 directory
 ogPwd=$(pwd)