diff --git a/resources/klipper.env b/resources/klipper.env
index 1f16a6e..6ab13d6 100644
--- a/resources/klipper.env
+++ b/resources/klipper.env
@@ -1 +1 @@
-KLIPPER_ARGS="/home/%USER%/klipper/klippy/klippy.py %CFG% -I %PRINTER% -l %LOG% -a %UDS%"
\ No newline at end of file
+KLIPPER_ARGS="%KLIPPER_DIR%/klippy/klippy.py %CFG% -I %PRINTER% -l %LOG% -a %UDS%"
\ No newline at end of file
diff --git a/resources/klipper.service b/resources/klipper.service
index 8c74cd4..b41788f 100644
--- a/resources/klipper.service
+++ b/resources/klipper.service
@@ -11,7 +11,7 @@ WantedBy=multi-user.target
 Type=simple
 User=%USER%
 RemainAfterExit=yes
-WorkingDirectory=/home/%USER%/klipper
+WorkingDirectory=%KLIPPER_DIR%
 EnvironmentFile=%ENV_FILE%
 ExecStart=%ENV%/bin/python $KLIPPER_ARGS
 Restart=always
diff --git a/resources/moonraker-telegram-bot.env b/resources/moonraker-telegram-bot.env
index aaa7547..280f165 100644
--- a/resources/moonraker-telegram-bot.env
+++ b/resources/moonraker-telegram-bot.env
@@ -1 +1 @@
-TELEGRAM_BOT_ARGS="/home/%USER%/moonraker-telegram-bot/bot/main.py -c %CFG% -l %LOG%"
\ No newline at end of file
+TELEGRAM_BOT_ARGS="%TELEGRAM_BOT_DIR%/bot/main.py -c %CFG% -l %LOG%"
\ No newline at end of file
diff --git a/resources/moonraker-telegram-bot.service b/resources/moonraker-telegram-bot.service
index 612a6cd..567481d 100644
--- a/resources/moonraker-telegram-bot.service
+++ b/resources/moonraker-telegram-bot.service
@@ -9,7 +9,7 @@ WantedBy=multi-user.target
 [Service]
 Type=simple
 User=%USER%
-WorkingDirectory=/home/%USER%/moonraker-telegram-bot
+WorkingDirectory=%TELEGRAM_BOT_DIR%
 EnvironmentFile=%ENV_FILE%
 ExecStart=%ENV%/bin/python $TELEGRAM_BOT_ARGS
 Restart=always
diff --git a/resources/moonraker.env b/resources/moonraker.env
index 065ca7e..bca6af5 100644
--- a/resources/moonraker.env
+++ b/resources/moonraker.env
@@ -1 +1 @@
-MOONRAKER_ARGS="/home/%USER%/moonraker/moonraker/moonraker.py -d %PRINTER_DATA%"
\ No newline at end of file
+MOONRAKER_ARGS="%MOONRAKER_DIR%/moonraker/moonraker.py -d %PRINTER_DATA%"
\ No newline at end of file
diff --git a/resources/moonraker.service b/resources/moonraker.service
index ac8000f..7bfe8e2 100644
--- a/resources/moonraker.service
+++ b/resources/moonraker.service
@@ -12,7 +12,7 @@ Type=simple
 User=%USER%
 SupplementaryGroups=moonraker-admin
 RemainAfterExit=yes
-WorkingDirectory=/home/%USER%/moonraker
+WorkingDirectory=%MOONRAKER_DIR%
 EnvironmentFile=%ENV_FILE%
 ExecStart=%ENV%/bin/python $MOONRAKER_ARGS
 Restart=always
diff --git a/scripts/klipper.sh b/scripts/klipper.sh
index 6ea8c28..e46e02d 100644
--- a/scripts/klipper.sh
+++ b/scripts/klipper.sh
@@ -368,8 +368,8 @@ function create_klipper_service() {
 
     sudo cp "${service_template}" "${service}"
     sudo cp "${env_template}" "${env_file}"
-    sudo sed -i "s|%USER%|${USER}|g; s|%ENV%|${KLIPPY_ENV}|; s|%ENV_FILE%|${env_file}|" "${service}"
-    sudo sed -i "s|%USER%|${USER}|; s|%LOG%|${log}|; s|%CFG%|${cfg}|; s|%PRINTER%|${klippy_serial}|; s|%UDS%|${klippy_socket}|" "${env_file}"
+    sudo sed -i "s|%USER%|${USER}|g; s|%KLIPPER_DIR%|${KLIPPER_DIR}|; s|%ENV%|${KLIPPY_ENV}|; s|%ENV_FILE%|${env_file}|" "${service}"
+    sudo sed -i "s|%USER%|${USER}|; s|%KLIPPER_DIR%|${KLIPPER_DIR}|; s|%LOG%|${log}|; s|%CFG%|${cfg}|; s|%PRINTER%|${klippy_serial}|; s|%UDS%|${klippy_socket}|" "${env_file}"
 
     ok_msg "Klipper service file created!"
   fi
diff --git a/scripts/moonraker-telegram-bot.sh b/scripts/moonraker-telegram-bot.sh
index e88a93f..afccef8 100644
--- a/scripts/moonraker-telegram-bot.sh
+++ b/scripts/moonraker-telegram-bot.sh
@@ -318,11 +318,11 @@ function write_telegram_bot_service() {
     else
       sudo sed -i "s|%INST%|${i}|" "${service}"
     fi
-    sudo sed -i "s|%USER%|${USER}|g; s|%ENV%|${TELEGRAM_BOT_ENV}|; s|%ENV_FILE%|${env_file}|" "${service}"
+    sudo sed -i "s|%USER%|${USER}|g; s|%TELEGRAM_BOT_DIR%|${TELEGRAM_BOT_DIR}|; s|%ENV%|${TELEGRAM_BOT_ENV}|; s|%ENV_FILE%|${env_file}|" "${service}"
 
     status_msg "Creating environment file for instance ${i} ..."
     cp "${env_template}" "${env_file}"
-    sed -i "s|%USER%|${USER}|; s|%CFG%|${cfg}|; s|%LOG%|${log}|" "${env_file}"
+    sed -i "s|%USER%|${USER}|; s|%TELEGRAM_BOT_DIR%|${TELEGRAM_BOT_DIR}|; s|%CFG%|${cfg}|; s|%LOG%|${log}|" "${env_file}"
   fi
 }
 
diff --git a/scripts/moonraker.sh b/scripts/moonraker.sh
index e971878..775b0b2 100644
--- a/scripts/moonraker.sh
+++ b/scripts/moonraker.sh
@@ -360,8 +360,8 @@ function write_moonraker_service() {
 
     [[ -z ${i} ]] && sudo sed -i "s| %INST%||" "${service}"
     [[ -n ${i} ]] && sudo sed -i "s|%INST%|${i}|" "${service}"
-    sudo sed -i "s|%USER%|${USER}|g; s|%ENV%|${MOONRAKER_ENV}|; s|%ENV_FILE%|${env_file}|" "${service}"
-    sudo sed -i "s|%USER%|${USER}|; s|%PRINTER_DATA%|${printer_data}|" "${env_file}"
+    sudo sed -i "s|%USER%|${USER}|g; s|%MOONRAKER_DIR%|${MOONRAKER_DIR}|; s|%ENV%|${MOONRAKER_ENV}|; s|%ENV_FILE%|${env_file}|" "${service}"
+    sudo sed -i "s|%USER%|${USER}|; s|%MOONRAKER_DIR%|${MOONRAKER_DIR}|; s|%PRINTER_DATA%|${printer_data}|" "${env_file}"
   fi
 }