diff --git a/dirs/printer_data/config/moonraker.conf b/dirs/printer_data/config/moonraker.conf
index ff0bcd3..f11445c 100644
--- a/dirs/printer_data/config/moonraker.conf
+++ b/dirs/printer_data/config/moonraker.conf
@@ -1,6 +1,6 @@
 [server]
 host: 0.0.0.0
-port: 7126
+port: PORT
 # The maximum size allowed for a file upload (in MiB).  Default 1024 MiB
 max_upload_size: 1024
 # Path to klippy Unix Domain Socket
diff --git a/setup.sh b/setup.sh
index 2c71800..5b18d62 100755
--- a/setup.sh
+++ b/setup.sh
@@ -105,6 +105,13 @@ echo.Cyan "Setup Moonraker"
 cd $ROOT_DIR/$PRINTER_NAME/printer_data/config
 sed -i -e "s/PRINTERNAME/$PRINTER_NAME/g" "moonraker.conf"
 sed -i -e "s/pi/$USER/g" "moonraker.conf"
+cat "moonraker.conf" | replace "~/" "$HOME/" > m.tmp
+rm moonraker.conf
+mv m.tmp moonraker.conf
+NUM_OF_PRIOR_INSTALLS=`ls /etc/systemd/system/*-klipper.service | wc -l`
+NEW_PORT=$((NUM_OF_PRIOR_INSTALLS + 7125))
+echo.ICyan "Using port ${NEW_PORT} for Moonraker"
+sed -i -e "s/PORT/$NEW_PORT/g" "moonraker.conf"
 
 echo.Cyan "Setup Mainsail Config"
 cd $ROOT_DIR/$PRINTER_NAME/mainsail-config
@@ -119,6 +126,11 @@ echo.Cyan "Downloading Mainsail"
 wget -q -O mainsail.zip https://github.com/mainsail-crew/mainsail/releases/latest/download/mainsail.zip
 unzip -o mainsail.zip -d $PRINTER_NAME/mainsail
 rm mainsail.zip
+#
+#
+# SETUP MAINSAIL HERE BAKA
+#
+#
 
 # Setup python env
 echo.Cyan "Setup Python Virtual Environment"